diff --git a/sound_algo/data_only/morceaux/03_acid_line.scd b/sound_algo/data_only/morceaux/03_acid_line.scd index 3a27f01..dd136a3 100644 --- a/sound_algo/data_only/morceaux/03_acid_line.scd +++ b/sound_algo/data_only/morceaux/03_acid_line.scd @@ -34,7 +34,7 @@ SynthDef(\cc_acid_kick, { |out=0, amp=0.6| ctx[\cut] = (1 - (hf[\ry] ? 1)).clip(0, 1).linexp(0, 1, 200, 4000); ctx[\res] = (hf[\ropen] ? 0.3).clip(0, 1); ctx[\oct] = ((hf[\ly] ? 0.5) < 0.4).if({ 1 }, { 0 }); // octave up - ~concert[\clock] !? { |c| c.tempo = speed.linlin(0, 0.6, 124, 140).clip(124, 140) / 60 }; + ~setTempo.(speed.linlin(0, 0.6, 124, 140).clip(124, 140)); }, tick: { |ctx, pose, beat| var sixteenth = (0.25 / ~ccCtlDur).round.max(1); @@ -52,7 +52,7 @@ SynthDef(\cc_acid_kick, { |out=0, amp=0.6| }; }; }, - stop: { |ctx| ~concert[\clock] !? { |c| c.tempo = 126/60 } }, + stop: { |ctx| ~setTempo.(126) }, )); "[morceau] Acid Line loaded".postln; ) diff --git a/sound_algo/data_only/morceaux/12_trance.scd b/sound_algo/data_only/morceaux/12_trance.scd index 167a75b..5cbf205 100644 --- a/sound_algo/data_only/morceaux/12_trance.scd +++ b/sound_algo/data_only/morceaux/12_trance.scd @@ -57,7 +57,7 @@ SynthDef(\cc_trance_pad, { |out=0, freq1=110, freq2=138, freq3=165, cutoff=1200, ctx[\dens] = 2; ctx[\pad] = Synth(\cc_trance_pad, [\freq1, f1, \freq2, f2, \freq3, f3, \cutoff, 1200, \amp, 0.28]); - ~concert[\clock] !? { |c| c.tempo = 138 / 60 }; + ~setTempo.(138); }, update: { |ctx, pose| var hf = pose[\hands]; @@ -92,7 +92,7 @@ SynthDef(\cc_trance_pad, { |out=0, freq1=110, freq2=138, freq3=165, cutoff=1200, }, stop: { |ctx| ctx[\pad] !? { |s| s.set(\gate, 0) }; - ~concert[\clock] !? { |c| c.tempo = 126 / 60 }; + ~setTempo.(126); }, )); "[morceau] Trance loaded".postln; diff --git a/sound_algo/data_only/morceaux/13_psytrance.scd b/sound_algo/data_only/morceaux/13_psytrance.scd index a6e7836..b35c89b 100644 --- a/sound_algo/data_only/morceaux/13_psytrance.scd +++ b/sound_algo/data_only/morceaux/13_psytrance.scd @@ -46,7 +46,7 @@ SynthDef(\cc_psy_zap, { |out=0, freq=440, amp=0.18, pan=0| ctx[\cut] = 800.0; ctx[\res] = 0.25; ctx[\zapRate] = 16; - ~concert[\clock] !? { |c| c.tempo = 145 / 60 }; + ~setTempo.(145); }, update: { |ctx, pose| var hf = pose[\hands]; @@ -84,7 +84,7 @@ SynthDef(\cc_psy_zap, { |out=0, freq=440, amp=0.18, pan=0| }; }, stop: { |ctx| - ~concert[\clock] !? { |c| c.tempo = 126 / 60 }; + ~setTempo.(126); }, )); "[morceau] Psytrance loaded".postln; diff --git a/sound_algo/data_only/morceaux/14_punkcore.scd b/sound_algo/data_only/morceaux/14_punkcore.scd index fcb6371..c3ee162 100644 --- a/sound_algo/data_only/morceaux/14_punkcore.scd +++ b/sound_algo/data_only/morceaux/14_punkcore.scd @@ -54,7 +54,7 @@ SynthDef(\cc_punk_lead, { |out=0, freq=440, amp=0.22, pan=0| ctx[\drv] = 2.0; ctx[\cut] = 2500.0; ctx[\dens] = 2; - ~concert[\clock] !? { |c| c.tempo = 156 / 60 }; + ~setTempo.(156); }, update: { |ctx, pose| var hf = pose[\hands]; @@ -95,7 +95,7 @@ SynthDef(\cc_punk_lead, { |out=0, freq=440, amp=0.22, pan=0| }; }, stop: { |ctx| - ~concert[\clock] !? { |c| c.tempo = 126 / 60 }; + ~setTempo.(126); }, )); "[morceau] Punkcore loaded".postln; diff --git a/sound_algo/data_only/scene_concert.scd b/sound_algo/data_only/scene_concert.scd index 8cdfe72..f98b3c4 100644 --- a/sound_algo/data_only/scene_concert.scd +++ b/sound_algo/data_only/scene_concert.scd @@ -138,6 +138,7 @@ ~concert[\idx] = 0; ~ccGState = IdentityDictionary.new; ~concert[\clock] = TempoClock.default; // horloge unique (Lot C) + ~setTempo.(126); // tempo de base concert ~concert[\startMorceau].(0); ~concert[\routine] = Routine({ var beat = 0; diff --git a/sound_algo/data_only/scene_pose_play.scd b/sound_algo/data_only/scene_pose_play.scd index 0066938..0e41ab9 100644 --- a/sound_algo/data_only/scene_pose_play.scd +++ b/sound_algo/data_only/scene_pose_play.scd @@ -87,6 +87,7 @@ if(~bpEngine[\running]) { "[bp] deja en cours".postln } { ~bpEngine[\running] = true; ~bpEngine[\clock] = TempoClock.default; // horloge unique (Lot C) + ~setTempo.(100); // tempo de base body-play ~bpEngine[\pad] = Synth(\bp_pad, [\freq, ~bpModes[\pulse][\root].midicps, \amp, 0.0]); ~bpEngine[\routine] = Routine({ var beatCount = 0;