Merge pull request 'feature-synchronisation' (#11) from feature-synchronisation into main

Reviewed-on: #11

control.scd

@@ -3,7 +3,7 @@
 
 //input mixing, effects and lfos
 
-~inputb = Bus.audio(s, 1);
+~inputb = Bus.audio(s, 1); // bypassing this one for now
 ~infxb = Bus.audio(s, 1);
 
 ~inmixer = SynthDef(
@@ -12,7 +12,7 @@
 		arg in1 = 2, in2 = 3, out = 4;
 		Out.ar(out, In.ar(in1) + In.ar(in2));
 	}
-).play(s, [\in1, ~usbinput1, \in2, ~usbinput2, \out, ~inputb]);
+).play(s, [\in1, ~usbinput1, \in2, ~usbinput2, \out, ~infxb]);
 
 
 // LFO buses and synths
@@ -27,31 +27,6 @@
 
 "LFOs running".postln;
 
-// filter is now before grains
-
-~filtermodb = Bus.control(s, 1);
-
-~filtermod = SynthDef(
-	\filtermod, {
-		arg out, a = 1.0, b = 0.0, c = 0.0;
-		var siga, sigb, sigc;
-		siga = In.kr(~lfoab) * a;
-		sigb = In.kr(~lfobb) * b;
-		sigc = In.kr(~lfocb) * c;
-		Out.kr(out, Wrap.kr(siga + sigb + sigc, -1, 1));
-	}
-).play(s, [\out, ~filtermodb, \a, 1, \b, 0, \c, 0 ]);
-
-
-~filter = SynthDef(
-	\filter, {
-		arg in, out, mod, freq=10000, res=0.3, amp=1.0;
-		var filt, lfo;
-		lfo = LinExp.kr(In.kr(mod, 1), -1, 1, freq * 0.5, freq * 2);
-		filt = RLPF.ar(In.ar(in, 2) * amp, lfo, res);
-		Out.ar(out, filt);
-	}
-).play(s, [ \in, ~inputb, \out, ~infxb, \mod, ~filtermodb, \amp, 0.5], \addToTail);
 
 
 )

effects.scd

@@ -5,6 +5,7 @@
 
 
 ~outfxb = Bus.audio(s, 2);
+~filterb = Bus.audio(s, 2);
 ~delayb = Bus.audio(s, 2);
 ~reverbb = Bus.audio(s, 2);
 
@@ -20,6 +21,34 @@
 
 
 
+// filter is after grains again
+
+~filtermodb = Bus.control(s, 1);
+
+~filtermod = SynthDef(
+	\filtermod, {
+		arg out, a = 1.0, b = 0.0, c = 0.0;
+		var siga, sigb, sigc;
+		siga = In.kr(~lfoab) * a;
+		sigb = In.kr(~lfobb) * b;
+		sigc = In.kr(~lfocb) * c;
+		Out.kr(out, Wrap.kr(siga + sigb + sigc, -1, 1));
+	}
+).play(s, [\out, ~filtermodb, \a, 1, \b, 0, \c, 0 ]);
+
+
+~filter = SynthDef(
+	\filter, {
+		arg in, out, mod, freq=10000, res=0.3, amp=1.0;
+		var filt, lfo;
+		lfo = LinExp.kr(In.kr(mod, 1), -1, 1, freq * 0.5, freq * 2);
+		filt = RLPF.ar(In.ar(in, 2) * amp, lfo, res);
+		Out.ar(out, filt);
+	}
+).play(s, [ \in, ~outfxb, \out, ~filterb, \mod, ~filtermodb, \amp, 0.5], \addToTail);
+
+
+
 
 // delay always passes through 100% of its input + amp % of the delay
 
@@ -31,9 +60,8 @@
  		del = CombC.ar(sig, maxdelay, delaytime, decaytime, amp);
 		Out.ar(out, sig + del);
  	}
- ).play(s, [ \in, ~outfxb, \out, ~delayb ], \addToTail);
+ ).play(s, [ \in, ~filterb, \out, ~delayb ], \addToTail);
 
-// try taking out the reverb because I think it causes noises
 
  ~reverb = SynthDef(
  	\reverb, {

granulator.scd

@@ -6,7 +6,6 @@
 	[ "reverse", \pos_reverse ],
 	[ "sine", \pos_sine ],
 	[ "step", \pos_step ],
-	[ "random", \pos_random ]
 ];
 
 ~outputDir = Platform.recordingsDir +/+ "GrainBuffers";
@@ -15,15 +14,17 @@
 ~grainsb = Bus.audio(s, 2);
 
 ~granulators = Array.new(4);
+~grainmodes = [ 0, 0, 0, 0 ]; // keep track of mode so don't swap if not needed
+~speeds = [ 1, 1, 1, 1 ];     // hacky speed quantisation
 ~posb = Array.new(4);
 ~rectriggerb = Array.new(4);
-~possynths = Array.new(4);
+~patterns = [ nil, nil, nil, nil ];
-~triggersynths = Array.new(4);
+~players = [ nil, nil, nil, nil ];
+~loopsynths = [ nil, nil, nil, nil ];
 
 // create the control busses
 
 (0..3).do({
-	var ps;
 	~posb.add(Bus.control(s, 1));
 	~rectriggerb.add(Bus.control(s, 1));
 });
@@ -35,29 +36,59 @@
 	~granulators.add(Granulator.new(~buflen, ~infxb, ~grainsb, pb, rtb));
 });
 
+// set up the Patterns which drive the position synths
 
-// launch the pos synths and triggers to sync the buffer recorders
+// (0..3).do({ |i|
-
+// 	~patterns.add(~makePattern.value(i, 0, ~speeds[i]));
-(0..3).do({ |i|
+// });
-	var pb = ~posb[i], rtb = ~rectriggerb[i];
+//
-	~possynths.add(Synth(\pos_saw, [ \out, pb, \speed, 1 / ~buflen ]));
+// (0..3).do({|i|
-	~triggersynths.add(Synth(\trigger, [ \out, rtb ]));
+// 	~players.add(~patterns[i].play(~tc, quant: ~beatsperbar))
-});
+// });
-
-// TODO - retrigger the buffer records when changing the length etc
 
 ~setmode = {
 	arg track, mode;
-	var synth = ~modes[mode][1];
+	~grainmodes[track] = mode;
-	~possynths[track].get(\speed, { | speed |
+	if(~players[track].isNil.not,{
-		~possynths[track].free;
+		~players[track].stop;
-		~triggersynths[track].free;
+		~patterns[track].free;
-		~possynths[track] = Synth(synth, [\out, ~posb[track], \speed, speed]);
-		~triggersynths[track] = Synth(\trigger, [ \out, ~rectriggerb[track] ]);
 	});
-	~granulators[track].mode_(mode);
+	~patterns[track] = ~makePattern.value(track, mode, ~speeds[track]);
+	~players[track] = ~patterns[track].play(~tc, quant: ~beatsperbar);
 };
 
+~setspeed = {
+	arg track, speed;
+	if( ~speeds[track] != speed, {
+		~speeds[track] = speed;
+		~players[track].stop;
+		~patterns[track].free;
+		~patterns[track] = ~makePattern.value(track, ~grainmodes[track], ~speeds[track]);
+		~players[track] = ~patterns[track].play(~tc, quant: ~beatsperbar);
+	});
+};
+
+
+~makePattern = {
+	arg track, mode, speed;
+	var ptrig, ppos, synth = ~modes[mode][1];
+	// note: trigger is going off the base tempoclock, not the playback speed - I think this is
+	// the right thing to do but I'm not sure yet
+	ptrig = Pbind(
+		\instrument, \trigger,
+		\dur, ~beatsperbar,
+		\out, ~rectriggerb[track]
+	);
+	ppos = Pbind(
+		\instrument, synth,
+		\dur, ~beatsperbar / speed,
+		\length, ~buflen / speed,
+		\out, ~posb[track]
+	);
+	Ppar([ptrig, ppos]);
+};
+
+
 ~dumpbuffers = { |prefix|
 	(0..3).do({|i|
 		var filename = ~outputDir +/+ prefix ++ 'buffer' ++ i.asString ++ '.aiff';

interface.scd

@@ -24,24 +24,18 @@ OSCdef.freeAll;
 
 ~quantspeed = { |v| 2.pow((v * 4 + 0.5).round - 5) };
 
-// control ganging is hella laggy, do it in TouchOSC
 
-
+~quantharmonics = {
-~setspeed = { | track, v |
+	arg f, quantise=0;
-	var speed, qv = if(~speedquant > 0, { ~quantspeed.value(v) }, { v });
+	if(quantise != 0, {
-	speed = qv / ~buflen;
+		var fraction = f.asFraction(7, false);
-	if(~speedlock > 0, {
+		fraction[0] / fraction[1];
-		(0..3).do({|n|
-			~possynths[n].set(\speed, speed);
-			if( n != track, {
-				var url = ("/grains/speed" ++ n).asSymbol;
-				~to.s_(url, v);
-			});
-		});
 	},
-	{ ~possynths[track].set(\speed, speed) });
+	{ f }
+	);
 };
 
+
 // setrecord: toggles record on (1) or off (0) for a track, and also sets the
 // track's input mix to 0 so that it doesn't start fadeing out. If the track
 // is the currently selected track, set its touchosc control to 0.
@@ -72,20 +66,17 @@ OSCdef.freeAll;
 ~to.slider('/grains/buflen', ~buflen, TouchOSCScale(0.1, 10.0), {});
 
 
+~to.button('/grains/mode0', 0, { |v| ~setmode.value(0, v) });
+~to.button('/grains/mode1', 0, { |v| ~setmode.value(1, v) });
+~to.button('/grains/mode2', 0, { |v| ~setmode.value(2, v) });
+~to.button('/grains/mode3', 0, { |v| ~setmode.value(3, v) });
 
+// needs work
 
-
+~to.slider('/grains/speed0', 1, TouchOSCScale(0, 2), { |v| ~setspeed.value(0, ~quantspeed.value(v)) });
-
+~to.slider('/grains/speed1', 1, TouchOSCScale(0, 2), { |v| ~setspeed.value(1, ~quantspeed.value(v)) });
-
+~to.slider('/grains/speed2', 1, TouchOSCScale(0, 2), { |v| ~setspeed.value(2, ~quantspeed.value(v)) });
-~to.button('/grains/mode0', 0, { |v| ~granulators[0].mode_(v); ~setmode.value(0, v) });
+~to.slider('/grains/speed3', 1, TouchOSCScale(0, 2), { |v| ~setspeed.value(3, ~quantspeed.value(v)) });
-~to.button('/grains/mode1', 0, { |v| ~granulators[1].mode_(v); ~setmode.value(1, v) });
-~to.button('/grains/mode2', 0, { |v| ~granulators[2].mode_(v); ~setmode.value(2, v) });
-~to.button('/grains/mode3', 0, { |v| ~granulators[3].mode_(v); ~setmode.value(3, v) });
-
-~to.slider('/grains/speed0', 1, TouchOSCScale(0, 2), { |v| ~setspeed.value(0, v) });
-~to.slider('/grains/speed1', 1, TouchOSCScale(0, 2), { |v| ~setspeed.value(1, v) });
-~to.slider('/grains/speed2', 1, TouchOSCScale(0, 2), { |v| ~setspeed.value(2, v) });
-~to.slider('/grains/speed3', 1, TouchOSCScale(0, 2), { |v| ~setspeed.value(3, v) });
 
 
 ~to.slider('/grains/passthrough', 0.75, TouchOSCScale(0, 1), { |v| ~grainmixer.set(\passthrough, v) });
@@ -97,24 +88,36 @@ OSCdef.freeAll;
 
 ~to.button('/grains/lock',   0, { |v| ~speedlock = v });
 
-~to.button('/grains/quant',   0, { |v| ~speedquant = v });
+~to.button('/grains/quant',   1, { |v| ~speedquant = v });
+
+~to.button('/grains/metronome', 0, { |v|
+	if( v == 1, {
+		~bps = ~beatsperbar / ~buflen;
+		~tc.tempo_(~bps);
+	});
+
+	~metromix.set(\amp, v)
+});
 
 
 // Page 2: track
 
 
-~to.xy('/track/triggersize', [ 100, 0.125 ], TouchOSCScale(0, 200), TouchOSCScale(0, 0.25), { |v|
+~to.xy('/track/triggersize', [ 100, 0.125 ], TouchOSCScale(0, 200), TouchOSCScale(0, 1), { |v|
 	~granulator.trigger_(v[0]);
 	~granulator.size_(v[1]);
 });
 
-~to.slider('/track/blur',   0, TouchOSCScale(0, 0.25),    { |v| ~granulator.blur_(v) });
+~to.slider('/track/blur',   0, TouchOSCScale(0, 1.0),    { |v| ~granulator.blur_(v) });
 
 ~to.button('/track/dust',   0,                           { |v| ~granulator.dust_(v) });
 ~to.button('/track/back',   0,                           { |v| ~granulator.back_(v)});
-~to.button('/track/slope',   0,                          { |v| ~granulator.slope_(v) });
+~to.button('/track/slope',   1,                          { |v| ~granulator.slope_(v) });
 
 ~to.button('/track/chorus', 0,                            { |v| ~granulator.chorus_(v) });
+~to.slider('/track/harmonics', 2, TouchOSCScale(0.5, 3),     { |v|
+	~granulator.harmonics_(~quantharmonics.value(v, 1))
+});
 ~to.slider('/track/detune', 0, TouchOSCScale(0, 0.059),   { |v| ~granulator.detune_(v) });
 ~to.slider('/track/pitch', 0, TouchOSCScale(-2, 2),       { |v| ~granulator.pitch_(v.round) });
 
@@ -139,6 +142,7 @@ OSCdef.freeAll;
  	~to.v_('/track/slope',  ~granulator.slope);
  	~to.v_('/track/back',   ~granulator.back);
  	~to.v_('/track/chorus', ~granulator.chorus);
+ 	~to.v_('/track/harmonics', ~granulator.harmonics);
  	~to.v_('/track/detune', ~granulator.detune);
  	~to.v_('/track/pitch',  ~granulator.pitch);
  });

main.scd

@@ -11,6 +11,22 @@ Server.killAll;
 (
 Routine.run({
 
+	~usbinput = 2;
+	~usbinput1 = 2;
+	~usbinput2 = 3;
+
+	~bpm = 90;
+	~bps = ~bpm / 60;
+	~beatsperbar = 4;
+	~buflen = ~beatsperbar / ~bps;
+
+	[ "bpm", ~bpm ].postln;
+	[ "buffer length", ~buflen ].postln;
+
+	~tc = TempoClock.new(~bps);
+
+	~touchosc_ip = "192.168.0.209";
+
 	("./synths.scd").loadRelative;
 	Granulator.init(s);
 	s.sync;
@@ -20,11 +36,11 @@ Routine.run({
 	s.sync;
 	("./effects.scd").loadRelative;
 	s.sync;
-	~touchosc_ip = "192.168.0.209";
+	("./sequencer.scd").loadRelative;
+	s.sync;
+	"please wait for the interface to load...".postln;
+	~buflen.sleep;
 	("./interface.scd").loadRelative;
+	"ok go!".postln;
 });
 )
-
-
-
-

sequencer.scd

@@ -0,0 +1,26 @@
+
+(
+
+
+
+~metrob = Bus.audio(s, 2);
+
+~metromix = SynthDef(\metromix, {
+	arg in=1, out=0, amp=1;
+	Out.ar(out, amp * In.ar(in, 2));
+}).play(s, [\in, ~metrob, \out, 0, \amp, 0]);
+
+
+~metronome = Pbind(
+	\instrument, \metronome,
+	\dur, ~beatsperbar,
+	\amp, 0.5,
+	\pan, 0,
+	\out, ~metrob
+).play(~tc);
+
+
+)
+
+
+

synths.scd

@@ -1,37 +1,26 @@
 (
 
-~usbinput = 2;
+SynthDef(\pos_saw, {
-~usbinput1 = 2;
+	arg out, length=1;
-~usbinput2 = 3;
+	Out.kr(out, EnvGen.kr(Env([0, 1], length), doneAction: Done.freeSelf))
-
+}).add();
-~buflen = 4.0;
-~beatsperbar = 4;
 
 SynthDef(\pos_sine, {
-	arg out, speed=1;
+	arg out, length=1;
-	Out.kr(out, 0.5 + SinOsc.kr(speed * 0.5, 0, 0.5));
+	Out.kr(out, EnvGen.kr(Env.sine(length, 1), doneAction: Done.freeSelf))
-}).add;
+}).add();
-
-SynthDef(\pos_saw, {
-	arg out, speed=1;
-	Out.kr(out, 0.5 + LFSaw.kr(speed, 0, 0.5, 0));
-}).add;
 
 SynthDef(\pos_reverse, {
-	arg out, speed=1;
+	arg out, length=1;
-	Out.kr(out, 0.5 - LFSaw.kr(speed, 0, 0.5, 0));
+	Out.kr(out, EnvGen.kr(Env([1, 0], length), doneAction: Done.freeSelf))
-}).add;
+}).add();
 
 SynthDef(\pos_step, {
-	arg out, speed=1, steps=8;
+	arg out, length=1;
-	var stepwise = LFSaw.kr(speed, 0.0, 0.5 * steps, 0.5 * steps).floor;
+	var levels = (0..8) / 8, times = (length / 8) ! 7;
-	Out.kr(out, stepwise / steps);
+	Out.kr(out, EnvGen.kr(Env(levels: levels, times: times, curve: \hold), doneAction: Done.freeSelf));
-}).add;
+}).add();
 
-SynthDef(\pos_random, {
-	arg out=5, speed=1;
-	Out.kr(out, 0.5 + WhiteNoise.kr(0.5));
-}).add;
 
 SynthDef(\lfo, {
 	arg out, freq=1, amp=0;
@@ -40,8 +29,17 @@ SynthDef(\lfo, {
 
 SynthDef(\trigger, {
 	arg out=1;
-	Out.kr(out, Impulse.kr(0))
+	Out.kr(out, EnvGen.kr(Env.perc(0.001, 0.2, 2), levelScale:2.0, levelBias:-1,doneAction:Done.freeSelf));
 }).add;
 
 
+SynthDef(\metronome, {
+	arg out=0, amp=1, pan=0, filter=1000, atk=0.01, rel=0.1;
+	var sig, env;
+	env = EnvGen.kr(Env.perc(atk, rel, amp), doneAction: Done.freeSelf);
+	sig = HPF.ar(WhiteNoise.ar(), filter);
+	Out.ar(out, Pan2.ar(sig * env, pan));
+}
+).add;
+
 )