Synths - fix up sc808 bassdrum to match recent sc808 changes

Author: samaaron

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

@@ -3770,56 +3770,39 @@ def arg_defaults
           :pan_slide => 0,
           :pan_slide_shape => 1,
           :pan_slide_curve => 0,
-          :attack => 0,
-          :decay => 0,
-          :sustain => 0,
-          :release => 1,
-          :attack_level => 1,
-          :decay_level => :sustain_leval,
-          :sustain_level => 1,
-          :ndecay => 30,
+          :decay => 2,
+          :decay_curve => -7,
           :attenuation => 1,
         }
       end
 
-      def default_arg_info
-        super.merge({
-          :note =>
-          {
-            :doc => "Note to play. Either a MIDI number or a symbol representing a note. For example: `30`, `52`, `:C`, `:C2`, `:Eb4`, or `:Ds3`",
-            :validations => [v_positive(:note)],
-            :modulatable => false,
-            :midi => true
-          },
-          :amp =>
-          {
-            :doc => "The amplitude of the sound. Typically a value between 0 and 1. Higher amplitudes may be used, but won't make the sound louder, they will just reduce the quality of all the sounds currently being played (due to compression.)",
-            :validations => [v_positive(:amp)],
-            :modulatable => true
-          },
-          :pan =>
-          {
-            :doc => "Position of sound in stereo. With headphones on, this means how much of the sound is in the left ear, and how much is in the right ear. With a value of -1, the sound is completely in the left ear, a value of 0 puts the sound equally in both ears and a value of 1 puts the sound in the right ear. Values in between -1 and 1 move the sound accordingly.",
-            :validations => [v_between_inclusive(:pan, -1, 1)],
-            :modulatable => false
-          },
-        })
-      end
 
       def specific_arg_info
         {
-          :ndecay =>
+          :decay =>
           {
             :doc => "Internal decay of the bass drum in seconds. Drive it up to 5 or so, in order to get that bass carpet, often featured in hip-hop. Note, you need to increase the duration of the envelope (e.g. the release: opt) to hear this internal decay.",
             :validations => [v_positive(:decay)],
             :modulatable => false
           },
+          :decay_curve =>
+          {
+            :doc => "Curve value for the decay of the bass drum",
+            :validations => [],
+            :modulatable => false
+          }
           :attenuation =>
           {
             :doc => "Base frequency attenuation. Use values around 0.2 or lower for giving the bassdrum a more artificial sound.",
             :validations => [v_positive(:attenuation)],
             :modulatable => false
           },
+          :click =>
+          {
+            :doc => "Amount of initial click to the drum sound. 0 is no click and 1 is a hard click.",
+            :validations => [v_between_inclusive(:click, 0, 1)],
+            :modulatable => false
+          }
         }
       end
     end

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

@@ -4,46 +4,38 @@ SuperCollider 808 implementation based on Yoshinosuke Horiuchi's free version. S
 
 (
 SynthDef('sonic-pi-sc808_bassdrum', {|
-  note = 34,
-  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,
-  ndecay = 30,
-  attenuation=1,
-
-  attack = 0, decay = 0, sustain = 0, release = 1,
-  attack_level = 1, decay_level = -1, sustain_level = 1,
-  out_bus = 0
-  |
-
-  var snd, fenv, env, trienv, sig, sub, punch, pfenv;
-
-  note = note.midicps;
+ 	note = 34,
+	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,
+    click = 0.11
+    decay = 2,
+    decay_curve = -7
+	attenuation=1,
+	out_bus = 0|
 
-  env = EnvGen.kr(Env.new([0.11, 1, 0], [0, ndecay], -7),doneAction:2);
-  trienv = EnvGen.kr(Env.new([0.11, 0.6, 0], [0, ndecay], -230),doneAction:0);
-  fenv = Env([note*7, note*1.35, note], [0.05/attenuation, 0.6], -14).kr; // Mod 0.05 -> 0.5
-  pfenv = Env([note*7, note*1.35, note], [0.03/attenuation, 0.6], -10).kr; // Mod 0.03 -> 0.3
-  sig = SinOsc.ar(fenv, pi/2) * env;
-  sub = LFTri.ar(fenv, pi/2) * trienv * 0.05;
-  punch = SinOsc.ar(pfenv, pi/2) * env * 2;
-  punch = HPF.ar(punch, 350);
-  snd = (sig + sub + punch) * 2.5;
+	var snd, fenv, env, trienv, sig, sub, punch, pfenv;
 
-  amp = amp.varlag(amp_slide, amp_slide_curve, amp_slide_shape);
-  pan = pan.varlag(pan_slide, pan_slide_curve, pan_slide_shape);
-  decay_level = Select.kr(decay_level < 0, [decay_level, sustain_level]);
-  env = Env.new(
-    [0, attack_level, decay_level, sustain_level, 0],
-    [attack,decay,sustain,release],
-    \lin
-  );
+	note = note.midicps;
+	amp = 2 * amp;
+    amp = amp.varlag(amp_slide, amp_slide_curve, amp_slide_shape);
+    pan = pan.varlag(pan_slide, pan_slide_curve, pan_slide_shape);
 
-  snd = Limiter.ar(snd, 1) * amp;
-  snd = Pan2.ar(Mix(snd) * EnvGen.kr(env, doneAction: 2), pan);
 
-  Out.ar(out_bus, snd);
+	env = EnvGen.kr(Env.new([click, 1, 0], [0, decay], decay_curve),doneAction:2);
+	trienv = EnvGen.kr(Env.new([click, 0.6, 0], [0, decay], -230),doneAction:0);
+	fenv = Env([note*7, note*1.35, note], [0.05/attenuation, 0.6], -14).kr; // Mod 0.05 -> 0.5
+	pfenv = Env([note*7, note*1.35, note], [0.03/attenuation, 0.6], -10).kr; // Mod 0.03 -> 0.3
+	sig = SinOsc.ar(fenv, pi/2) * env;
+	sub = LFTri.ar(fenv, pi/2) * trienv * 0.05;
+	punch = SinOsc.ar(pfenv, pi/2) * env * 2;
+	punch = HPF.ar(punch, 350);
+	sig = (sig + sub + punch) * 2.5;
+	sig = Limiter.ar(sig, 0.5) * amp;
+    DetectSilence.ar(sig, doneAction: Done.freeSelf);
+	sig = Pan2.ar(sig, pan);
+	Out.ar(out_bus, sig);
 
-}).writeDefFile("/Users/sam/Development/sonic-pi/etc/synthdefs/compiled");
+}).writeDefFile("/Users/sam/Development/sonic-pi/etc/synthdefs/compiled/");
 )
 
 (