Mercurial > hg > jslab

changeset 5:b67a33c44de7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some crap, etc
author samer
date Fri, 05 Apr 2019 21:34:25 +0100
parents 79922c7f2475
children f0fa855432af
files examples/misc/args examples/sound/midi/args examples/sound/midi/args.old examples/sound/midi/plinky.scm examples/sound/midi/synth.scm examples/sound/sampled/args examples/sound/sampled/args.old examples/sound/sampled/audioio.scm examples/sound/sampled/linein.scm examples/sound/sampled/lineio.scm
diffstat 10 files changed, 34 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/examples/misc/args	Fri Apr 05 17:22:47 2019 +0100
+++ b/examples/misc/args	Fri Apr 05 21:34:25 2019 +0100
@@ -1,5 +1,5 @@
 #properties
-#Fri Apr 05 17:21:40 BST 2019
+#Fri Apr 05 21:28:03 BST 2019
 mouse.y.trace.map.minimum=-0.0
 ft.power.plotter.window.bounds=(323,142,512,118)
 mouse.x.trace.map.symmetric=false
--- a/examples/sound/midi/args	Fri Apr 05 17:22:47 2019 +0100
+++ b/examples/sound/midi/args	Fri Apr 05 21:34:25 2019 +0100
@@ -1,5 +1,5 @@
 #properties
-#Tue Mar 26 13:47:55 GMT 2019
+#Fri Apr 05 18:08:19 BST 2019
 p.slider.map.maximum=0.001
 decay.slider.map.maximum=0.700
 Tasks.bounds=(290,499,225,145)
@@ -18,13 +18,13 @@
 midisynth.offset=32
 matrix.rowcolumn.editor.image.window.bounds=(377,604,505,69)
 midisynth.bounds=(281,23,232,176)
+out.image.window.bounds=(396,586,390,88)
 regulator.target=35.0
-out.image.window.bounds=(396,586,390,88)
+midisynth.offset.bounds=(283,23,204,57)
 matrix.editor.window.bounds=(607,23,551,549)
-midisynth.offset.bounds=(283,23,204,57)
 p.slider.map.minimum=2.357E-7
+decay.slider.map.minimum=0.001
 exposed.bounds=(4,23,261,516)
-decay.slider.map.minimum=0.001
 matrix.image.window.bounds=(255,51,161,202)
 decay=0.01
 midisynth.factor=80.0
--- a/examples/sound/midi/args.old	Fri Apr 05 17:22:47 2019 +0100
+++ b/examples/sound/midi/args.old	Fri Apr 05 21:34:25 2019 +0100
@@ -1,5 +1,5 @@
 #properties
-#Tue Mar 26 13:42:33 GMT 2019
+#Fri Apr 05 17:38:20 BST 2019
 p.slider.map.maximum=0.001
 decay.slider.map.maximum=0.700
 Tasks.bounds=(290,499,225,145)
@@ -18,13 +18,13 @@
 midisynth.offset=32
 matrix.rowcolumn.editor.image.window.bounds=(377,604,505,69)
 midisynth.bounds=(281,23,232,176)
+regulator.target=35.0
 out.image.window.bounds=(396,586,390,88)
-regulator.target=35.0
+matrix.editor.window.bounds=(607,23,551,549)
 midisynth.offset.bounds=(283,23,204,57)
-matrix.editor.window.bounds=(607,23,551,549)
 p.slider.map.minimum=2.357E-7
+exposed.bounds=(4,23,261,516)
 decay.slider.map.minimum=0.001
-exposed.bounds=(4,23,261,516)
 matrix.image.window.bounds=(255,51,161,202)
 decay=0.01
 midisynth.factor=80.0
--- a/examples/sound/midi/plinky.scm	Fri Apr 05 17:22:47 2019 +0100
+++ b/examples/sound/midi/plinky.scm	Fri Apr 05 21:34:25 2019 +0100
@@ -23,7 +23,7 @@
 ; program 46 is cool!
 ; so are 10, 12, 111
 (define midiin (VVector. "midiin" 64))
-(define synth (MidiSynth. midiin))
+(define synth (MidiWithAftertouch. midiin))
 (define m 0)
 
 (addtasks
--- a/examples/sound/midi/synth.scm	Fri Apr 05 17:22:47 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-(import "javax.sound.midi.*")
-
-(define synth (MidiSystem.getSynthesizer))
-(define c0 (vector-ref (.getChannels synth) 0))
-(define (open) (.open synth))
-(define (close) (.close synth))
-(define (on pitch) (.noteOn c0 pitch 80))
-(define (off pitch) (.noteOff c0 pitch 0))
-
-(open)
--- a/examples/sound/sampled/args	Fri Apr 05 17:22:47 2019 +0100
+++ b/examples/sound/sampled/args	Fri Apr 05 21:34:25 2019 +0100
@@ -1,5 +1,5 @@
 #properties
-#Tue Mar 26 14:09:07 GMT 2019
+#Fri Apr 05 21:24:05 BST 2019
 function.derivative.plotter.window.bounds=(375,357,426,239)
 sqrt.plotter.window.bounds=(0,0,208,122)
 waveform.image.cell.size=1
--- a/examples/sound/sampled/args.old	Fri Apr 05 17:22:47 2019 +0100
+++ b/examples/sound/sampled/args.old	Fri Apr 05 21:34:25 2019 +0100
@@ -1,5 +1,5 @@
 #properties
-#Tue Mar 26 14:08:20 GMT 2019
+#Fri Apr 05 21:21:16 BST 2019
 function.derivative.plotter.window.bounds=(375,357,426,239)
 sqrt.plotter.window.bounds=(0,0,208,122)
 waveform.image.cell.size=1
@@ -249,7 +249,7 @@
 logprior.strength=0.0
 audio.exposed.bounds=(980,190,229,372)
 ica.s.plotter.window.bounds=(151,296,264,118)
-exposed.bounds=(4,23,287,559)
+exposed.bounds=(4,23,238,64)
 noise=(Gaussian.)
 audio.offset=-507.6
 step=384
@@ -288,45 +288,45 @@
 waveform.plotter.map.maximum=36000.0
 russian.vodka.jelly=snoozy
 spectrum.trace.map.minimum=3.2E-5
+mat.image.window.bounds=(0,0,264,278)
+coder.learn.rate=0.16
 scaleNormaliser.scale.editor.plotter.window.bounds=(282,629,264,118)
-coder.learn.rate=0.16
-mat.image.window.bounds=(0,0,264,278)
 e.trace.window.bounds=(0,89,264,278)
 normaliser.mean=-444.473
 vector.editor.button1=0.1
+scaler.E.trace.window.bounds=(360,376,264,86)
 test.file=test3.silk
-scaler.E.trace.window.bounds=(360,376,264,86)
 p=1.0E-5
 ica.C.image.window.bounds=(516,524,264,278)
 scaler.output.plotter.window.bounds=(627,566,264,75)
+wavewriter.scale.bounds=(305,57,199,57)
 v1.B.editor.window.bounds=(0,0,187,201)
-wavewriter.scale.bounds=(305,57,199,57)
 midisynth.factor=120.0
+factor=58
 v1.B.image.window.bounds=(0,0,146,54)
-factor=58
 ft.mag.diffScaler.output.stacker.output.reshaped.image.window.bounds=(303,249,264,49)
 image.height=16
 ica.learn.G.rowcolumn.plotter.window.bounds=(166,816,937,118)
 matrix.plotter.rowcolumn.plotter.window.bounds=(5,159,212,136)
 histogram.likelihood.plotter.window.bounds=(891,383,264,100)
+matrix.rowcolumn.plotter.window.bounds=(0,0,212,136)
 VState.Optimiser.bounds=(0,0,287,592)
-matrix.rowcolumn.plotter.window.bounds=(0,0,212,136)
 scaler.NlogK.trace.window.bounds=(0,551,264,86)
+w1.scale=0.01
 joint.histogram.bins.image.window.bounds=(701,314,163,193)
-w1.scale=0.01
 ft.mag.diffScaler.output.stacker.output.reshaped.image.map.minimum=1.0
 spectrum.trace.window.bounds=(284,206,256,294)
+jelly=wobbly
 normaliser.rate=0.004
-jelly=wobbly
 vector.reshaped.image.window.bounds=(0,0,146,294)
+mog.-log\ p(s).plotter.window.bounds=(469,627,427,129)
 mog.weights.editor.plotter.window.bounds=(300,492,225,127)
-mog.-log\ p(s).plotter.window.bounds=(469,627,427,129)
 generator=(oscillator "osc1" 0.1)
 stacker.output.reshaped.image.map.symmetric=false
 waveform.plotter.window.bounds=(364,356,512,118)
+scaler.offsetRate=3.200E-6
+mog.sigmas.editor.plotter.window.bounds=(300,196,224,117)
 scaler.scale=4715.263
-mog.sigmas.editor.plotter.window.bounds=(300,196,224,117)
-scaler.offsetRate=3.200E-6
 filter.mean.plotter.window.bounds=(637,652,214,138)
 regulator.target=46.733
 source=line
@@ -341,20 +341,20 @@
 infile=/mnt/sauce/music/projwav/beethoven/piano/fm-1.wav
 ica.e(x).trace.window.bounds=(876,54,264,278)
 histogram.bins.image.window.bounds=(162,599,86,278)
+vector.image.window.bounds=(113,544,404,72)
 function.plotter.x.map.maximum=4.0
-vector.image.window.bounds=(113,544,404,72)
+x.image.window.bounds=(373,381,265,83)
 ica.log\ |W|=-580.779
-x.image.window.bounds=(373,381,265,83)
 ica.W.rowcolumn.image.window.bounds=(248,190,264,49)
 spectrum.plotter.window.bounds=(76,580,813,116)
 ica.G.image.window.bounds=(283,0,264,278)
 vector.editor.image.window.bounds=(371,114,292,102)
+spectrum.histogram.bins.image.window.bounds=(451,284,104,534)
 histogram.sumL.trace.window.bounds=(891,156,264,86)
-spectrum.histogram.bins.image.window.bounds=(451,284,104,534)
+out.trace.window.bounds=(13,401,1036,292)
 test.color=\#465f90
-out.trace.window.bounds=(13,401,1036,292)
 mog.sigmas.rowcolumn.editor.plotter.window.bounds=(623,452,236,138)
+ica.e(x).plotter.window.bounds=(333,471,264,118)
 w1.color=\#817a9b
-ica.e(x).plotter.window.bounds=(333,471,264,118)
 spectrum.histogram.sumL.trace.window.bounds=(297,845,272,83)
 histogram.bins=96
--- a/examples/sound/sampled/audioio.scm	Fri Apr 05 17:22:47 2019 +0100
+++ b/examples/sound/sampled/audioio.scm	Fri Apr 05 21:34:25 2019 +0100
@@ -5,20 +5,13 @@
 
 (load "audio.scm")
 
-
 (tasks)
 (define fmt (mono 44100))	; see audio.scm for other options
 
-; this is set up to read audio from one mixer and write out to
-; another. This is because my main mixer, though it does full
-; duplex, ends up feeding back because tritonus alsa mixer is
-; mixing all the input channels on the sound card, rather than
-; letting me choose just the line input.
-(define in (linesrc (mixer-n 1) fmt))
-(define out (linesnk (mixer-n 2) fmt)) 
+(define in (linesrc fmt))
+(define out (linesnk fmt)) 
 (define wav (filesnk "out.wav" fmt))
 
-
 (define N 1024)	; frame size for audio transfers
 (define x (VVector. "x" N))	; frame of audio data
 
--- a/examples/sound/sampled/linein.scm	Fri Apr 05 17:22:47 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-(load "audio.scm")
-; (load "lineout.scm")
-
-; audio input with a frame size of 1024 and a hop size of 512
-; is routed directly to audio output, which must also be informed
-; that hop size is 512.
-(linein (linesrc) 1024 512)
-(expose)
--- a/examples/sound/sampled/lineio.scm	Fri Apr 05 17:22:47 2019 +0100
+++ b/examples/sound/sampled/lineio.scm	Fri Apr 05 21:34:25 2019 +0100
@@ -4,5 +4,7 @@
 ; audio input with a frame size of 1024 and a hop size of 512
 ; is routed directly to audio output, which must also be informed
 ; that hop size is 512.
-(lineout (linesnk) (linein (linesrc) 1024 512) 512)
+(define hop 512)
+(define fmt (mono 22050))
+(lineout (linesnk fmt) (linein (linesrc fmt) 1024 hop) hop)
 (expose)