musicality 0.10.1 → 0.11.0

data/examples/composition/scale_exercise.rb

@@ -8,25 +8,25 @@ def scale_exercise scale_class, base_pitch, rhythm
   scale = scale_class.to_pitch_seq(base_pitch)
   n = scale_class.count
   m = rhythm.size
-  
+
   rseq = RepeatingSequence.new((0...m).to_a)
   aseq = AddingSequence.new([0]*(m-1) + [1])
   cseq = CompoundSequence.new(:+,[aseq,rseq])
   pgs = cseq.take(m*n).map {|i| scale.at(i) }
   notes = make_notes(rhythm, pgs) +
           make_notes([3/4.to_r,-1/4.to_r], [scale.at(n)])
-  
+
   rseq = RepeatingSequence.new(n.downto(n+1-m).to_a)
   aseq = AddingSequence.new([0]*(m-1) + [-1])
   cseq = CompoundSequence.new(:+,[aseq,rseq])
   pgs = cseq.take(m*n).map {|i| scale.at(i) }
   notes += make_notes(rhythm, pgs) +
           make_notes([3/4.to_r,-1/4.to_r], [scale.at(0)])
-  
+
   return notes
 end
 
-score = Score::Tempo.new(FOUR_FOUR,120) do |s|
+score = Score::Tempo.new(120) do |s|
   s.parts["scale"] = Part.new(Dynamics::MP) do |p|
     Heptatonic::Prima::MODES.each do |mode_n,scale_class|
       [[1/4.to_r,1/4.to_r,1/2.to_r]].each  do |rhythm|
@@ -38,4 +38,4 @@ score = Score::Tempo.new(FOUR_FOUR,120) do |s|
 end
 
 seq = ScoreSequencer.new(score.to_timed(200)).make_midi_seq("scale" => 1)
-File.open("./scale_exercise.mid", 'wb'){ |fout| seq.write(fout) }
+File.open("./scale_exercise.mid", 'wb'){ |fout| seq.write(fout) }

data/examples/notation/scores.rb

@@ -10,11 +10,11 @@ include Meters
 #
 
 # minimum score, with no parts
-s = Score::Tempo.new(FOUR_FOUR, 120)
+s = Score::Tempo.new(120)
 
 # add a part
 s.parts["piano"] = Part.new(MP) do |p|
-  p.notes = q(C4,C4,G4,G4,A4,A4) + h(G4) + 
+  p.notes = q(C4,C4,G4,G4,A4,A4) + h(G4) +
             q(F4,F4,E4,E4,D4,D4) + h(C4)
 end
 

data/examples/notation/twinkle.rb

@@ -4,25 +4,25 @@ include Meters
 include Dynamics
 include Pitches
 
-score = Score::Tempo.new(FOUR_FOUR, 120, title: "Twinkle, Twinkle, Little Star") do |s|
+score = Score::Tempo.new(120, title: "Twinkle, Twinkle, Little Star") do |s|
   s.parts["rhand"] = Part.new(MF) do |p|
     a_notes = q(C4,C4,G4,G4,A4,A4) + h(G4) +
               q(F4,F4,E4,E4,D4,D4) + h(C4)
     b_notes = q(G4,G4,F4,F4,E4,E4) + h(D4)
     p.notes += a_notes + b_notes
   end
-  
+
   s.parts["lhand"] = Part.new(MF) do |p|
     Cmaj = [C3,E3,G3]
     Fmaj = [F2,A2,C3]
     Gmaj = [G2,B2,D3]
-    
-    a_chords = h(Cmaj,Cmaj,Fmaj,Cmaj) + 
+
+    a_chords = h(Cmaj,Cmaj,Fmaj,Cmaj) +
                h(Fmaj,Cmaj,Gmaj,Cmaj)
     b_chords = h(Cmaj,Fmaj,Cmaj,Gmaj)
     p.notes += a_chords + b_chords
   end
-  
+
   s.program.push 0...4
   s.program.push 4...6
   s.program.push 4...6
@@ -31,4 +31,4 @@ end
 
 File.open('twinkle.ly','w'){|f| f.write(score.to_lilypond) }
 File.open('twinkle.mid','wb'){|f| score.to_midi_seq(200).write(f) }
-score.to_osc(200,'twinkle')
+score.to_osc(200,'twinkle')

data/examples/notation/twinkle.score

@@ -4,7 +4,7 @@
 #   include Pitches
 #   ScoreDSL.load('twinkle.score')
 
-tempo_score Meters::FOUR_FOUR, 120 do
+tempo_score 120 do
   title "Twinkle, Twinkle, Little Star"
 
   Cmaj = [C3,E3,G3]
@@ -14,7 +14,7 @@ tempo_score Meters::FOUR_FOUR, 120 do
     notes(
       "rhand" => q(C4,C4,G4,G4,A4,A4) + h(G4) +
                  q(F4,F4,E4,E4,D4,D4) + h(C4),
-      "lhand" => h(Cmaj,Cmaj,Fmaj,Cmaj) + 
+      "lhand" => h(Cmaj,Cmaj,Fmaj,Cmaj) +
                  h(Fmaj,Cmaj,Gmaj,Cmaj)
     )
   end
@@ -30,4 +30,4 @@ tempo_score Meters::FOUR_FOUR, 120 do
 end
 
 File.open('twinkle.ly','w'){|f| f.write(score.to_lilypond) }
-File.open('twinkle.mid','wb'){|f| score.to_midi_seq(200).write(f) }
+File.open('twinkle.mid','wb'){|f| score.to_midi_seq(200).write(f) }

data/lib/musicality.rb

@@ -26,6 +26,7 @@ require 'musicality/notation/model/meter'
 require 'musicality/notation/model/meters'
 require 'musicality/notation/model/key'
 require 'musicality/notation/model/keys'
+require 'musicality/notation/model/audition'
 require 'musicality/notation/model/score'
 
 require 'treetop'
@@ -82,6 +83,7 @@ require 'musicality/composition/generation/counterpoint_generator'
 require 'musicality/composition/generation/random_rhythm_generator'
 
 require 'musicality/composition/dsl/score_methods'
+require 'musicality/composition/dsl/part_methods'
 require 'musicality/composition/dsl/score_dsl'
 
 require 'musicality/composition/convenience_methods'
@@ -140,15 +142,15 @@ require 'musicality/printing/lilypond/part_engraver'
 require 'musicality/printing/lilypond/score_engraver'
 require 'musicality/printing/lilypond/score_engraving'
 
-# 
+#
 # Project
 #
 
 require 'rake'
 require 'yaml'
 require 'rake/tasklib'
+require 'musicality/project/project'
 require 'musicality/project/file_raker'
 require 'musicality/project/file_cleaner'
-require 'musicality/project/project'
-require 'musicality/project/load_config'
-require 'musicality/project/create_tasks'
+require 'musicality/project/auditions_task'
+require 'musicality/project/create_tasks'

data/lib/musicality/composition/dsl/part_methods.rb

@@ -0,0 +1,12 @@
+module Musicality
+
+class Part
+  def dynamic_change new_dynamic, transition_dur: 0, offset: 0
+    if transition_dur == 0
+      change = (transition_dur == 0) ? Change::Immediate.new(new_dynamic) : Change::Gradual.linear(new_dynamic, transition_dur)
+      self.dynamic_changes[self.duration + offset] = change
+    end
+  end
+end
+
+end

data/lib/musicality/composition/dsl/score_dsl.rb

@@ -1,6 +1,6 @@
 module Musicality
 
-class ScoreDSL  
+class ScoreDSL
   def self.load fname
     dsl = ScoreDSL.new
     dsl.instance_eval(File.read(fname), fname)
@@ -12,10 +12,10 @@ class ScoreDSL
     @score = nil
   end
 
-  def tempo_score start_meter, start_tempo, &block
-    @score = Score::Tempo.new(start_meter,start_tempo)
+  def tempo_score start_tempo, &block
+    @score = Score::Tempo.new(start_tempo)
     @score.instance_eval(&block)
   end
 end
 
-end
+end

data/lib/musicality/composition/dsl/score_methods.rb

@@ -56,7 +56,13 @@ class Score
       end
     end
   end
-  
+
+  def audition part_name, program, &block
+    audition = Audition.new(part_name, program)
+    audition.instance_eval(&block)
+    @auditions.push audition
+  end
+
   class Tempo < Score
     def tempo_change new_tempo, transition_dur: 0, offset: 0
       if transition_dur == 0
@@ -65,7 +71,7 @@ class Score
         tempo_changes[self.duration + offset] = Change::Gradual.linear(new_tempo, transition_dur)
       end
     end
-    
+
     def meter_change new_meter, offset: 0
       meter_changes[self.duration + offset] = Change::Immediate.new(new_meter)
     end

data/lib/musicality/notation/model/audition.rb

@@ -0,0 +1,16 @@
+module Musicality
+
+class Audition
+  attr_reader :part_name, :program, :performers
+  def initialize part_name, program
+    @part_name = part_name
+    @program = program.is_a?(Array) ? program : [program]
+    @performers = {}
+  end
+
+  def performer name, supercollider_settings
+    @performers[name] = supercollider_settings
+  end
+end
+
+end

data/lib/musicality/notation/model/score.rb

@@ -6,13 +6,13 @@ class Score
 
   special_packing(:program){|p| p.map {|range| range.to_s }}
   special_unpacking(:program){|p| p.map {|str| parse_numeric_range(str) }}
-  
+
   special_packing(:sections){|s| Hash[ s.map {|name,range| [name,range.to_s] } ]}
   special_unpacking(:sections){|s| Hash[ s.map {|name,str| [name,parse_numeric_range(str)] } ]}
 
-  attr_accessor :parts, :sections, :program, :start_key, :key_changes
+  attr_accessor :parts, :sections, :program, :start_key, :key_changes, :auditions
   attr_writer :title, :composer
-  
+
   def title value = nil
     if value.nil?
       return @title
@@ -29,7 +29,7 @@ class Score
     end
   end
 
-  def initialize parts: {}, program: [], title: nil, composer: nil, sections: {}, start_key: Keys::C_MAJOR, key_changes: {}
+  def initialize parts: {}, program: [], title: nil, composer: nil, sections: {}, start_key: Keys::C_MAJOR, key_changes: {}, auditions: []
     @parts = parts
     @program = program
     @title = title
@@ -37,6 +37,7 @@ class Score
     @sections = sections
     @start_key = start_key
     @key_changes = key_changes
+    @auditions = auditions
     yield(self) if block_given?
   end
 
@@ -44,11 +45,11 @@ class Score
   def check_methods
     [:check_program, :check_parts, :check_start_key, :check_key_changes ]
   end
-  
+
   def clone
     Marshal.load(Marshal.dump(self))
   end
-  
+
   def ==(other)
     return self.class == other.class &&
       @parts == other.parts && @program == other.program &&
@@ -56,20 +57,20 @@ class Score
       @title == other.title && @composer == other.composer &&
       @start_key == other.start_key && @key_changes == other.key_changes
   end
-  
+
   def duration
     @parts.map {|name,part| part.duration }.max || 0.to_r
   end
-  
+
   def collated?
-    @program.size == 1 && @program[0].first == 0
+    @program.size == 1 && @program[0].first == 0 && @program[0].last == duration
   end
-  
+
   class Timed < Score
   end
 
   # Tempo-based score with meter, bar lines, and a fixed pulse (beat).
-  # 
+  #
   # Offsets and durations are based on note duration, but note duration is
   # determined by the tempo, which can change.
   #
@@ -78,23 +79,23 @@ class Score
     attr_accessor :start_tempo, :tempo_changes, :start_meter, :meter_changes
 
     # See Score#initialize for remaining kwargs
-    def initialize start_meter, start_tempo, tempo_changes: {}, meter_changes: {}, parts: {}, program: [], title: nil, composer: nil, sections: {}, start_key: Keys::C_MAJOR, key_changes: {}
+    def initialize start_tempo, tempo_changes: {}, start_meter: Meters::FOUR_FOUR, meter_changes: {}, parts: {}, program: [], title: nil, composer: nil, sections: {}, start_key: Keys::C_MAJOR, key_changes: {}, auditions: []
       @start_tempo = start_tempo
       @tempo_changes = tempo_changes
       @start_meter = start_meter
       @meter_changes = meter_changes
-      
-      super(parts: parts, program: program, title: title, composer: composer, sections: sections, start_key: start_key, key_changes: key_changes)
+
+      super(parts: parts, program: program, title: title, composer: composer, sections: sections, start_key: start_key, key_changes: key_changes, auditions: auditions)
     end
-    
+
     def check_methods
       super() + [:check_start_tempo, :check_tempo_changes, :check_start_meter, :check_meter_changes]
     end
-    
+
     def validatables
       super() + [ @start_meter ] + @meter_changes.values.map {|v| v.end_value}
     end
-    
+
     def ==(other)
       return super(other) &&
       @start_tempo == other.start_tempo &&
@@ -115,23 +116,23 @@ class Score
     end
 
     private
-    
+
     def check_start_tempo
       if @start_tempo <= 0
         raise NonPositiveError, "Start tempo (#{@start_tempo}) is not positive"
       end
     end
-    
+
     def check_tempo_changes
       badtypes = @tempo_changes.select {|k,v| !v.end_value.is_a?(Numeric) }
       if badtypes.any?
         raise TypeError, "Found non-numeric tempo change values: #{badtypes}"
       end
-      
+
       badvalues = @tempo_changes.select {|k,v| v.end_value <= 0 }
       if badvalues.any?
         raise NonPositiveError, "Found non-positive tempo changes values: #{badvalues}"
-      end    
+      end
     end
 
     def check_start_meter
@@ -139,7 +140,7 @@ class Score
         raise TypeError, "Start meter #{@start_meter} is not a Meter object"
       end
     end
-    
+
     def check_meter_changes
       badtypes = @meter_changes.select {|k,v| !v.end_value.is_a?(Meter) }
       if badtypes.any?
@@ -152,26 +153,26 @@ class Score
       end
     end
   end
-  
+
   private
-    
+
   def check_program
     non_ranges = @program.select {|x| !x.is_a?(Range) }
     if non_ranges.any?
       raise TypeError, "Non-Range program element(s) found: #{non_ranges}"
     end
-    
+
     non_increasing = @program.select {|seg| seg.first >= seg.last }
     if non_increasing.any?
       raise NonIncreasingError, "Non-increasing program range(s) found: #{non_increasing}"
     end
-    
+
     negative = @program.select {|seg| seg.first < 0 || seg.last < 0 }
     if negative.any?
       raise NegativeError, "Program range(s) with negative value(s) found: #{negative}"
     end
   end
-  
+
   def check_parts
     non_parts = @parts.values.select {|x| !x.is_a?(Part) }
     if non_parts.any?
@@ -184,13 +185,13 @@ class Score
       raise TypeError, "Start key #{@start_key} is not a Key object"
     end
   end
-  
+
   def check_key_changes
     badtypes = @key_changes.select {|k,v| !v.end_value.is_a?(Key) }
     if badtypes.any?
       raise TypeError, "Found key change values that are not Key objects: #{badtypes}"
     end
-    
+
     badoffsets = @key_changes.select {|k,v| k != k.to_i }
     if badoffsets.any?
       raise NonIntegerError, "Found key changes at non-integer offsets: #{badoffsets}"
@@ -217,7 +218,7 @@ class Score
   def self.parse_numeric_range str
     result = str.match /(\d+([\.\/]\d+)?)([\.]{2,3})(\d+([\.\/]\d+)?)/
     raise ArgumentError, "string #{str} is not a numeric range" if result.nil?
-    
+
     dots = result.values_at(3)
     l_num = parse_numeric(result.values_at(1)[0])
     r_num = parse_numeric(result.values_at(4)[0])

data/lib/musicality/performance/supercollider/conductor.rb

@@ -14,11 +14,11 @@ class Conductor
     end]
   end
 
-  def perform base_fpath, selected_parts: @performers.keys, verbose: false, lead_time: 0.1
+  def perform base_fpath, selected_parts: @performers.keys, verbose: false, lead_time: 0.1, keep_code: false
     bundles = bundles(selected_parts, lead_time)
     fpath = write_sc_code bundles, base_fpath
     exec_sc_code fpath, bundles.last.time, verbose
-    File.delete(fpath)
+    File.delete(fpath) unless keep_code
   end
 
   def bundles selected_parts = @performers.keys, lead_time

data/lib/musicality/performance/supercollider/synthdefs.rb

@@ -3,10 +3,13 @@ module SuperCollider
 module SynthDefs
 
 VOLUME_CONTROL = SynthDef.new(name: "volume_control", params: { :in => nil, :out => nil, :control => nil },
-  body: "  Out.ar(out, In.ar(in) * In.kr(control));",
+  body: <<-SCLANG,
+  var sig = In.ar([in,in+1]) * In.kr(control);
+  Out.ar(out,sig);
+SCLANG
   credit: "James Tunnell",
 )
- 
+
 VOLUME_CHANGE = SynthDef.new(name: "volume_change", params: { :vol_bus => nil, :vol => nil, :dur => nil },
   body: "  Out.kr(vol_bus, Line.kr(In.kr(vol_bus), vol, dur));",
   credit: "James Tunnell",
@@ -203,8 +206,6 @@ SCLANG
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-// 
-
 ESM = SynthDef.new(name: "esm", params: { :freq => 440, :mix => 0.5, :glide => 0, :cutoff => 20000, :rq => 1, :fdec => 0, :fint => 1,
   :vel => 1, :fvel => 1, :t_gate => 1, :vdec => 1, :vvel => 0, :od => 0, :mul => 0.1, :pan => 0, :out => 0 },
   body: <<-SCLANG,
@@ -277,7 +278,7 @@ SCLANG
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-PROPHET5_STRINGS = SynthDef.new(name: "prophet5pwmstrings", params: { :out => 0, :freq => 440, :amp => 0.8, 
+PROPHET5_STRINGS = SynthDef.new(name: "prophet5pwmstrings", params: { :out => 0, :freq => 440, :amp => 0.8,
     :gate => 1, :lforate => 3, :lfowidth => 0.1, :cutoff => 12000, :rq => 0.5, :pan => 0.0 },
   body: <<-SCLANG,
   var lfo, pulse, filter, env;
@@ -298,7 +299,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-OSC_WOBBLE = SynthDef.new(name: "singleoscillatorwobble", params: { :out => 0, :freq => 440, :amp => 0.8, 
+OSC_WOBBLE = SynthDef.new(name: "singleoscillatorwobble", params: { :out => 0, :freq => 440, :amp => 0.8,
     :gate => 1, :lforate => 10, :lfowidth => 0.5, :cutoff => 12000, :rq => 0.5, :pan => 0.0 },
   body: <<-SCLANG,
   var lfo, pulse, filter, env;
@@ -319,7 +320,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-TRI_BELLS = SynthDef.new(name:"trianglewavebells", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1, 
+TRI_BELLS = SynthDef.new(name:"trianglewavebells", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1,
     :lforate => 10, :lfowidth => 0.0, :cutoff => 100, :rq => 0.5, :pan => 0.0 },
   body: <<-SCLANG,
   var osc1, osc2, vibrato, filter, env;
@@ -367,7 +368,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-MOOG_BASS = SynthDef.new(name: "moogbass", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1, 
+MOOG_BASS = SynthDef.new(name: "moogbass", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1,
     :cutoff => 1000, :gain => 2.0, :lagamount => 0.01, :pan => 0.0 },
   body: <<-SCLANG,
   var osc, filter, env, filterenv;
@@ -388,7 +389,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-MOOG_BASS2 = SynthDef.new(name: "moogbass2", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1, 
+MOOG_BASS2 = SynthDef.new(name: "moogbass2", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1,
     :attackTime => 0.2, :fenvamount => 0.5, :cutoff => 1000, :gain => 2.0, :pan => 0.0 },
   body: <<-SCLANG,
   var osc, filter, env, filterenv;
@@ -410,7 +411,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-PLASTICKY_STRINGS = SynthDef.new(name: "plastickystrings", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1, 
+PLASTICKY_STRINGS = SynthDef.new(name: "plastickystrings", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1,
     :lforate => 5900, :lfowidth => 0.01, :cutoff => 12000, :rq => 0.5, :pan => 0.0 },
   body: <<-SCLANG,
   var lfo, saw, filter, env;
@@ -432,7 +433,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-BASS_FOUNDATION = SynthDef.new(name: "bassfoundation", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1, 
+BASS_FOUNDATION = SynthDef.new(name: "bassfoundation", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1,
     :cutoff => 1000, :rq => 0.5, :pan => 0.0 },
   body: <<-SCLANG,
   var osc, filter, env, filterenv;
@@ -453,7 +454,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-BASS_HIGHEND = SynthDef.new(name: "basshighend", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1, 
+BASS_HIGHEND = SynthDef.new(name: "basshighend", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1,
     :cutoff => 3000, :rq => 0.1, :drive => 2.0, :pan => 0.0 },
   body: <<-SCLANG,
   var osc, filter, env, filterenv;
@@ -489,7 +490,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-WINWOOD_LEAD = SynthDef.new(name: "winwoodlead", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1, 
+WINWOOD_LEAD = SynthDef.new(name: "winwoodlead", params: { :out => 0, :freq => 440, :amp => 0.8, :gate => 1,
     :cutoff => 8000, :rq => 0.8, :lfowidth => 0.01, :lforate => 8, :lagamount => 0.01, :pan => 0.0 },
   body: <<-SCLANG,
   var pulse, filter, env, lfo;
@@ -512,7 +513,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-SITUATION_SYNTH = SynthDef.new(name: "situationsynth", params: { :out => 0, :freq => 440, :amp => 0.1, :gate => 1, 
+SITUATION_SYNTH = SynthDef.new(name: "situationsynth", params: { :out => 0, :freq => 440, :amp => 0.1, :gate => 1,
     :cutoff => 8000, :rq => 0.8, :lfowidth => 0.001, :lforate => 3.3, :pan => -0.1 },
   body: <<-SCLANG,
   var pulse, filter, env, filterenv, lfo;
@@ -527,7 +528,7 @@ SITUATION_SYNTH = SynthDef.new(name: "situationsynth", params: { :out => 0, :fre
 SCLANG
 )
 
-RES_SQUARES = SynthDef.new(name: "ressquares", params: { :out => 0, :freq => 440, :amp => 0.1, :gate => 1, 
+RES_SQUARES = SynthDef.new(name: "ressquares", params: { :out => 0, :freq => 440, :amp => 0.1, :gate => 1,
     :cutoff => 8000, :rq => 0.8, :pan => -0.1 },
   body: <<-SCLANG,
   var pulse, filter, env;
@@ -548,7 +549,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-EIGHTTOEIGHT_KICK = SynthDef.new(name: "eightoeightkick", params: { :out => 0, :freq => 440, :amp => 0.1, 
+EIGHTTOEIGHT_KICK = SynthDef.new(name: "eightoeightkick", params: { :out => 0, :freq => 440, :amp => 0.1,
     :ringTime => 10.0, :releaseTime => 1.0, :distortion => 0.1, :pan => -0.1 },
   body: <<-SCLANG,
   var impulse, filter, env;
@@ -569,7 +570,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-TONEWHEEL_TWO = SynthDef.new(name: "tonewheeltwo", params: { :out => 0, :freq => 440, :amp => 0.1, :gate => 1, 
+TONEWHEEL_TWO = SynthDef.new(name: "tonewheeltwo", params: { :out => 0, :freq => 440, :amp => 0.1, :gate => 1,
     :lforate => 4.85, :lfowidth => 0.1, :cutoff => 5000, :rq => 0.25, :pan => 0.0 },
   body: <<-SCLANG,
   //tone wheel organ emulation via two oscillators pp. 50-51
@@ -593,7 +594,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-EVERYTHING_RHODES = SynthDef.new(name: "everythingrhodes", params: { :out => 0, :freq => 440, :amp => 0.1, :gate => 1, 
+EVERYTHING_RHODES = SynthDef.new(name: "everythingrhodes", params: { :out => 0, :freq => 440, :amp => 0.1, :gate => 1,
     :lforate => 1.85, :lfowidth => 0.5, :cutoff => 2000, :rq => 0.2, :pan => 0.0 },
   body: <<-SCLANG,
   var pulse, filter, env;
@@ -614,7 +615,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-SPACE_THEREMIN = SynthDef.new(name: "spacetheremin", params: { :out => 0, :freq => 440, :amp => 0.1, 
+SPACE_THEREMIN = SynthDef.new(name: "spacetheremin", params: { :out => 0, :freq => 440, :amp => 0.1,
     :gate => 1, :lforate => 6, :lfowidth => 0.5, :cutoff => 4000, :rq => 0.25, :lagTime => 0.1, :pan => 0.0 },
   body: <<-SCLANG,
   var lfo, osc, filter, env;
@@ -635,7 +636,7 @@ EOS
   source: "https://github.com/acarabott/roundhouse-synth-design-course-2014",
 )
 
-FAT_VELOCITY_BASS = SynthDef.new(name: "fatvelocitybass", params: { :out => 0, :freq => 440, :amp => 0.5, 
+FAT_VELOCITY_BASS = SynthDef.new(name: "fatvelocitybass", params: { :out => 0, :freq => 440, :amp => 0.5,
     :gate => 1, :cutoff => 2000, :rq => 0.15, :lagTime => 0.01, :pan => 0.0 },
   body: <<-SCLANG,
   var lfo, osc, filter, env;
@@ -990,7 +991,7 @@ SCLANG
   source: "https://github.com/supercollider-quarks/SynthDefPool",
 )
 
-CS80_LEAD_MH = SynthDef.new(name: "cs80lead_mh", params: { :freq => 880, :amp => 0.5, :att => 0.75, :decay => 0.5, 
+CS80_LEAD_MH = SynthDef.new(name: "cs80lead_mh", params: { :freq => 880, :amp => 0.5, :att => 0.75, :decay => 0.5,
     :sus => 0.8, :rel => 1.0, :fatt => 0.75, :fdecay => 0.5, :fsus => 0.8, :frel => 1.0, :cutoff => 200, :pan => 0,
     :dtune => 0.002, :vibrate => 4, :vibdepth => 0.015, :gate => 1, :ratio => 1,:out => 0 },
   body: <<-SCLANG,
@@ -1030,7 +1031,7 @@ CYMBAL_808 = SynthDef.new(name: "cymbal808", params: { :out => 0, :baseFreq => 3
   signal = signal + FreeVerb.ar(signal);
   signal = signal * EnvGen.ar(Env.new([0, 1, 0.4, 0, 0], [2, time, 50, 500], [0, -0.5, 0, -50]), timeScale:(1/1000), doneAction:2);
   signal = [signal, DelayN.ar(signal, 0.005, 0.005)];
-  OffsetOut.ar(out, signal*4*amp);
+  OffsetOut.ar(out, signal*amp ! 2);
 SCLANG
   credit: "Published on sc-users 2007-08-25 by Ryan Brown",
   source: "https://github.com/supercollider-quarks/SynthDefPool",
@@ -1571,7 +1572,7 @@ SCLANG
 )
 
 
-SynthDef.new(name: "sawpulse", params: { :out => 0, :freq => 440, :gate => 0.5, :plfofreq => 6, :mw => 0, :ffreq => 2000, :rq => 0.3, :freqlag => 0.05, :amp => 1 },
+SAWPULSE = SynthDef.new(name: "sawpulse", params: { :out => 0, :freq => 440, :gate => 0.5, :plfofreq => 6, :mw => 0, :ffreq => 2000, :rq => 0.3, :freqlag => 0.05, :amp => 1 },
   body: <<-SCLANG,
     var sig, plfo, fcurve;
     plfo = SinOsc.kr(plfofreq, mul:mw, add:1);
@@ -1588,7 +1589,7 @@ SCLANG
   source: "https://github.com/bwestergard/supercollider-experiments",
 )
 
-SynthDef.new(name: "sawpulse2", params: { :out => 0, :freq => 440, :gate => 0.5, :plfofreq => 6, :mw => 0, :ffreq => 2000, :rq => 0.3, :freqlag => 0.05, :amp => 1 },
+SAWPULSE2 = SynthDef.new(name: "sawpulse2", params: { :out => 0, :freq => 440, :gate => 0.5, :plfofreq => 6, :mw => 0, :ffreq => 2000, :rq => 0.3, :freqlag => 0.05, :amp => 1 },
   body: <<-SCLANG,
     var sig, plfo, fcurve;
     plfo = SinOsc.kr(plfofreq, mul:mw, add:1);
@@ -1603,7 +1604,7 @@ SCLANG
   source: "https://github.com/bwestergard/supercollider-experiments",
 )
 
-SynthDef.new(name: "sinepluck", params: { :out => 0, :freq => 440, :amp => 1, :dur => nil },
+SINEPLUCK = SynthDef.new(name: "sinepluck", params: { :out => 0, :freq => 440, :amp => 1, :dur => nil },
   body: <<-SCLANG,
   var mod,tone;
   amp = amp * 0.8;
@@ -1617,7 +1618,7 @@ SCLANG
   source: "https://github.com/bwestergard/supercollider-experiments",
 )
 
-SynthDef.new(name: "snare", params: { :amp => 1, :dur => 0.05, :out => 0 },
+SNARE3 = SynthDef.new(name: "snare", params: { :amp => 1, :dur => 0.05, :out => 0 },
   body: <<-SCLANG,
 dur = dur * 16;
 Out.ar(out, amp * XLine.ar(2,1/1000,dur) * BPF.ar(PinkNoise.ar(0.8), XLine.ar(20000,1000,dur, doneAction:2), 0.8).dup);
@@ -1625,7 +1626,7 @@ SCLANG
   source: "https://github.com/bwestergard/supercollider-experiments",
 )
 
-SynthDef.new(name: "kick", params: { :out => 0, :amp => 1, :dur => 0.05 },
+KICK1 = SynthDef.new(name: "kick", params: { :out => 0, :amp => 1, :dur => 0.05 },
   body: <<-SCLANG,
 var tone;
 tone = SinOsc.ar(XLine.ar(800,2,dur*4, mul: 0.2, doneAction:2));
@@ -1635,7 +1636,7 @@ SCLANG
 )
 
 
-SynthDef.new(name: "poly1", params: { :out => 0, :gate => 1, :freq => 440 },
+POLY1 = SynthDef.new(name: "poly1", params: { :out => 0, :gate => 1, :freq => 440 },
   body: <<-SCLANG,
   var aEnv,fEnv,osc1, osc2,flt;
   aEnv=EnvGen.kr(Env.asr(0.2,1,0.1), gate, doneAction:2);
@@ -1651,4 +1652,4 @@ SCLANG
 
 end
 end
-end
+end