synthesizer 3.1.0 → 3.4.0

data/lib/synthesizer/processor/high.rb

@@ -0,0 +1,63 @@
+module Synthesizer
+  module Processor
+    class High
+      def generator(osc, note_perform)
+        synth = note_perform.synth
+        filter = synth.filter
+        amp = synth.amplifier
+
+        samplecount = synth.soundinfo.window_size.to_f
+
+        # Oscillator, Amplifier
+        volume_mod = ModulationValue.amp_generator(note_perform, 1, osc.volume, amp.volume)
+        pan_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.pan, amp.pan)
+        tune_semis_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.tune_semis, amp.tune_semis, synth.glide&.to_modval)
+        tune_cents_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.tune_cents, amp.tune_cents)
+
+        sym_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.sym)
+        sync_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.sync)
+
+        uni_num_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.uni_num, amp.uni_num, center: 1.0)
+        uni_detune_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.uni_detune, amp.uni_detune)
+        uni_stereo_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.uni_stereo, amp.uni_stereo)
+
+        unison = Unison.new(note_perform, osc.source, osc.phase)
+
+        # Filter
+        filter_mod = nil
+        if filter
+          filter_mod = filter.generator(note_perform, samplecount)
+        end
+
+        -> {
+          # Oscillator, Amplifier
+          volume = Vdsp::DoubleArray.create(
+            samplecount.to_i.times.map {|i|
+              volume_mod[] * note_perform.velocity
+            }
+          )
+          pan = pan_mod[]
+          tune_semis = tune_semis_mod[] + synth.pitch_bend
+          tune_cents = tune_cents_mod[]
+
+          sym = sym_mod[]
+          sync = sync_mod[]
+
+          uni_num = uni_num_mod[]
+          uni_detune = uni_detune_mod[]
+          uni_stereo = uni_stereo_mod[]
+
+          buf = unison.next(uni_num, uni_detune, uni_stereo, volume, pan, tune_semis, tune_cents, sym, sync)
+
+          # Filter
+          if filter_mod
+            filter_fx = filter_mod[]
+            buf = filter_fx.process(buf)
+          end
+
+          buf
+        }
+      end
+    end
+  end
+end

data/lib/synthesizer/processor/low.rb

@@ -0,0 +1,59 @@
+module Synthesizer
+  module Processor
+    class Low
+      def generator(osc, note_perform)
+        synth = note_perform.synth
+        filter = synth.filter
+        amp = synth.amplifier
+
+        samplecount = synth.soundinfo.window_size.to_f
+
+        # Oscillator, Amplifier
+        volume_mod = ModulationValue.amp_generator(note_perform, samplecount, osc.volume, amp.volume)
+        pan_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.pan, amp.pan)
+        tune_semis_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.tune_semis, amp.tune_semis, synth.glide&.to_modval)
+        tune_cents_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.tune_cents, amp.tune_cents)
+
+        sym_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.sym)
+        sync_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.sync)
+
+        uni_num_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.uni_num, amp.uni_num, center: 1.0)
+        uni_detune_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.uni_detune, amp.uni_detune)
+        uni_stereo_mod = ModulationValue.balance_generator(note_perform, samplecount, osc.uni_stereo, amp.uni_stereo)
+
+        unison = Unison.new(note_perform, osc.source, osc.phase)
+
+        # Filter
+        filter_mod = nil
+        if filter
+          filter_mod = filter.generator(note_perform, samplecount)
+        end
+
+        -> {
+          # Oscillator, Amplifier
+          volume = volume_mod[] * note_perform.velocity
+          pan = pan_mod[]
+          tune_semis = tune_semis_mod[] + synth.pitch_bend
+          tune_cents = tune_cents_mod[]
+
+          sym = sym_mod[]
+          sync = sync_mod[]
+
+          uni_num = uni_num_mod[]
+          uni_detune = uni_detune_mod[]
+          uni_stereo = uni_stereo_mod[]
+
+          buf = unison.next(uni_num, uni_detune, uni_stereo, volume, pan, tune_semis, tune_cents, sym, sync)
+
+          # Filter
+          if filter_mod
+            filter_fx = filter_mod[]
+            buf = filter_fx.process(buf)
+          end
+
+          buf
+        }
+      end
+    end
+  end
+end

data/lib/synthesizer/processor.rb

@@ -1,48 +1,10 @@
-module Synthesizer
-  class Processor
-    def generator(osc, note_perform)
-      synth = note_perform.synth
-      filter = synth.filter
-      amp = synth.amplifier
-      window_size = synth.soundinfo.window_size
-      framerate = synth.soundinfo.samplerate.to_f / window_size
-
-      # Oscillator, Amplifier
-      volume_mod = ModulationValue.amp_generator(note_perform, framerate, osc.volume, amp.volume)
-      pan_mod = ModulationValue.balance_generator(note_perform, framerate, osc.pan, amp.pan)
-      tune_semis_mod = ModulationValue.balance_generator(note_perform, framerate, osc.tune_semis, amp.tune_semis, synth.glide&.to_modval)
-      tune_cents_mod = ModulationValue.balance_generator(note_perform, framerate, osc.tune_cents, amp.tune_cents)
-
-      uni_num_mod = ModulationValue.balance_generator(note_perform, framerate, osc.uni_num, amp.uni_num, center: 1.0)
-      uni_detune_mod = ModulationValue.balance_generator(note_perform, framerate, osc.uni_detune, amp.uni_detune)
-      unison = Unison.new(note_perform, osc.source, osc.phase)
-
-      # Filter
-      filter_mod = nil
-      if filter
-        filter_mod = filter.generator(note_perform, framerate)
-      end
-
-      -> {
-        # Oscillator, Amplifier
-        volume = volume_mod[] * note_perform.velocity
-        pan = pan_mod[]
-        tune_semis = tune_semis_mod[] + synth.pitch_bend
-        tune_cents = tune_cents_mod[]
+require 'synthesizer/processor/low'
+require 'synthesizer/processor/high'
 
-        uni_num = uni_num_mod[]
-        uni_detune = uni_detune_mod[]
-
-        buf = unison.next(uni_num, uni_detune, volume, pan, tune_semis, tune_cents)
-
-        # Filter
-        if filter_mod
-          filter_fx = filter_mod[]
-          buf = filter_fx.process(buf)
-        end
-
-        buf
-      }
+module Synthesizer
+  module Processor
+    def self.create(quality)
+      const_get(quality, false).new
     end
   end
 end

data/lib/synthesizer/quality.rb

@@ -0,0 +1,6 @@
+module Synthesizer
+  module Quality
+    HIGH = :High
+    LOW = :Low
+  end
+end

data/lib/synthesizer/shape.rb

@@ -18,11 +18,11 @@ module Synthesizer
     RampUp = ->(phase) { (phase % 1.0) * 2 - 1 }
     RampDown = ->(phase) { (phase % 1.0) * -2 + 1 }
 
-    PositiveRampUp = ->(phase) { phase % 1.0}
-    PositiveRampDown = ->(phase) { (phase % 1.0) * -1 + 1}
+    PositiveRampUp = ->(phase) { phase % 1.0 }
+    PositiveRampDown = ->(phase) { (phase % 1.0) * -1 + 1 }
 
-    ForeverRampUp = ->(phase) { phase}
-    ForeverRampDown = ->(phase) { -phase}
+    ForeverRampUp = ->(phase) { phase }
+    ForeverRampDown = ->(phase) { -phase }
 
     # Complex
     self.constants.tap {|consts|

data/lib/synthesizer/shape_pos.rb

@@ -1,29 +1,32 @@
 module Synthesizer
   class ShapePos
-    def initialize(phase: 0.0, sync: nil)
-      @init_phase = phase
-      @sync = sync
+    SEMITONE_RATIO = 2.0 ** (1.0 / 12.0)
 
-      @offset = 0
-      @phase = 0.0
+    def initialize(samplerate, init_phase)
+      @samplerate = samplerate.to_f
+
+      init_phase = init_phase ? init_phase.to_f : Random.rand(1.0)
+      @sync_phase = init_phase
+      @shape_phase = init_phase
     end
 
-    def next(delta)
-      @offset += 1
+    def next(hz, sym, sync)
+      if sync<0.0
+        sync = 0.0
+      end
 
-      if @offset==1
-        if @init_phase
-          @phase = @init_phase + delta
-        else
-          @phase = Random.rand + delta
-        end
-      # TODO: sync
-      #elsif @sync && @sync<@offset
-      #  @offset = 0
-      #  @phase = @init_phase
-      else
-        @phase += delta
+      if 1.0<=@sync_phase
+        @sync_phase %= 1.0
+        @shape_phase = @sync_phase
       end
+
+      sync_hz = hz
+      sync_delta = sync_hz / @samplerate
+      @sync_phase += sync_delta
+
+      shape_hz = hz * (SEMITONE_RATIO ** sync)
+      shape_delta = shape_hz / @samplerate
+      @shape_phase += shape_delta
     end
   end
 end

data/lib/synthesizer/unison.rb

@@ -4,7 +4,6 @@ module Synthesizer
 
     def initialize(note_perform, source, phase)
       synth = note_perform.synth
-      @samplerate = synth.soundinfo.samplerate
 
       @note_perform = note_perform
       @source = source
@@ -13,32 +12,45 @@ module Synthesizer
       }
     end
 
-    def next(uni_num, uni_detune, volume, pan, tune_semis, tune_cents)
+    def next(uni_num, uni_detune, uni_stereo, volume, pan, tune_semis, tune_cents, sym, sync)
       if uni_num<1.0
         uni_num = 1.0
       elsif UNI_NUM_MAX<uni_num
         uni_num = UNI_NUM_MAX
       end
 
-      uni_num.ceil.times.map {|i|
-        context = @source_contexts[i]
+      if uni_num==1.0
+        context = @source_contexts[0]
 
-        uni_volume = 1.0
-        if uni_num<i
-          uni_volume = uni_num % 1.0
-        end
+        l_gain, r_gain = Utils.panning(pan)
+        hz = @note_perform.note.hz(semis: tune_semis, cents: tune_cents)
 
-        sign = i.even? ? 1 : -1
-        detune_cents = sign * (i/2) * uni_detune * 100
-        diff_pan = sign * (i/2) * uni_detune
+        buffer = @source.next(context, AudioStream::Rate.freq(hz), sym, sync, l_gain, r_gain)
+      else
+        buffer = uni_num.ceil.times.map {|i|
+          context = @source_contexts[i]
 
-        l_gain, r_gain = Utils.panning(pan + diff_pan)
+          uni_volume = 1.0
+          if uni_num<i
+            uni_volume = uni_num % 1.0
+          end
 
-        hz = @note_perform.note.hz(semis: tune_semis, cents: tune_cents + detune_cents)
-        delta = hz / @samplerate
+          sign = i.even? ? 1 : -1
+          diff = sign * (i + 1.0) / (uni_num + 1.0)
 
-        @source.next(context, delta, l_gain * volume * uni_volume / uni_num, r_gain * volume * uni_volume / uni_num)
-      }.inject(:+)
+          detune_cents = uni_detune * diff * 100
+          diff_pan = uni_stereo * diff
+
+          l_gain, r_gain = Utils.panning(pan + diff_pan)
+          hz = @note_perform.note.hz(semis: tune_semis, cents: tune_cents + detune_cents)
+
+          @source.next(context, AudioStream::Rate.freq(hz), sym, sync, l_gain * uni_volume / uni_num, r_gain * uni_volume / uni_num)
+        }.inject(:+)
+      end
+
+      AudioStream::Buffer.new(*buffer.streams.map {|stream|
+        stream * volume
+      })
     end
   end
 end

data/lib/synthesizer/version.rb

@@ -1,3 +1,3 @@
 module Synthesizer
-  VERSION = "3.1.0"
+  VERSION = "3.4.0"
 end

data/lib/synthesizer.rb

@@ -20,6 +20,7 @@ require 'synthesizer/note'
 require 'synthesizer/note_perform'
 require 'synthesizer/unison'
 require 'synthesizer/processor'
+require 'synthesizer/quality'
 require 'synthesizer/utils'
 
 module Synthesizer