changeset 8:5e3cbbf173aa tip

Reorganise some more

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/graphics/mouse/mouse.scm	Fri Apr 05 22:41:58 2019 +0100
@@ -0,0 +1,8 @@
+(import "samer.core.util.swing.*")
+(import "samer.units.*")
+
+(define canvas (VCanvas.))
+(define mouse (MousePosition. canvas))
+(expose canvas "canvas")
+(expose)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/graphics/scope/scope.props	Fri Apr 05 22:41:58 2019 +0100
@@ -0,0 +1,13 @@
+#properties
+#Fri Apr 05 22:08:16 BST 2019
+y.trace.map.maximum=1.0
+trace.scroll=true
+x.trace.window.bounds=(221,397,372,99)
+canvas.bounds=(4,23,481,371)
+x.trace.map.maximum=1.0
+y.trace.map.symmetric=true
+scroll=true
+trace.color=\#ffff00
+x.trace.map.symmetric=true
+exposed.bounds=(639,23,261,383)
+y.trace.window.bounds=(225,500,368,101)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/graphics/scope/scope.scm	Fri Apr 05 22:41:58 2019 +0100
@@ -0,0 +1,36 @@
+(load "props.scm")
+
+(import "samer.core.types.*")
+
+(put "regulated" #t)
+(push-properties "scope.props")
+(put "canvas.background" Color.black$)
+(put "canvas.foreground" (Color. 60 220 120))
+(put "trace.background" Color.black$)
+
+(define C (node "canvas" (Plotter.)))
+(expose C "canvas")
+(.exposeMaps C)
+
+(define (oscillator nm freq)
+  (define o (Oscillator. freq))
+  (VParameter. nm (.getFrequencyModel o))
+  o
+)
+
+(tasks)
+(expose)
+
+(define x (VDouble. "x"))
+(define y (VDouble. "y"))
+
+(addtasks
+  (GenerateDouble. x (oscillator "fx" 0.1))
+  (GenerateDouble. y (oscillator "fy" 0.1))
+  (let ((P (.getPen C)))
+    (.moveto P 0 0)
+    (task
+      (.activate P)
+      (.line (.abs P (.value$ x) (.value$ y)))
+      (.move P))))
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/graphics/scope/vtrace.scm	Fri Apr 05 22:41:58 2019 +0100
@@ -0,0 +1,32 @@
+(load "props.scm")
+
+(push-properties "scope.props")
+(put "trace.background" Color.black$)
+(put "trace.foreground" (Color. 60 220 150))
+(put "regulated" "true")
+
+(define (oscillator name f)
+	(define o (Oscillator. f))
+	(VParameter. name (.getFrequencyModel o))
+	o)
+
+(define (gradient-map c1 c2 n)
+	(define cramp (ColorRamp. n))
+	(.gradient cramp 0 c1 (- n 1) c2)
+	(.getColorModel cramp))
+
+(put "renderer" Renderer.LINE$)
+(put "colormap" (colormap 13
+		Color.red$ 		2 	Color.yellow$ 	4	Color.green$
+	6 	Color.cyan$	8 	Color.blue$ 	10	Color.magenta$
+	12	Color.red$))
+; _________________________________________
+
+(expose)
+
+(define x (VVector. "x" 8))
+(define pl (node "trace" (VectorTrace. x)))
+(addtask pl)
+(addtask (Ops.update x))
+(expose pl "trace")
+(exec x "plotter editor")

--- a/examples/gui/awt/tester.java	Fri Apr 05 21:52:03 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
- *	AppletBorders.java	
- *
- *	Copyright (c) 2000, Samer Abdallah, King's College London.
- *	All rights reserved.
- *
- *	This software is provided AS iS and WITHOUT ANY WARRANTY; 
- *	without even the implied warranty of MERCHANTABILITY or 
- *	FITNESS FOR A PARTICULAR PURPOSE.
- */
-package test;
-import  samer.core.*;
-import  samer.core.util.*;
-import  samer.core.util.heavy.*;
-import  samer.core.util.heavy.Borders.*;
-import  samer.core.util.Tools;
-import	java.awt.*;
-
-public class tester
-{
-	public static void main(String args[])
-	{
-		new samer.core.shells.AWTShell();
-
-		final Shell.Window win=Shell.getWindow("tester");
-
-		win.container().setBackground(Color.white);
-		// win.container().setForeground(Color.white);
-
-		win.container().setLayout(new StackLayout(0));
-		win.container().add(Shell.createLabel("hmmm..."));
-		win.container().add(createBlock(new Color(200,160,180), "the world"));
-		win.container().add(createBlock(new Color(200,180,160), "welcome to"));
-		win.container().add(createBlock(new Color(180,200,160), "i like"));
-		win.container().add(createBlock(new Color(160,200,180), "of borders"));
-		win.container().add(createBlock(new Color(160,180,200), "these colours"));
-		win.container().add(createBlock(new Color(180,160,200), "hello there!"));
-		win.expose();
-
-		Agent agent=new Agent() {
-			public void getCommands(Agent.Registry r) { r.add("repaint"); }
-			public void execute(String cmd, Environment env) {
-				if (cmd.equals("repaint")) {
-					win.container().repaint();
-				}
-			}
-		};
-		Shell.exposeCommands(agent);
-		Shell.registerAgent(agent);
-	}
-
-	static Border.Interface border = new CompoundBorder(
-		new ParentBgBorder(12),
-		new RoundedBorder(3,26,3) {
-			protected Color getDefaultColor(Component c) { 
-				return c.getBackground().darker(); // brighter(); 
-			}
-		}
-	);
-
-	static Component createBlock(Color bg, String msg)
-	{
-		JPanel	p1=new JPanel(border);
-		p1.setLayout(new FlowLayout());
-		p1.setBackground(bg);
-		p1.setForeground(bg.darker().darker().darker());
-		p1.add(Shell.createLabel(msg));
-		return p1;
-	}
-}

--- a/examples/gui/mouse.scm	Fri Apr 05 21:52:03 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-(import "samer.core.util.swing.*")
-(import "samer.units.*")
-
-(define canvas (VCanvas.))
-(define mouse (MousePosition. canvas))
-(expose canvas "canvas")
-(expose)
-

--- a/examples/misc/args	Fri Apr 05 21:52:03 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#properties
-#Fri Apr 05 21:35:02 BST 2019
-mouse.y.trace.map.minimum=-0.0
-ft.power.plotter.window.bounds=(323,142,512,118)
-mouse.x.trace.map.symmetric=false
-x.editor.plotter.window.bounds=(490,234,231,110)
-scaler.scale.meter.map.maximum=6370.513
-exposed.bounds=(4,23,286,643)
-mouse.exposed.bounds=(448,59,223,119)
-ft.power.trace.map.minimum=0.001
-mouse.y.trace.map.maximum=400.0
-waveform.plotter.window.bounds=(290,23,513,108)
-mouse.y.trace.window.bounds=(694,148,264,86)
-waveform.scaler.laplace.e.plotter.window.bounds=(4,23,1024,118)
-playlist.files='("/Users/samer/Music/Artists/Tunng/comments on the inner chorus/01-Hanged.mp3" "/Users/samer/Music/Artists/Tunng/comments on the inner chorus/02-Woodcat.mp3" "/Users/samer/Music/Artists/Tunng/comments on the inner chorus/03-The Wind Up Bird.mp3" "/Users/samer/Music/Artists/Tunng/comments on the inner chorus/04-Red And Green.mp3" "/Users/samer/Music/Artists/Tunng/comments on the inner chorus/05-Stories.mp3" "/Users/samer/Music/Artists/Tunng/comments on the inner chorus/06-Jenny Again.mp3" "/Users/samer/Music/Artists/Tunng/comments on the inner chorus/07-Man In The Box.mp3" "/Users/samer/Music/Artists/Tunng/comments on the inner chorus/08-Jay Down.mp3" "/Users/samer/Music/Artists/Tunng/comments on the inner chorus/09-It's just because we've got hair.mp3" "/Users/samer/Music/Artists/Tunng/comments on the inner chorus/10-Sweet William.mp3" "/Users/samer/Music/Artists/Tunng/comments on the inner chorus/11-Engine Room.mp3")
-scaler.scale.trace.window.bounds=(336,430,256,86)
-trace.bounds=(493,106,264,86)
-scaler.E=2895.934
-ft.power.trace.map.maximum=60.0
-ft.power.trace.window.bounds=(289,130,515,534)
-mouse.x.trace.map.minimum=0.0
-waveform.scaler.scale=0.023
-scaler.output.plotter.window.bounds=(12,589,1020,118)
-mouse.x.trace.map.maximum=400.0
-mouse.y.trace.map.symmetric=false
-playlist.current=/Users/samer/Music/Onset_paper/UPFsamples/audio/RadioTarifa3.wav
-mouse.x.trace.window.bounds=(693,61,264,86)
-ft.power.image.window.bounds=(287,664,513,64)
-x1.plotter.window.bounds=(440,22,231,118)
-x1.editor.plotter.window.bounds=(419,160,289,121)
-ft.mag.plotter.window.bounds=(502,338,256,118)
-waveform.scaler.scaleRate=0.01
-scaler.scale.meter.map.symmetric=false
-scaler.E.trace.window.bounds=(304,24,338,111)
-mouse.canvas.bounds=(4,23,430,397)
-scaler.scaleRate=0.004
-x1.image.window.bounds=(290,279,197,71)
-scaler.scale=2974.602

--- a/examples/misc/meters.scm	Fri Apr 05 21:52:03 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-(load "filelist.scm")
-(load "lineout.scm")
-(load "audio.scm")
-(load "models.scm")
-(load "functions.scm")
-
-(put "scale.meter" #t)
-(put "E.meter" #t)
-; (put "regulated" #f)
-(put "lineout.meter" #f)
-
-(tasks)
-(define f (linein (linesrc (mono 11025)) 1024 512))
-; (define f (linein (filesource) 1024 512))
-; (set-playlist (ls "/Users/samer/audio/Music/bach-wtc-book1/Gould/11kmono"))
-(define x (norm f))
-(define y (ft-power (ft-vec x)))
-
-(lineout (linesnk (mono 11025)) (get "LineIn"))
-(expose)
- 

--- a/examples/misc/scope.props	Fri Apr 05 21:52:03 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#properties
-#Sat Mar 09 02:11:17 GMT 2002
-y.trace.map.maximum=1.0
-trace.scroll=true
-x.trace.window.bounds=(221,397,372,99)
-canvas.bounds=(0,0,481,371)
-x.trace.map.maximum=1.0
-y.trace.map.symmetric=true
-scroll=true
-trace.color=\#ffff00
-x.trace.map.symmetric=true
-exposed.bounds=(639,0,263,293)
-y.trace.window.bounds=(225,500,368,101)

--- a/examples/misc/scope.scm	Fri Apr 05 21:52:03 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-(load "props.scm")
-
-(import "samer.core.types.*")
-
-(push-properties "scope.props")
-(put "canvas.background" Color.black$)
-(put "canvas.foreground" (Color. 60 220 120))
-(put "trace.background" Color.black$)
-
-(define C (node "canvas" (Plotter.)))
-(expose C "canvas")
-(.exposeMaps C)
-
-(define (oscillator nm freq)
-	(define o (Oscillator. freq))
-	(VParameter. nm (.getFrequencyModel o))
-;	(Product. (Constant. 256.0) o)
-	o
-)
-
-(tasks)
-
-(define x (VDouble. "x"))
-(define y (VDouble. "y"))
-
-(addtasks
-	(GenerateDouble. x (oscillator "fx" 0.1))
-	(GenerateDouble. y (oscillator "fy" 0.1))
-	(SilkTask.
-		(let ((P (.getPen C)))
-			(.moveto P 0 0)
-			(lambda ()
-				(.activate P)
-				(.line (.abs P (.value$ x) (.value$ y)))
-				(.move P)
-			)
-		))
-)
-
-(expose)

--- a/examples/misc/vtrace.scm	Fri Apr 05 21:52:03 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-(load "props.scm")
-
-(push-properties "scope.props")
-(put "trace.background" Color.black$)
-(put "trace.foreground" (Color. 60 220 150))
-(put "regulated" "true")
-
-(define (oscillator name f)
-	(define o (Oscillator. f))
-	(VParameter. name (.getFrequencyModel o))
-	o)
-
-(define (gradient-map c1 c2 n)
-	(define cramp (ColorRamp. n))
-	(.gradient cramp 0 c1 (- n 1) c2)
-	(.getColorModel cramp))
-
-(put "renderer" Renderer.LINE$)
-(put "colormap" (colormap 13
-		Color.red$ 		2 	Color.yellow$ 	4	Color.green$
-	6 	Color.cyan$	8 	Color.blue$ 	10	Color.magenta$
-	12	Color.red$))
-; _________________________________________
-
-(expose)
-
-(define x (VVector. "x" 8))
-(define pl (node "trace" (VectorTrace. x)))
-(addtask pl)
-(addtask (Ops.update x))
-(expose pl "trace")
-(exec x "plotter editor")

Binary file examples/misc/x.vector has changed

--- a/examples/sound/midi/args	Fri Apr 05 21:52:03 2019 +0100
+++ b/examples/sound/midi/args	Fri Apr 05 22:41:58 2019 +0100
@@ -1,5 +1,5 @@
 #properties
-#Fri Apr 05 18:08:19 BST 2019
+#Fri Apr 05 21:58:18 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/args.old	Fri Apr 05 21:52:03 2019 +0100
+++ b/examples/sound/midi/args.old	Fri Apr 05 22:41:58 2019 +0100
@@ -1,5 +1,5 @@
 #properties
-#Fri Apr 05 17:38:20 BST 2019
+#Fri Apr 05 21:56:41 BST 2019
 p.slider.map.maximum=0.001
 decay.slider.map.maximum=0.700
 Tasks.bounds=(290,499,225,145)

--- a/examples/sound/midi/plinky.scm	Fri Apr 05 21:52:03 2019 +0100
+++ b/examples/sound/midi/plinky.scm	Fri Apr 05 22:41:58 2019 +0100
@@ -6,7 +6,7 @@
 (put "colormap" (redgreen))
 (put "symmetric" #t)
 
-(tasks)
+; (tasks)
 
 (define N 64)
 (define M 64)
@@ -19,9 +19,6 @@
 
 (.setGenerator vgen (Binary.))
 
-
-; program 46 is cool!
-; so are 10, 12, 111
 (define midiin (VVector. "midiin" 64))
 (define synth (MidiWithAftertouch. midiin))
 (define m 0)

--- a/examples/sound/sampled/args	Fri Apr 05 21:52:03 2019 +0100
+++ b/examples/sound/sampled/args	Fri Apr 05 22:41:58 2019 +0100
@@ -1,5 +1,5 @@
 #properties
-#Fri Apr 05 21:24:05 BST 2019
+#Fri Apr 05 22:38:56 BST 2019
 function.derivative.plotter.window.bounds=(375,357,426,239)
 sqrt.plotter.window.bounds=(0,0,208,122)
 waveform.image.cell.size=1
@@ -69,7 +69,7 @@
 XEPS=1.0E-6
 spoons=true
 mog.sigmas.editor.image.window.bounds=(238,1,270,125)
-ft.power.trace.window.bounds=(297,22,272,778)
+ft.power.trace.window.bounds=(291,23,280,535)
 z.trace.window.bounds=(5,696,1036,292)
 function.plotter.y.map.maximum=1.099
 signal.trace.window.bounds=(21,69,290,147)
@@ -132,7 +132,7 @@
 cell.size=1
 scaler.output.trace.window.bounds=(0,461,264,278)
 function.plotter.window.bounds=(375,90,416,263)
-ft.power.image.window.bounds=(256,22,1025,37)
+ft.power.image.window.bounds=(291,604,442,58)
 sqrt.trace.window.bounds=(0,0,264,534)
 z.image.window.bounds=(479,637,268,40)
 vector.plotter.window.bounds=(498,531,302,121)
@@ -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,238,64)
+exposed.bounds=(4,23,286,643)
 noise=(Gaussian.)
 audio.offset=-507.6
 step=384

--- a/examples/sound/sampled/args.old	Fri Apr 05 21:52:03 2019 +0100
+++ b/examples/sound/sampled/args.old	Fri Apr 05 22:41:58 2019 +0100
@@ -1,5 +1,5 @@
 #properties
-#Fri Apr 05 21:21:16 BST 2019
+#Fri Apr 05 22:17:43 BST 2019
 function.derivative.plotter.window.bounds=(375,357,426,239)
 sqrt.plotter.window.bounds=(0,0,208,122)
 waveform.image.cell.size=1
@@ -69,7 +69,7 @@
 XEPS=1.0E-6
 spoons=true
 mog.sigmas.editor.image.window.bounds=(238,1,270,125)
-ft.power.trace.window.bounds=(297,22,272,778)
+ft.power.trace.window.bounds=(321,23,250,539)
 z.trace.window.bounds=(5,696,1036,292)
 function.plotter.y.map.maximum=1.099
 signal.trace.window.bounds=(21,69,290,147)
@@ -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,238,64)
+exposed.bounds=(4,23,261,565)
 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
+scaleNormaliser.scale.editor.plotter.window.bounds=(282,629,264,118)
+coder.learn.rate=0.16
 mat.image.window.bounds=(0,0,264,278)
-coder.learn.rate=0.16
-scaleNormaliser.scale.editor.plotter.window.bounds=(282,629,264,118)
 e.trace.window.bounds=(0,89,264,278)
 normaliser.mean=-444.473
 vector.editor.button1=0.1
+test.file=test3.silk
 scaler.E.trace.window.bounds=(360,376,264,86)
-test.file=test3.silk
 p=1.0E-5
 ica.C.image.window.bounds=(516,524,264,278)
 scaler.output.plotter.window.bounds=(627,566,264,75)
+v1.B.editor.window.bounds=(0,0,187,201)
 wavewriter.scale.bounds=(305,57,199,57)
-v1.B.editor.window.bounds=(0,0,187,201)
 midisynth.factor=120.0
+v1.B.image.window.bounds=(0,0,146,54)
 factor=58
-v1.B.image.window.bounds=(0,0,146,54)
 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)
+VState.Optimiser.bounds=(0,0,287,592)
 matrix.rowcolumn.plotter.window.bounds=(0,0,212,136)
-VState.Optimiser.bounds=(0,0,287,592)
 scaler.NlogK.trace.window.bounds=(0,551,264,86)
+joint.histogram.bins.image.window.bounds=(701,314,163,193)
 w1.scale=0.01
-joint.histogram.bins.image.window.bounds=(701,314,163,193)
 ft.mag.diffScaler.output.stacker.output.reshaped.image.map.minimum=1.0
 spectrum.trace.window.bounds=(284,206,256,294)
+normaliser.rate=0.004
 jelly=wobbly
-normaliser.rate=0.004
 vector.reshaped.image.window.bounds=(0,0,146,294)
+mog.weights.editor.plotter.window.bounds=(300,492,225,127)
 mog.-log\ p(s).plotter.window.bounds=(469,627,427,129)
-mog.weights.editor.plotter.window.bounds=(300,492,225,127)
 generator=(oscillator "osc1" 0.1)
 stacker.output.reshaped.image.map.symmetric=false
 waveform.plotter.window.bounds=(364,356,512,118)
+scaler.scale=4715.263
+mog.sigmas.editor.plotter.window.bounds=(300,196,224,117)
 scaler.offsetRate=3.200E-6
-mog.sigmas.editor.plotter.window.bounds=(300,196,224,117)
-scaler.scale=4715.263
 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)
+function.plotter.x.map.maximum=4.0
 vector.image.window.bounds=(113,544,404,72)
-function.plotter.x.map.maximum=4.0
+ica.log\ |W|=-580.779
 x.image.window.bounds=(373,381,265,83)
-ica.log\ |W|=-580.779
 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)
+histogram.sumL.trace.window.bounds=(891,156,264,86)
 spectrum.histogram.bins.image.window.bounds=(451,284,104,534)
-histogram.sumL.trace.window.bounds=(891,156,264,86)
+test.color=\#465f90
 out.trace.window.bounds=(13,401,1036,292)
-test.color=\#465f90
 mog.sigmas.rowcolumn.editor.plotter.window.bounds=(623,452,236,138)
+w1.color=\#817a9b
 ica.e(x).plotter.window.bounds=(333,471,264,118)
-w1.color=\#817a9b
 spectrum.histogram.sumL.trace.window.bounds=(297,845,272,83)
 histogram.bins=96

--- a/examples/sound/sampled/audioio.scm	Fri Apr 05 21:52:03 2019 +0100
+++ b/examples/sound/sampled/audioio.scm	Fri Apr 05 22:41:58 2019 +0100
@@ -31,4 +31,3 @@
 (expose (.getScale wav))	; ditto for file out scaling
 
 (display "Type (start) or press start button to start main loop.\n")
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/sound/sampled/meters.scm	Fri Apr 05 22:41:58 2019 +0100
@@ -0,0 +1,22 @@
+(load "props.scm")
+(load "filelist.scm")
+(load "lineout.scm")
+(load "audio.scm")
+(load "models.scm")
+(load "functions.scm")
+
+(push-properties "args")
+(put "scale.meter" #t)
+(put "E.meter" #t)
+(put "lineout.meter" #f)
+
+(tasks)
+; (define f (linein (linesrc (mono 11025)) 1024 512))
+(define f (linein (filesource) 1024 512))
+(set-playlist (ls "/Users/samer/audio/Music/bach-wtc-book1/Gould/11kmono"))
+(define y (ft-power (ft-vec (norm f))))
+(exec y "trace")
+
+(lineout (linesnk (mono 11025)) (get "LineIn"))
+(expose)
+ 

--- a/examples/sound/sampled/play.scm	Fri Apr 05 21:52:03 2019 +0100
+++ b/examples/sound/sampled/play.scm	Fri Apr 05 22:41:58 2019 +0100
@@ -16,5 +16,3 @@
 (start)
 (.join (thread))
 (exit)
-
-

--- a/examples/sound/sampled/play2.scm	Fri Apr 05 21:52:03 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-(load "audio.scm")
-
-(define fmt (stereo 44100))	; see audio.scm for other options
-
-(define in (linesrc fmt))
-(define out (linesnk fmt)) 
-(define N 2048)	; frame size for audio transfers
-(define x (VVector. "x" N))	; frame of audio data
-
-; this sets up the tasks to run in the main loop, but
-; nothing happens until the loop is started
-(addtasks
-	(.reader in (.array x) 0 N)	; read N samples into x
-	(switch (.writer out (.array x) 0 N))
-)
-