added define_loudspeakers help and added vbap-demo.pd to the vbap help patch

svn path=/trunk/externals/vbap/; revision=1122

3 files changed, 33 insertions, 12 deletions

diff --git a/define_loudspeakers-help.pd b/define_loudspeakers-help.pd
new file mode 100644
index 0000000..44ccce1
--- /dev/null
+++ b/define_loudspeakers-help.pd
@@ -0,0 +1,20 @@
+#N canvas 413 238 598 438 10;
+#X text 113 179 In two dimensions \, only specify the azimuth. (for
+example "define_loudspeakers 2 -45 45 0 180";
+#X obj 15 276 define_loudspeakers 3 -45 0 45 0 0 45 180 45;
+#X msg 15 250 bang;
+#X obj 339 275 define_loudspeakers 2 -45 45 0 180;
+#X obj 290 359 vbap 0 0;
+#X text 113 39 [define_loudspeakers] works with;
+#X obj 345 39 vbap;
+#X obj 488 150 vbap;
+#X text 114 81 Use [define_loudspeakers] to list the speaker positions.
+The example here defines loudspeakers in three dimensions (the first
+parameter). For each speaker \, define its azimuth and elevation. Here
+we have speakers front left and right with no elevation (-45 0 45 0)
+and front and back with 45 degrees of elevation (0 45 180 45). Send
+the data to:;
+#X text 214 392 (see [vbap] for more details);
+#X connect 1 0 4 0;
+#X connect 2 0 1 0;
+#X connect 3 0 4 0;
diff --git a/makefile b/makefile
index 0d7d9bb..4df839b 100644
--- a/makefile
+++ b/makefile
@@ -101,7 +101,7 @@ LINUXINCLUDE =  -I../../src
 # ----------------------------------------------------------
 
 install:
-	cp help-*.pd ../../doc/5.reference
+	cp vbap-*.pd ../../doc/5.reference
 
 clean:
 	rm -f *.o *.pd_* so_locations
diff --git a/vbap-help.pd b/vbap-help.pd
index 7a1f979..20696bb 100644
--- a/vbap-help.pd
+++ b/vbap-help.pd
@@ -1,4 +1,4 @@
-#N canvas 91 360 949 493 10;
+#N canvas 91 360 953 497 10;
 #X obj 112 257 vbap 0 0;
 #X obj 134 319 print;
 #X obj 62 113 define_loudspeakers 3 -45 0 45 0 0 45 180 45;
@@ -9,15 +9,15 @@ parameter). For each speaker \, define its azimuth and elevation. Here
 we have speakers front left and right with no elevation (-45 0 45 0)
 and front and back with 45 degrees of elevation (0 45 180 45). Send
 the data to vbap.;
-#X floatatom 129 223 5 0 0;
-#X floatatom 173 223 5 0 0;
-#X floatatom 217 223 5 0 0;
+#X floatatom 129 223 5 0 0 0 - - -;
+#X floatatom 173 223 5 0 0 0 - - -;
+#X floatatom 217 223 5 0 0 0 - - -;
 #X msg 112 179 bang;
 #X obj 112 356 route 0 1 2 3;
-#X floatatom 112 415 10 0 0;
-#X floatatom 191 415 10 0 0;
-#X floatatom 270 415 10 0 0;
-#X floatatom 349 415 10 0 0;
+#X floatatom 112 415 10 0 0 0 - - -;
+#X floatatom 191 415 10 0 0 0 - - -;
+#X floatatom 270 415 10 0 0 0 - - -;
+#X floatatom 349 415 10 0 0 0 - - -;
 #X text 442 169 In two dimensions \, only specify the azimuth. (for
 example "define_loudspeakers 2 -45 45 0 180";
 #X text 151 201 azimuth \, elevation and spread;
@@ -27,14 +27,15 @@ zexy-library \, see vbap-demo.pd.;
 #X text 444 300 The spread-parameter can be used to prevent a situation
 where sound is coming from one speaker only \, which would make speaker
 positions "visible". The range is 0 to 100;
-#X floatatom 152 286 5 0 0;
-#X floatatom 196 286 5 0 0;
-#X floatatom 240 286 5 0 0;
+#X floatatom 152 286 5 0 0 0 - - -;
+#X floatatom 196 286 5 0 0 0 - - -;
+#X floatatom 240 286 5 0 0 0 - - -;
 #X text 178 306 actual location;
 #X text 444 222 2 For vbap \, give azimuth and elevation for the desired
 location. Bang the first inlet and vbap will output gain-factors for
 each speaker and the actual location produced. This can be different
 from the desired one depending where your speakers are.;
+#X obj 600 390 vbap-demo;
 #X connect 0 0 1 0;
 #X connect 0 0 9 0;
 #X connect 0 1 19 0;