Synths - update sc808 clap to match recent changes

Author: samaaron

app/server/ruby/lib/sonicpi/synths/synthinfo.rb

@@ -3975,19 +3975,6 @@ def munge_opts(studio, args_h)
         args_h
       end
 
-      def default_arg_info
-        super.merge({
-          :note =>
-          {
-            :doc => "This synth has no pitch content - therefore the not opt is ignored.",
-            :validations => [v_positive(:amp)],
-            :modulatable => false,
-            :midi => true
-          }
-
-        })
-      end
-
       def specific_arg_info
         {
           :lpf =>
@@ -4011,14 +3998,26 @@ def specific_arg_info
             :validations => [v_positive(:rev)],
             :modulatable => false
           },
-          :rev_release =>
+          :click =>
           {
-            :doc => "Release duration of the reverb",
-            :validations => [v_positive(:rev_release)],
-            :modulatable => false,
-            :bpm_scale => true
+            :doc => "Amount of initial click to the clap sound. 0 is no click and 1 is a hard click.",
+            :validations => [v_between_inclusive(:click, 0, 1)],
+            :modulatable => false
+          },
+          :decay =>
+          {
+            :doc => "Amount of decay for the clap. Higher numbers increase the decay duration.",
+            :validations => [v_positive_not_zero(:decay)],
+            :modulatable => false
+          },
+          :decay_curve =>
+          {
+            :doc => "Curve value for the decay of the clap",
+            :validations => [],
+            :modulatable => false
           }
 
+
         }
       end
     end

etc/synthdefs/compiled/sonic-pi-sc808_clap.scsyndef

@@ -89,51 +89,48 @@ SynthDef('sonic-pi-sc808_snare', {|
 
 (
 SynthDef('sonic-pi-sc808_clap', {|
-  amp = 1, amp_slide = 0, amp_slide_shape = 1, amp_slide_curve = 0,
-  pan = 0, pan_slide = 0, pan_slide_shape = 1, pan_slide_curve = 0,
-  attack = 0, decay = 0, sustain = 0, release = 0.15,
-  attack_level = 1, decay_level = -1, sustain_level = 1,
+	amp = 1, amp_slide = 0, amp_slide_shape = 1, amp_slide_curve = 0,
+    pan = 0, pan_slide = 0, pan_slide_shape = 1, pan_slide_curve = 0,
+    hpf = 71, hpf_slide = 0, hpf_slide_shape = 1, hpf_slide_curve = 1,
+    lpf = 84, lpf_slide = 0, lpf_slide_shape = 1, lpf_slide_curve = 1,
+    click = 0.5,
+	decay = 0.3,
+    decay_curve = -160
+	rev = 1,
 
-  hpf = 71, hpf_slide = 0, hpf_slide_shape = 1, hpf_slide_curve = 1,
-  lpf = 84, lpf_slide = 0, lpf_slide_shape = 1, lpf_slide_curve = 1,
-  rev = 1,
-  rev_release = 4
-  out_bus = 0|
+	out_bus = 0|
 
-  var atkenv, atk, dec, sum, denv, snd, env;
-  var reverb, revgen;
+	var atkenv, atk, sig, denv, sum;
+	var reverb, revgen;
 
-  hpf = hpf.varlag(hpf_slide, hpf_slide_curve, hpf_slide_shape);
-  lpf = lpf.varlag(lpf_slide, lpf_slide_curve, lpf_slide_shape);
-  decay_level = Select.kr(decay_level < 0, [decay_level, sustain_level]);
+	lpf = lpf.midicps;
+    hpf = hpf.midicps;
 
-  lpf = lpf.midicps;
-  hpf = hpf.midicps;
-
-  env = Env.new(
-    [0, attack_level, decay_level, sustain_level, 0],
-    [attack,decay,sustain,release ],
-    \lin
-  );
-  atkenv = EnvGen.kr(Env.new([0.5,1,0],[0, 0.3], -160), doneAction:0);
-
-  denv = EnvGen.kr(Env.dadsr(0.026, attack, decay, sustain_level, release, 1, curve:-157), doneAction:0);
-  atk = WhiteNoise.ar * atkenv * 1.4;
-  dec = WhiteNoise.ar * denv;
-  sum = atk + dec * amp;
-  sum = HPF.ar(sum, hpf);
-  sum = BPF.ar(sum, lpf, 0.5);
-  sum = 1.5 * sum* EnvGen.kr(env, doneAction: 0);
-
-  revgen = EnvGen.kr(Env.perc(0.1, attack + decay + sustain + release + rev_release, curve: -9), doneAction:2);
-  reverb = WhiteNoise.ar * revgen * 0.1;
-  reverb = HPF.ar(reverb, hpf);
-  reverb = LPF.ar(reverb, lpf);
-  reverb = reverb * rev;
-
-  snd = (sum + reverb) * amp * 2;
-  snd = Pan2.ar(Mix(snd), pan);
-  Out.ar(out_bus, snd);
+    amp = amp.varlag(amp_slide, amp_slide_curve, amp_slide_shape);
+    pan = pan.varlag(pan_slide, pan_slide_curve, pan_slide_shape);
+    hpf = hpf.varlag(hpf_slide, hpf_slide_curve, hpf_slide_shape);
+    lpf = lpf.varlag(lpf_slide, lpf_slide_curve, lpf_slide_shape);
+
+
+	// Use doneAction 0, so the synth is not freed yet
+	// The reverb is running much longer
+	atkenv = EnvGen.kr(Env.new([click,1,0],[0, decay], decay_curve), doneAction:0);
+	denv = EnvGen.kr(Env.dadsr(0.026, 0, 6, 0, 1, 1, curve: decay_curve), doneAction:0);
+    atk = WhiteNoise.ar * atkenv * 1.4;
+	decay = WhiteNoise.ar * denv;
+	sum = atk + decay * amp;
+	sum = HPF.ar(sum, hpf);
+	sum = BPF.ar(sum, lpf, 0.5);
+	sum = 1.5 * sum;
+
+	revgen = EnvGen.kr(Env.perc(0.1, decay+ 4, curve: -9), doneAction:2);
+	reverb = WhiteNoise.ar * revgen * 0.02;
+	reverb = HPF.ar(reverb, hpf);
+	reverb = LPF.ar(reverb, lpf);
+	reverb = reverb * amp * rev;
+    sum = sum + reverb;
+    DetectSilence.ar(sum, doneAction: Done.freeSelf);
+	Out.ar(out_bus, Pan2.ar(sum, pan));
 
 }).writeDefFile("/Users/sam/Development/sonic-pi/etc/synthdefs/compiled/");
 )