aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2014-12-24 14:17:15 +0100
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2014-12-24 14:17:15 +0100
commitfe5bf7a3557eca82a52ca36882486a5c3ee895c0 (patch)
tree1bd26ac481d8430b5952df7885fc67efc9b4464b
parent1adc33fcbd18bdb74b9cf1a8d8154a3b41c6eadf (diff)
downloadchimaera_sc-fe5bf7a3557eca82a52ca36882486a5c3ee895c0.zip
chimaera_sc-fe5bf7a3557eca82a52ca36882486a5c3ee895c0.tar.gz
chimaera_sc-fe5bf7a3557eca82a52ca36882486a5c3ee895c0.tar.bz2
chimaera_sc-fe5bf7a3557eca82a52ca36882486a5c3ee895c0.tar.xz
migrate from /n_set to /n_setn, add initial support for derivatives
-rw-r--r--classes/ChimaeraOutSCSynth2F.sc6
-rw-r--r--classes/ChimaeraOutSCSynth4F.sc11
-rw-r--r--ignore/instruments/2F/anabase.sc2
-rw-r--r--ignore/instruments/2F/analog.sc2
-rw-r--r--ignore/instruments/2F/anamin.sc2
-rw-r--r--ignore/instruments/2F/blip.sc2
-rw-r--r--ignore/instruments/2F/degree.sc2
-rw-r--r--ignore/instruments/2F/filter.sc2
-rw-r--r--ignore/instruments/2F/grain.sc2
-rw-r--r--ignore/instruments/2F/pluck.sc2
-rw-r--r--ignore/instruments/2F/pluck_cubic.sc2
-rw-r--r--ignore/instruments/2F/pluck_vlf.sc2
-rw-r--r--ignore/instruments/2F/sine.sc2
-rw-r--r--ignore/instruments/2F/syncsaw.sc2
-rw-r--r--ignore/instruments/2F/theremin.sc2
-rw-r--r--ignore/instruments/2F/wind.sc2
-rw-r--r--ignore/instruments/4F/anabase.sc2
-rw-r--r--ignore/instruments/4F/cello.sc2
-rw-r--r--ignore/instruments/4F/pluck.sc2
-rwxr-xr-xignore/scsynth_to_scsynth2F.sc1
-rwxr-xr-xignore/scsynth_to_scsynth4F.sc3
21 files changed, 29 insertions, 26 deletions
diff --git a/classes/ChimaeraOutSCSynth2F.sc b/classes/ChimaeraOutSCSynth2F.sc
index 9605bd9..8ae9f03 100644
--- a/classes/ChimaeraOutSCSynth2F.sc
+++ b/classes/ChimaeraOutSCSynth2F.sc
@@ -40,8 +40,8 @@ ChimaeraOutSCSynth2F : ChimaeraOut {
var lag = time - SystemClock.seconds;
if(lag < 0) { ("message late"+(lag*1000)+"ms").postln; };
- s.sendMsg('/s_new', instruments[gid], sid+sidOffset, \addToHead, gid+gidOffset, 'out', gid, 'gate', 0);
- s.sendBundle(lag, ['/n_set', sid+sidOffset, 0, x, 1, z, 2, pid, 'gate', 1]);
+ s.sendMsg('/s_new', instruments[gid], sid+sidOffset, \addToHead, gid+gidOffset, 4, pid, 'out', gid, 'gate', 1);
+ s.sendBundle(lag, ['/n_setn', sid+sidOffset, 0, 2, x, z]);
}
off { |time, sid| // set callback function for blob off-events
@@ -55,7 +55,7 @@ ChimaeraOutSCSynth2F : ChimaeraOut {
var lag = time - SystemClock.seconds;
if(lag < 0) { ("message late"+(lag*1000)+"ms").postln; };
- s.sendBundle(lag, ['/n_set', sid+sidOffset, 0, x, 1, z]);
+ s.sendBundle(lag, ['/n_setn', sid+sidOffset, 0, 2, x, z]);
}
idle { |time|
diff --git a/classes/ChimaeraOutSCSynth4F.sc b/classes/ChimaeraOutSCSynth4F.sc
index a3a0b1a..b3d5f1e 100644
--- a/classes/ChimaeraOutSCSynth4F.sc
+++ b/classes/ChimaeraOutSCSynth4F.sc
@@ -45,10 +45,11 @@ ChimaeraOutSCSynth4F : ChimaeraOut {
lookup[sid] = gid;
if(gid==0) {
- s.sendMsg('/s_new', instruments[gid], sid+sidOffset, \addToHead, grp, 'out', gid, 'gate', 0);
- s.sendBundle(lag, ['/n_set', sid+sidOffset, 0, x, 1, z, 2, pid, 'gate', 1]);
+ s.sendMsg('/s_new', instruments[gid], sid+sidOffset, \addToHead, grp, 4, pid, 'out', gid, 'gate', 1);
+ s.sendBundle(lag, ['/n_setn', sid+sidOffset, 0, 2, x, z]);
} {
- s.sendBundle(lag, ['/n_set', grp, 3, x, 4, z, 5, pid]);
+ s.sendBundle(lag, ['/n_set', grp, 9, pid]);
+ s.sendBundle(lag, ['/n_setn', grp, 5, 2, x, z]);
};
}
@@ -74,9 +75,9 @@ ChimaeraOutSCSynth4F : ChimaeraOut {
gid = lookup[sid];
if(gid==0) {
- s.sendBundle(lag, ['/n_set', sid+sidOffset, 0, x, 1, z]);
+ s.sendBundle(lag, ['/n_setn', sid+sidOffset, 0, 2, x, z]);
} {
- s.sendBundle(lag, ['/n_set', grp, 3, x, 4, z]);
+ s.sendBundle(lag, ['/n_setn', grp, 5, 2, x, z]);
};
}
diff --git a/ignore/instruments/2F/anabase.sc b/ignore/instruments/2F/anabase.sc
index b01f14d..e3c945f 100644
--- a/ignore/instruments/2F/anabase.sc
+++ b/ignore/instruments/2F/anabase.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/analog.sc b/ignore/instruments/2F/analog.sc
index 3854802..f60594a 100644
--- a/ignore/instruments/2F/analog.sc
+++ b/ignore/instruments/2F/analog.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, cutoff, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/anamin.sc b/ignore/instruments/2F/anamin.sc
index 7302204..9447c08 100644
--- a/ignore/instruments/2F/anamin.sc
+++ b/ignore/instruments/2F/anamin.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, sig1, sig2, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/blip.sc b/ignore/instruments/2F/blip.sc
index 651f5d8..275b5d2 100644
--- a/ignore/instruments/2F/blip.sc
+++ b/ignore/instruments/2F/blip.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/degree.sc b/ignore/instruments/2F/degree.sc
index ce283c9..19142bb 100644
--- a/ignore/instruments/2F/degree.sc
+++ b/ignore/instruments/2F/degree.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, vol, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/filter.sc b/ignore/instruments/2F/filter.sc
index 921ecdf..1c2f97a 100644
--- a/ignore/instruments/2F/filter.sc
+++ b/ignore/instruments/2F/filter.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var freq, env, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/grain.sc b/ignore/instruments/2F/grain.sc
index 334dd22..433f9cc 100644
--- a/ignore/instruments/2F/grain.sc
+++ b/ignore/instruments/2F/grain.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, trig, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/pluck.sc b/ignore/instruments/2F/pluck.sc
index f525e9c..49d2679 100644
--- a/ignore/instruments/2F/pluck.sc
+++ b/ignore/instruments/2F/pluck.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, vol, cut, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/pluck_cubic.sc b/ignore/instruments/2F/pluck_cubic.sc
index ebb6e38..7d19ba2 100644
--- a/ignore/instruments/2F/pluck_cubic.sc
+++ b/ignore/instruments/2F/pluck_cubic.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, vol, cut, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/pluck_vlf.sc b/ignore/instruments/2F/pluck_vlf.sc
index dafd8be..071730d 100644
--- a/ignore/instruments/2F/pluck_vlf.sc
+++ b/ignore/instruments/2F/pluck_vlf.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, vol, cut, noise, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/sine.sc b/ignore/instruments/2F/sine.sc
index 4e9ddbb..2241124 100644
--- a/ignore/instruments/2F/sine.sc
+++ b/ignore/instruments/2F/sine.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, amp, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/syncsaw.sc b/ignore/instruments/2F/syncsaw.sc
index a4cbc23..5d365d3 100644
--- a/ignore/instruments/2F/syncsaw.sc
+++ b/ignore/instruments/2F/syncsaw.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, freq2, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/theremin.sc b/ignore/instruments/2F/theremin.sc
index b7122bc..f5147ac 100644
--- a/ignore/instruments/2F/theremin.sc
+++ b/ignore/instruments/2F/theremin.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=0, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, amp, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/2F/wind.sc b/ignore/instruments/2F/wind.sc
index 71d5727..086b327 100644
--- a/ignore/instruments/2F/wind.sc
+++ b/ignore/instruments/2F/wind.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x=0, y=0, p=0, gate=1, out=0|
+ SynthDef(synthname, {|x=0, y=0, vx=0, vy=0, p=0, gate=0, out=0|
var env, freq, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/4F/anabase.sc b/ignore/instruments/4F/anabase.sc
index 6a5aee5..c06f5f5 100644
--- a/ignore/instruments/4F/anabase.sc
+++ b/ignore/instruments/4F/anabase.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x1=0, y1=0, p1=0, x2=0, y2=0, p2=0, gate=1, out=0|
+ SynthDef(synthname, {|x1=0, y1=0, vx1=0, vy1=0, p1=0, x2=0, y2=0, vx2=0, vy2=0, p2=0, gate=1, out=0|
var env, freq1, freq2, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/4F/cello.sc b/ignore/instruments/4F/cello.sc
index 477e40d..b121d85 100644
--- a/ignore/instruments/4F/cello.sc
+++ b/ignore/instruments/4F/cello.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x1=0, y1=0, p1=0, x2=0, y2=0, p2=0, gate=0, out=0|
+ SynthDef(synthname, {|x1=0, y1=0, vx1=0, vy1=0, p1=0, x2=0, y2=0, vx2=0, vy2=0, p2=0, gate=1, out=0|
var env, freq1, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/instruments/4F/pluck.sc b/ignore/instruments/4F/pluck.sc
index fcd8ee3..9aedf41 100644
--- a/ignore/instruments/4F/pluck.sc
+++ b/ignore/instruments/4F/pluck.sc
@@ -22,7 +22,7 @@
*/
{|synthname, n|
- SynthDef(synthname, {|x1=0, y1=0, p1=0, x2=0, y2=0, p2=0, gate=0, out=0|
+ SynthDef(synthname, {|x1=0, y1=0, vx1=0, vy1=0, p1=0, x2=0, y2=0, vx2=0, vy2=0, p2=0, gate=1, out=0|
var env, freq1, freq2, sig;
env = Linen.kr(gate, 0.01, 1.0, 1.0, doneAction:2);
diff --git a/ignore/scsynth_to_scsynth2F.sc b/ignore/scsynth_to_scsynth2F.sc
index 2a9fdf5..b3ccdde 100755
--- a/ignore/scsynth_to_scsynth2F.sc
+++ b/ignore/scsynth_to_scsynth2F.sc
@@ -62,6 +62,7 @@ s.doWhenBooted({
chimconf.sendMsg("/sensors/group/attributes/1", 0.0, 1.0, true, false, false); // add group
chimconf.sendMsg("/engines/scsynth/enabled", true); // enable scsynth output engine
+ chimconf.sendMsg("/engines/scsynth/derivatives", false);
chimconf.sendMsg("/engines/scsynth/attributes/0", \base, sidOffset, 0+gidOffset, 0, 0, true, true, \addToHead.asInt, false);
chimconf.sendMsg("/engines/scsynth/attributes/1", \lead, sidOffset, 1+gidOffset, 1, 0, true, true, \addToHead.asInt, false);
diff --git a/ignore/scsynth_to_scsynth4F.sc b/ignore/scsynth_to_scsynth4F.sc
index 354a840..ec4fc46 100755
--- a/ignore/scsynth_to_scsynth4F.sc
+++ b/ignore/scsynth_to_scsynth4F.sc
@@ -63,8 +63,9 @@ s.doWhenBooted({
chimconf.sendMsg("/sensors/group/attributes/1", 0.0, 1.0, true, false, false); // add group
chimconf.sendMsg("/engines/scsynth/enabled", true); // enable scsynth output engine
+ chimconf.sendMsg("/engines/scsynth/derivatives", false);
chimconf.sendMsg("/engines/scsynth/attributes/0", \base, sidOffset, grp, 0, 0, true, true, \addToHead.asInt, false);
- chimconf.sendMsg("/engines/scsynth/attributes/1", \lead, sidOffset, grp, 0, 3, false, false, \addToHead.asInt, true);
+ chimconf.sendMsg("/engines/scsynth/attributes/1", \lead, sidOffset, grp, 0, 5, false, false, \addToHead.asInt, true);
s.sendMsg('/g_new', grp, \addToHead.asInt, 0);
s.sync;