aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2015-11-30 15:14:58 +0100
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2015-11-30 15:14:58 +0100
commitf6712293bf13d2f7f869d5c4793969eb2b8b434e (patch)
treecaf0d0e3e326194a7d47e6fed8044c9265a8ae40
parentd1697b7f721b6d38fb0fbac2d5a31f1daf0dfcb0 (diff)
downloadchimaera_sc-f6712293bf13d2f7f869d5c4793969eb2b8b434e.zip
chimaera_sc-f6712293bf13d2f7f869d5c4793969eb2b8b434e.tar.gz
chimaera_sc-f6712293bf13d2f7f869d5c4793969eb2b8b434e.tar.bz2
chimaera_sc-f6712293bf13d2f7f869d5c4793969eb2b8b434e.tar.xz
simplifications, part II.
-rw-r--r--classes/ChimaeraOutSCSynth2F.sc8
-rw-r--r--classes/ChimaeraOutSCSynth4F.sc8
-rwxr-xr-xignore/dummy_to_scsynth2F.sc9
-rw-r--r--ignore/instruments4F.sc6
-rwxr-xr-xignore/osc_to_scsynth2F.sc2
-rwxr-xr-xignore/scsynth_to_scsynth2F.sc7
-rwxr-xr-xignore/scsynth_to_scsynth4F.sc4
-rwxr-xr-xignore/tuio2_to_scsynth2F.sc9
-rwxr-xr-xignore/tuio2_to_scsynth4F.sc7
9 files changed, 36 insertions, 24 deletions
diff --git a/classes/ChimaeraOutSCSynth2F.sc b/classes/ChimaeraOutSCSynth2F.sc
index 89d8675..a1a4867 100644
--- a/classes/ChimaeraOutSCSynth2F.sc
+++ b/classes/ChimaeraOutSCSynth2F.sc
@@ -18,8 +18,12 @@
ChimaeraOutSCSynth2F : ChimaeraOut {
var sidOffset, gidOffset, instruments, s;
- init {|iS, n, groups|
- instruments = groups;
+ init {|iS, n=160, groups|
+ if(group.notNil, {
+ instruments = groups;
+ }, {
+ instruments = [\synth_0, \synth_1, \synth_2, \synth_3, \synth_4, \synth_5, \synth_6, \synth_7];
+ });
s = iS;
gidOffset = 100;
diff --git a/classes/ChimaeraOutSCSynth4F.sc b/classes/ChimaeraOutSCSynth4F.sc
index eb5a1f0..c7fa2c7 100644
--- a/classes/ChimaeraOutSCSynth4F.sc
+++ b/classes/ChimaeraOutSCSynth4F.sc
@@ -18,8 +18,12 @@
ChimaeraOutSCSynth4F : ChimaeraOut {
var sidOffset, gidOffset, instruments, s, grp, lookup;
- init {|iS, n, groups|
- instruments = groups;
+ init {|iS, n=160, groups|
+ if(group.notNil, {
+ instruments = groups;
+ }, {
+ instruments = [\synth_0, \synth_1, \synth_2, \synth_3, \synth_4, \synth_5, \synth_6, \synth_7];
+ });
s = iS;
gidOffset = 100;
diff --git a/ignore/dummy_to_scsynth2F.sc b/ignore/dummy_to_scsynth2F.sc
index 8dd913d..ea10645 100755
--- a/ignore/dummy_to_scsynth2F.sc
+++ b/ignore/dummy_to_scsynth2F.sc
@@ -19,8 +19,8 @@
s.options.blockSize = 0x10;
s.options.memSize = 0x10000;
-s.options.numInputBusChannels = 8;
-s.options.numOutputBusChannels = 8;
+s.options.numInputBusChannels = 0;
+s.options.numOutputBusChannels = 2;
s.latency = nil;
s.boot;
@@ -46,10 +46,11 @@ s.doWhenBooted({
chimconf.sendMsg("/sensors/number", {|msg|
var n = msg[0];
- chimout = ChimaeraOutSCSynth2F(s, n, [\synth_0, \synth_1]);
+ var synths = [\synth_0, \synth_1];
+ chimout = ChimaeraOutSCSynth2F(s, n, synths);
chimin = ChimaeraInDummy(s, chimconf, chimout);
Routine.run({
- "./instruments2F.sc".load.value(n, [\synth_0, \synth_1]);
+ "./instruments2F.sc".load.value(n, synths);
}, clock:AppClock);
});
})
diff --git a/ignore/instruments4F.sc b/ignore/instruments4F.sc
index 0ec6907..0446ed1 100644
--- a/ignore/instruments4F.sc
+++ b/ignore/instruments4F.sc
@@ -36,13 +36,13 @@
(path++inst++".sc").load.value(group, n);
};
- loadInst.value(\inst_0, baseInst[0]);
+ loadInst.value(\synth_0, baseInst[0]);
- win = Window.new("4F Instruments", Rect(200,200,200,100)).front;
+ win = Window.new("4F Instruments", Rect(200,200,200,40)).front;
adrop = PopUpMenu(win, Rect(10,10,180,20));
adrop.items = baseInst;
adrop.action = {|menu|
- loadInst.value(\inst_0, menu.item);
+ loadInst.value(\synth_0, menu.item);
};
}
diff --git a/ignore/osc_to_scsynth2F.sc b/ignore/osc_to_scsynth2F.sc
index 108f036..98b3064 100755
--- a/ignore/osc_to_scsynth2F.sc
+++ b/ignore/osc_to_scsynth2F.sc
@@ -19,7 +19,7 @@
s.options.blockSize = 0x10;
s.options.memSize = 0x10000;
-s.options.numInputBusChannels = 8;
+s.options.numInputBusChannels = 0;
s.options.numOutputBusChannels = 8;
s.latency = nil;
s.boot;
diff --git a/ignore/scsynth_to_scsynth2F.sc b/ignore/scsynth_to_scsynth2F.sc
index 6b1390f..0b5c930 100755
--- a/ignore/scsynth_to_scsynth2F.sc
+++ b/ignore/scsynth_to_scsynth2F.sc
@@ -20,8 +20,8 @@
s.options.protocol = \tcp;
s.options.blockSize = 0x10;
s.options.memSize = 0x10000;
-s.options.numInputBusChannels = 8;
-s.options.numOutputBusChannels = 8;
+s.options.numInputBusChannels = 0;
+s.options.numOutputBusChannels = 2;
s.latency = nil;
s.boot;
@@ -63,8 +63,9 @@ s.doWhenBooted({
chimconf.sendMsg("/sensors/number", {|msg|
var n=msg[0];
+ var synths = [\synth_0, \synth_1];
Routine.run({
- "./instruments2F.sc".load.value(n, [\synth_0, \synth_1]);
+ "./instruments2F.sc".load.value(n, synths);
}, clock:AppClock);
});
})
diff --git a/ignore/scsynth_to_scsynth4F.sc b/ignore/scsynth_to_scsynth4F.sc
index 26b0b3e..fefd4d6 100755
--- a/ignore/scsynth_to_scsynth4F.sc
+++ b/ignore/scsynth_to_scsynth4F.sc
@@ -20,8 +20,8 @@
s.options.protocol = \tcp;
s.options.blockSize = 0x10;
s.options.memSize = 0x10000;
-s.options.numInputBusChannels = 8;
-s.options.numOutputBusChannels = 8;
+s.options.numInputBusChannels = 0;
+s.options.numOutputBusChannels = 1;
s.latency = nil;
s.boot;
diff --git a/ignore/tuio2_to_scsynth2F.sc b/ignore/tuio2_to_scsynth2F.sc
index 5e456df..71b0f37 100755
--- a/ignore/tuio2_to_scsynth2F.sc
+++ b/ignore/tuio2_to_scsynth2F.sc
@@ -19,8 +19,8 @@
s.options.blockSize = 0x10;
s.options.memSize = 0x10000;
-s.options.numInputBusChannels = 8;
-s.options.numOutputBusChannels = 8;
+s.options.numInputBusChannels = 0;
+s.options.numOutputBusChannels = 2;
s.latency = nil;
s.boot;
@@ -46,10 +46,11 @@ s.doWhenBooted({
chimconf.sendMsg("/sensors/number", {|msg|
var n = msg[0];
- chimout = ChimaeraOutSCSynth2F(s, n, [\synth_0, \synth_1]);
+ var synths = [\synth_0, \synth_1];
+ chimout = ChimaeraOutSCSynth2F(s, n, synths);
chimin = ChimaeraInTuio2(s, chimconf, chimout);
Routine.run({
- "./instruments2F.sc".load.value(n, [\synth_0, \synth_1]);
+ "./instruments2F.sc".load.value(n, synths);
}, clock:AppClock);
});
})
diff --git a/ignore/tuio2_to_scsynth4F.sc b/ignore/tuio2_to_scsynth4F.sc
index 317765b..1a2d5bc 100755
--- a/ignore/tuio2_to_scsynth4F.sc
+++ b/ignore/tuio2_to_scsynth4F.sc
@@ -19,8 +19,8 @@
s.options.blockSize = 0x10;
s.options.memSize = 0x10000;
-s.options.numInputBusChannels = 8;
-s.options.numOutputBusChannels = 8;
+s.options.numInputBusChannels = 0;
+s.options.numOutputBusChannels = 1;
s.latency = nil;
s.boot;
@@ -46,7 +46,8 @@ s.doWhenBooted({
chimconf.sendMsg("/sensors/number", {|msg|
var n = msg[0];
- chimout = ChimaeraOutSCSynth4F(s, n, [\synth_0, \synth_1]);
+ var synths = [\synth_0];
+ chimout = ChimaeraOutSCSynth4F(s, n, synths);
chimin = ChimaeraInTuio2(s, chimconf, chimout);
Routine.run({
"./instruments4F.sc".load.value(n);