- added missing configure keys for hexter performance parameters

svn path=/trunk/externals/postlude/; revision=15581

4 files changed, 74 insertions, 65 deletions

diff --git a/pluginhost~/doc/pluginhost~-help.pd b/pluginhost~/doc/pluginhost~-help.pd
index 3b6cd1f..1227d33 100644
--- a/pluginhost~/doc/pluginhost~-help.pd
+++ b/pluginhost~/doc/pluginhost~-help.pd
@@ -1,9 +1,9 @@
-#N canvas 186 66 1411 654 10;
+#N canvas 41 96 1411 654 10;
 #X obj 1268 524 catch~ mix;
 #X text 602 15 pluginhost~ - a DSSI host for Pure Data ---------------------------------
 ;
-#X obj 7 63 cnv 15 1400 300 empty empty pluginhost~_instance_1 20 12 0 14
--257472 -66577 0;
+#X obj 7 63 cnv 15 1400 300 empty empty pluginhost~_instance_1 20 12
+0 14 -257472 -66577 0;
 #X obj 443 203 line;
 #X msg 443 182 \$1 10;
 #X obj 441 225 expr $f1 / 127 * 16383;
@@ -27,7 +27,7 @@
 #X obj 303 146 hsl 128 15 0 127 0 0 empty empty empty -2 -6 0 8 -262144
 -1 -1 0 1;
 #X obj 446 144 hsl 128 15 -63 63 0 1 empty empty empty -2 -6 0 8 -262144
--1 -1 6350 1;
+-1 -1 6300 1;
 #X obj 600 291 r dssi1-config;
 #X obj 708 179 s dssi1-config;
 #X obj 912 178 s dssi1-config;
@@ -44,8 +44,8 @@
 #X text 585 97 --program change--;
 #X text 105 96 -----notes-----;
 #X text 718 97 --sysex patch/bank load--;
-#X obj 5 371 cnv 15 600 300 empty empty pluginhost~_instance_2 20 12 0 14
--225280 -66577 0;
+#X obj 5 371 cnv 15 600 300 empty empty pluginhost~_instance_2 20 12
+0 14 -225280 -66577 0;
 #X obj 435 620 throw~ mix;
 #X obj 474 122 loadbang;
 #X msg 613 221 p \$1 0;
@@ -55,7 +55,6 @@
 program and control data:;
 #X obj 595 199 list prepend p 2 0;
 #X text 1126 98 --show/hide GUI--;
-#X obj 1266 547 dssi/output~;
 #X obj 49 186 makenote 80 10000;
 #X msg 1282 136 reset;
 #X msg 1340 136 reset 1;
@@ -74,23 +73,23 @@ program and control data:;
 #X text 806 212 LAST ARGUMENT GIVES PLUGIN INSTANCE TO BE CONFIGURED
 \, NO LAST ARGUMENT=(ALL INSTANCES);
 #X obj 388 620 print;
-#X text 738 458 Usage: [pluginhost~ <[path to libary:plugin name] or [plugin
-name]> <number of plugin instances>];
+#X text 738 458 Usage: [pluginhost~ <[path to libary:plugin name] or
+[plugin name]> <number of plugin instances>];
 #X obj 229 291 pluginhost~ hexter.so:hexter 2;
 #X msg 193 342 control #1 445;
 #X obj 451 394 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
--1 -1 7900 1;
+-1 -1 0 1;
 #X obj 378 582 pluginhost~ sine_faaa 6 -------------;
 #X obj 284 438 expr $f1 \; $f1*2 \; $f1*3 \; $f1*4 \; $f1*5 \; $f1*6
 ;
 #X obj 285 397 loadbang;
 #X msg 285 419 220;
 #X obj 471 394 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
--1 -1 6700 1;
+-1 -1 0 1;
 #X obj 491 394 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
--1 -1 6700 1;
+-1 -1 0 1;
 #X obj 511 394 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
--1 -1 6100 1;
+-1 -1 0 1;
 #X obj 531 394 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
 -1 -1 0 1;
 #X obj 551 394 vsl 15 128 0 1 0 0 empty empty empty 0 -8 0 8 -262144
@@ -99,8 +98,13 @@ name]> <number of plugin instances>];
 values;
 #X text 14 491 Experimental - use with caution!;
 #X msg 54 509 plug sine_faac 6;
-#X connect 0 0 49 0;
-#X connect 0 0 49 1;
+#X obj 1266 547 output~;
+#X msg 733 376 dssi configure pitch_bend_range 12 1;
+#X obj 1109 341 loadbang;
+#X msg 1109 384 1;
+#X msg 742 412 dssi configure portamento_time 50 1;
+#X connect 0 0 82 0;
+#X connect 0 0 82 1;
 #X connect 3 0 5 0;
 #X connect 4 0 3 0;
 #X connect 5 0 17 0;
@@ -109,19 +113,19 @@ values;
 #X connect 8 0 4 0;
 #X connect 9 0 11 1;
 #X connect 10 0 9 0;
-#X connect 11 0 68 0;
-#X connect 12 0 68 0;
+#X connect 11 0 67 0;
+#X connect 12 0 67 0;
 #X connect 13 0 11 0;
-#X connect 14 0 50 0;
-#X connect 15 0 50 0;
+#X connect 14 0 49 0;
+#X connect 15 0 49 0;
 #X connect 16 0 12 0;
-#X connect 17 0 68 0;
-#X connect 19 0 50 0;
-#X connect 20 1 50 0;
+#X connect 17 0 67 0;
+#X connect 19 0 49 0;
+#X connect 20 1 49 0;
 #X connect 21 0 29 0;
 #X connect 22 0 7 0;
 #X connect 23 0 8 0;
-#X connect 24 0 68 0;
+#X connect 24 0 67 0;
 #X connect 28 0 47 0;
 #X connect 29 0 12 1;
 #X connect 30 0 31 0;
@@ -130,43 +134,28 @@ values;
 #X connect 35 0 43 0;
 #X connect 42 0 6 0;
 #X connect 43 0 47 1;
-#X connect 47 0 68 0;
-#X connect 50 0 13 0;
-#X connect 50 1 13 1;
+#X connect 47 0 67 0;
+#X connect 49 0 13 0;
+#X connect 49 1 13 1;
+#X connect 50 0 27 0;
 #X connect 51 0 27 0;
-#X connect 52 0 27 0;
-#X connect 56 0 68 0;
-#X connect 57 0 68 0;
+#X connect 55 0 67 0;
+#X connect 56 0 67 0;
+#X connect 57 0 25 0;
 #X connect 58 0 25 0;
-#X connect 59 0 25 0;
+#X connect 59 0 26 0;
 #X connect 60 0 26 0;
-#X connect 61 0 26 0;
+#X connect 61 0 27 0;
 #X connect 62 0 27 0;
 #X connect 63 0 27 0;
-#X connect 64 0 27 0;
-#X connect 68 0 55 0;
-#X connect 68 1 18 0;
-#X connect 68 2 18 0;
-#X connect 69 0 68 0;
-#X connect 70 0 71 2;
-#X connect 71 0 66 0;
-#X connect 71 1 41 0;
-#X connect 71 2 41 0;
-#X connect 71 3 41 0;
-#X connect 71 4 41 0;
-#X connect 71 5 41 0;
-#X connect 71 6 41 0;
-#X connect 72 0 71 1;
-#X connect 72 1 71 3;
-#X connect 72 2 71 5;
-#X connect 72 3 71 7;
-#X connect 72 4 71 9;
-#X connect 72 5 71 11;
-#X connect 73 0 74 0;
-#X connect 74 0 72 0;
-#X connect 75 0 71 4;
-#X connect 76 0 71 6;
-#X connect 77 0 71 8;
-#X connect 78 0 71 10;
-#X connect 79 0 71 12;
-#X connect 82 0 71 0;
+#X connect 67 0 54 0;
+#X connect 67 1 18 0;
+#X connect 67 2 18 0;
+#X connect 68 0 67 0;
+#X connect 72 0 73 0;
+#X connect 73 0 71 0;
+#X connect 81 0 70 0;
+#X connect 83 0 67 0;
+#X connect 84 0 85 0;
+#X connect 85 0 33 0;
+#X connect 86 0 67 0;
diff --git a/pluginhost~/makefile b/pluginhost~/makefile
index 214466b..0a8a987 100755
--- a/pluginhost~/makefile
+++ b/pluginhost~/makefile
@@ -5,7 +5,7 @@ LIBDIR=/usr/local/lib
 PDDIR=$(LIBDIR)/pd
 INSTALLPATH=$(PDDIR)/extra/
 ARCHITECTURE=i386
-DEBUG=1
+DEBUG=0
 
 current: pd_linux
 
@@ -18,7 +18,7 @@ pd_linux: src/$(NAME).pd_linux
 
 # Debug
 LINUXCFLAGS = -ggdb -g -DPD -O0 -fPIC -funroll-loops -fomit-frame-pointer \
-    -Wall -W -Wshadow -Wstrict-prototypes -Werror \
+    -Wall -W -Wshadow -Wstrict-prototypes  \
     -Wno-unused -Wno-parentheses -Wno-switch -DDEBUG=$(DEBUG)
 
 LINUXINCLUDE =  -I/usr/include -I./include
@@ -41,7 +41,7 @@ pd_darwin: src/$(NAME).pd_darwin
 
 .SUFFIXES: .pd_darwin
 
-DARWINCFLAGS = -DPD -arch $(ARCHITECTURE) -O3 -Wall -Werror -L/usr/local/lib/ -DDEBUG=$(DEBUG)
+DARWINCFLAGS = -g -ggdb -DPD -arch $(ARCHITECTURE) -O0 -Wall -L/usr/local/lib/ -m32 -DDEBUG=$(DEBUG)
 
 DARWININCLUDE = -I ./ -I ../src -I/usr/local/include/ -I ./include -I/usr/local/include/pluginhost/
 
@@ -52,8 +52,8 @@ DARWININCLUDE = -I ./ -I ../src -I/usr/local/include/ -I ./include -I/usr/local/
 	$(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c src/handlers_osc.c
 	$(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c src/handlers_pd.c
 	$(CC) $(DARWINCFLAGS) $(DARWININCLUDE) -c src/ph_common.c
-	$(CC) -arch $(ARCHITECTURE) -bundle -undefined suppress -flat_namespace  -o $(NAME).pd_darwin pluginhost~.o jload.o jsearch.o handlers_osc.o handlers_pd.o ph_common.o
-	rm -f *.o
+	$(CC) -m32 -arch $(ARCHITECTURE) -bundle -undefined suppress -flat_namespace  -o $(NAME).pd_darwin pluginhost~.o jload.o jsearch.o handlers_osc.o handlers_pd.o ph_common.o
+	#rm -f *.o
 
 # ----------------------- Generic -----------------------
 
diff --git a/pluginhost~/src/handlers_pd.c b/pluginhost~/src/handlers_pd.c
index 614c16f..53e4c40 100644
--- a/pluginhost~/src/handlers_pd.c
+++ b/pluginhost~/src/handlers_pd.c
@@ -931,18 +931,38 @@ void handle_pd_dssi(ph *x, t_symbol *s, int argc, t_atom *argv)
                 char *p = encode_7in6(x->instances[instance].perf_buffer,
                         DX7_PERFORMANCE_SIZE);
                 debug = ph_send_configure(x, "performance", p, instance);
+            } else if (!strcmp(key, "mod_wheel_assign"))  {
+                x->instances[instance].perf_buffer[10] = atoi(value);
+                char *p = encode_7in6(x->instances[instance].perf_buffer,
+                        DX7_PERFORMANCE_SIZE);
+                debug = ph_send_configure(x, "performance", p, instance);
             } else if (!strcmp(key, "foot_sensitivity")) {
                 x->instances[instance].perf_buffer[11] = atoi(value);
                 char *p = encode_7in6(x->instances[instance].perf_buffer,
                         DX7_PERFORMANCE_SIZE);
                 debug = ph_send_configure(x, "performance", p, instance);
+            } else if (!strcmp(key, "foot_assign")) {
+                x->instances[instance].perf_buffer[12] = atoi(value);
+                char *p = encode_7in6(x->instances[instance].perf_buffer,
+                        DX7_PERFORMANCE_SIZE);
+                debug = ph_send_configure(x, "performance", p, instance);
             } else if (!strcmp(key, "pressure_sensitivity")) {
                 x->instances[instance].perf_buffer[13] = atoi(value);
                 char *p = encode_7in6(x->instances[instance].perf_buffer,
                         DX7_PERFORMANCE_SIZE);
                 debug = ph_send_configure(x, "performance", p, instance);
+            } else if (!strcmp(key, "pressure_assign")) {
+                x->instances[instance].perf_buffer[14] = atoi(value);
+                char *p = encode_7in6(x->instances[instance].perf_buffer,
+                        DX7_PERFORMANCE_SIZE);
+                debug = ph_send_configure(x, "performance", p, instance);
             } else if (!strcmp(key, "breath_sensitivity")) {
-                x->instances[instance].perf_buffer[4] = atoi(value);
+                x->instances[instance].perf_buffer[15] = atoi(value);
+                char *p = encode_7in6(x->instances[instance].perf_buffer,
+                        DX7_PERFORMANCE_SIZE);
+                debug = ph_send_configure(x, "performance", p, instance);
+            } else if (!strcmp(key, "breath_assign")) {
+                x->instances[instance].perf_buffer[16] = atoi(value);
                 char *p = encode_7in6(x->instances[instance].perf_buffer,
                         DX7_PERFORMANCE_SIZE);
                 debug = ph_send_configure(x, "performance", p, instance);
diff --git a/pluginhost~/src/ph_common.h b/pluginhost~/src/ph_common.h
index 0e7be30..a3d57a9 100644
--- a/pluginhost~/src/ph_common.h
+++ b/pluginhost~/src/ph_common.h
@@ -34,7 +34,7 @@
 #include "dssi.h"
 
 #define PH_NAME           "pluginhost~"
-#define PH_VERSION        0.99
+#define PH_VERSION        0.997
 #define EVENT_BUFSIZE     1024
 #define OSC_PORT          9998
 #define UI_TARGET_ELEMS   2