synthesizer 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed8a308cdf0bcb0baf27daffd40c86c4998c8ca5d49ee90d1c0a2aac7a69c64d
-  data.tar.gz: 46fbff7561bb5883dac304b083bed46bd6690e840096cd7c4b48f04d32542bac
+  metadata.gz: de75bd1dce21cbe4d6fb77b3f7dac7b35a5db994a1e7ee3d4109d660cbb69d68
+  data.tar.gz: 6d4f22b0ee34003ce64ab908f39ab9bfdd5df448c738eed516d2cb8312f2dbbe
 SHA512:
-  metadata.gz: 9e9444d9132322cb3382e809a77a4803e895f5dd5aedf4de86272f616e27abc525734124d915cd1dd47f24e98e7b9d31716c88783337bc18f47e1b09d4e12ea3
-  data.tar.gz: 2141b9541d1700616b9d131887218727284210b28488dd9007d08adfd05190320993099145d016b0c84b75cf19a61e74c3bcdf8b0f19249d260d7c05b7e6697d
+  metadata.gz: df6f09c4951a5925bc77f6821c53327307f9aeb16d4e273dc440c034c261fb06a35abd0f6c9b19735b3a581267afc30d98e3a05f722829bac9f2aa99e0cd5f34
+  data.tar.gz: 17da6f4b246047632d921e15d5b0b6975cc6c4ecda29ce9b1cdbe9231ea1832bef9b3601a91a98fe044711d5eef5a37e67aa74be6ef3691bf102380efc646b46

data/examples/formant_vocoder.rb

@@ -0,0 +1,86 @@
+require 'synthesizer'
+require 'audio_stream'
+
+include AudioStream
+include Synthesizer
+
+soundinfo = SoundInfo.new(
+  channels: 2,
+  samplerate: 44100,
+  window_size: 1024,
+  format: RubyAudio::FORMAT_WAV|RubyAudio::FORMAT_PCM_16
+)
+
+source = nil
+
+synth = PolySynth.new(
+  oscillators: [
+    Oscillator.new(
+      source: source = OscillatorSource::FormantVocoder.new(
+        vowels: [:a],
+      ),
+      phase: 0.0,
+    ),
+  ],
+  amplifier: Amplifier.new(
+    volume: ModulationValue.new(1.0)
+      .add(Modulation::Adsr.new(
+        attack: 0.05,
+        hold: 0.1,
+        decay: 0.4,
+        sustain: 0.8,
+        release: 0.2
+      ), depth: 1.0),
+    ),
+  soundinfo: soundinfo,
+)
+bufs = []
+base = 36
+
+source.vowels = [:a]
+synth.note_on(Note.new(base))
+bufs += 50.times.map {|_| synth.next}
+synth.note_off(Note.new(base))
+bufs += 20.times.map {|_| synth.next}
+
+source.vowels = [:i]
+synth.note_on(Note.new(base))
+bufs += 50.times.map {|_| synth.next}
+synth.note_off(Note.new(base))
+bufs += 20.times.map {|_| synth.next}
+
+source.vowels = [:u]
+synth.note_on(Note.new(base))
+bufs += 50.times.map {|_| synth.next}
+synth.note_off(Note.new(base))
+bufs += 20.times.map {|_| synth.next}
+
+source.vowels = [:e]
+synth.note_on(Note.new(base))
+bufs += 50.times.map {|_| synth.next}
+synth.note_off(Note.new(base))
+bufs += 20.times.map {|_| synth.next}
+
+source.vowels = [:o]
+synth.note_on(Note.new(base))
+bufs += 50.times.map {|_| synth.next}
+synth.note_off(Note.new(base))
+
+bufs += 50.times.map {|_| synth.next}
+
+
+track1 = AudioInput.buffer(bufs)
+
+stereo_out = AudioOutput.device(soundinfo: soundinfo)
+#stereo_out = AudioOutput.file("formatvocoder.wav", soundinfo: soundinfo)
+
+track1
+  .send_to(stereo_out, gain: 1.0)
+
+
+conductor = Conductor.new(
+  input: [track1],
+  output: [stereo_out]
+)
+conductor.connect
+conductor.join

data/examples/formant_vocoder_sweep.rb

@@ -0,0 +1,76 @@
+require 'synthesizer'
+require 'audio_stream'
+
+include AudioStream
+include Synthesizer
+
+soundinfo = SoundInfo.new(
+  channels: 2,
+  samplerate: 44100,
+  window_size: 1024,
+  format: RubyAudio::FORMAT_WAV|RubyAudio::FORMAT_PCM_16
+)
+
+synth = PolySynth.new(
+  oscillators: [
+    Oscillator.new(
+      source: OscillatorSource::FormantVocoder.new(
+        vowels: [:a, :i, :u, :e, :o],
+        #vowels: [:i, :e, :a, :o, :u],
+        pronunciation: ModulationValue.new(0)
+          .add(Modulation::Lfo.new(
+            shape: Shape::ForeverRampUp,
+            rate: 2.0,
+          )),
+      ),
+      phase: 0.0,
+    ),
+  ],
+  amplifier: Amplifier.new(
+    volume: ModulationValue.new(1.0)
+      .add(Modulation::Adsr.new(
+        attack: 0.05,
+        hold: 0.1,
+        decay: 0.4,
+        sustain: 0.8,
+        release: 0.2
+      ), depth: 1.0),
+    ),
+  soundinfo: soundinfo,
+)
+bufs = []
+
+base = 36
+synth.note_on(Note.new(base))
+bufs += 100.times.map {|_| synth.next}
+synth.note_off(Note.new(base))
+bufs += 20.times.map {|_| synth.next}
+
+synth.note_on(Note.new(base+4))
+bufs += 100.times.map {|_| synth.next}
+synth.note_off(Note.new(base+4))
+bufs += 20.times.map {|_| synth.next}
+
+synth.note_on(Note.new(base+8))
+bufs += 100.times.map {|_| synth.next}
+synth.note_off(Note.new(base+8))
+bufs += 20.times.map {|_| synth.next}
+
+bufs += 50.times.map {|_| synth.next}
+
+
+track1 = AudioInput.buffer(bufs)
+
+stereo_out = AudioOutput.device(soundinfo: soundinfo)
+#stereo_out = AudioOutput.file("formatvocoder_sweep.wav", soundinfo: soundinfo)
+
+track1
+  .send_to(stereo_out, gain: 1.0)
+
+
+conductor = Conductor.new(
+  input: [track1],
+  output: [stereo_out]
+)
+conductor.connect
+conductor.join

data/examples/lpf.rb

@@ -14,7 +14,7 @@ soundinfo = SoundInfo.new(
 synth = PolySynth.new(
   oscillators: [
     Oscillator.new(
-      shape: Shape::WhiteNoise
+      source: OscillatorSource::WhiteNoise.instance
     ),
   ],
   filter: Filter::Serial.new(
@@ -49,7 +49,6 @@ synth = PolySynth.new(
         release: 0.2
       ), depth: 1.0),
     ),
-  quality: Quality::LOW,
   soundinfo: soundinfo,
 )
 bufs = []

data/examples/mono.rb

@@ -14,20 +14,20 @@ soundinfo = SoundInfo.new(
 synth = MonoSynth.new(
   oscillators: [
     Oscillator.new(
-      shape: Shape::SquareSawtooth,
+      source: OscillatorSource::SquareSawtooth.instance,
       uni_num: ModulationValue.new(4),
         #.add(Modulation::Lfo.new(
         #)),
       uni_detune: 0.1,
     ),
     #Oscillator.new(
-    #  shape: Shape::SquareSawtooth,
+    #  source: OscillatorSource::SquareSawtooth.instance,
     #  tune_cents: 0.1,
     #  uni_num: 4,
     #  uni_detune: 0.1,
     #),
     #Oscillator.new(
-    #  shape: Shape::SquareSawtooth,
+    #  source: OscillatorSource::SquareSawtooth.instance,
     #  tune_semis: -12,
     #  uni_num: 4,
     #  uni_detune: 0.1,
@@ -44,7 +44,6 @@ synth = MonoSynth.new(
       ), depth: 1.0),
     ),
   glide: 0.2,
-  quality: Quality::LOW,
   soundinfo: soundinfo,
 )
 bufs = []

data/examples/poly.rb

@@ -14,20 +14,20 @@ soundinfo = SoundInfo.new(
 synth = PolySynth.new(
   oscillators: [
     Oscillator.new(
-      shape: Shape::SquareSawtooth,
+      source: OscillatorSource::SquareSawtooth.instance,
       uni_num: ModulationValue.new(4)
         .add(Modulation::Lfo.new(
         )),
       uni_detune: 0.1,
     ),
     #Oscillator.new(
-    #  shape: Shape::SquareSawtooth,
+    #  source: OscillatorSource::SquareSawtooth.instance,
     #  tune_cents: 0.1,
     #  uni_num: 4,
     #  uni_detune: 0.1,
     #),
     #Oscillator.new(
-    #  shape: Shape::SquareSawtooth,
+    #  source: OscillatorSource::SquareSawtooth.instance,
     #  tune_semis: -12,
     #  uni_num: 4,
     #  uni_detune: 0.1,
@@ -43,7 +43,6 @@ synth = PolySynth.new(
         release: 0.2
       ), depth: 1.0),
     ),
-  quality: Quality::LOW,
   soundinfo: soundinfo,
 )
 bufs = []

data/examples/step_editor.rb

@@ -14,7 +14,7 @@ soundinfo = SoundInfo.new(
 synth = PolySynth.new(
   oscillators: [
     Oscillator.new(
-      shape: Shape::SquareSawtooth,
+      source: OscillatorSource::SquareSawtooth.instance,
       uni_num: 4,
       uni_detune: 0.1,
     ),
@@ -29,7 +29,6 @@ synth = PolySynth.new(
         release: 0.2
       ), depth: 1.0),
     ),
-  quality: Quality::LOW,
   soundinfo: soundinfo,
 )
 

data/lib/audio_stream/audio_input_metronome.rb

@@ -11,7 +11,7 @@ module AudioStream
 
       @synth = Synthesizer::PolySynth.new(
         oscillators: Synthesizer::Oscillator.new(
-          shape: Synthesizer::Shape::Sine,
+          source: Synthesizer::OscillatorSource::Sine,
           phase: 0,
         ),
         amplifier: Synthesizer::Amplifier.new(
@@ -24,7 +24,6 @@ module AudioStream
               release: 0.0
             ), depth: 1.0),
         ),
-        quality: Synthesizer::Quality::LOW,
         soundinfo: soundinfo,
       )
 

data/lib/synthesizer.rb

@@ -9,6 +9,7 @@ require 'synthesizer/step_editor'
 require 'synthesizer/poly_synth'
 require 'synthesizer/mono_synth'
 require 'synthesizer/oscillator'
+require 'synthesizer/oscillator_source'
 require 'synthesizer/filter'
 require 'synthesizer/amplifier'
 require 'synthesizer/shape'
@@ -19,7 +20,6 @@ require 'synthesizer/note'
 require 'synthesizer/note_perform'
 require 'synthesizer/unison'
 require 'synthesizer/processor'
-require 'synthesizer/quality'
 require 'synthesizer/utils'
 
 module Synthesizer

data/lib/synthesizer/mono_synth.rb

@@ -6,7 +6,6 @@ module Synthesizer
     attr_reader :amplifier
     attr_reader :processor
 
-    attr_reader :quality
     attr_reader :soundinfo
 
     attr_reader :glide
@@ -15,15 +14,14 @@ module Synthesizer
     # @param oscillators [Synthesizer::Oscillator] oscillator
     # @param amplifier [Synthesizer::Amplifier] amplifier
     # @param soundinfo [AudioStream::SoundInfo]
-    def initialize(oscillators:, filter: nil, amplifier:, glide: 0.1, quality: Quality::LOW, soundinfo:)
+    def initialize(oscillators:, filter: nil, amplifier:, glide: 0.1, soundinfo:)
       @oscillators = [oscillators].flatten.compact
       @filter = filter
       @amplifier = amplifier
 
-      @quality = quality
       @soundinfo = soundinfo
 
-      @processor = Processor.create(quality)
+      @processor = Processor.new
       @note_nums = []
       @perform = nil
       @glide = Modulation::Glide.new(time: glide)

data/lib/synthesizer/oscillator.rb

@@ -1,7 +1,7 @@
 module Synthesizer
   class Oscillator
 
-    attr_reader :shape
+    attr_reader :source
     attr_reader :volume
     attr_reader :pan
     attr_reader :tune_semis
@@ -12,7 +12,7 @@ module Synthesizer
     attr_reader :uni_num
     attr_reader :uni_detune
 
-    # @param shape [Synthesizer::Shape] oscillator waveform shape
+    # @param source [Synthesizer::OscillatorSource] oscillator waveform source
     # @param volume [Float] oscillator volume. mute=0.0 max=1.0
     # @param pan [Float] oscillator pan. left=-1.0 center=0.0 right=1.0 (-1.0~1.0)
     # @param tune_semis [Integer] oscillator pitch semitone
@@ -22,8 +22,8 @@ module Synthesizer
     # @param sync [Integer] TODO not implemented
     # @param uni_num [Float] oscillator voicing number (1.0~16.0)
     # @param uni_detune [Float] oscillator voicing detune percent. 0.01=1cent 1.0=semitone (0.0~1.0)
-    def initialize(shape: Shape::Sine, volume: 1.0, pan: 0.0, tune_semis: 0, tune_cents: 0, sym: 0, phase: nil, sync: 0, uni_num: 1.0, uni_detune: 0.0)
-      @shape = shape
+    def initialize(source: OscillatorSource::Sine, volume: 1.0, pan: 0.0, tune_semis: 0, tune_cents: 0, sym: 0, phase: nil, sync: 0, uni_num: 1.0, uni_detune: 0.0)
+      @source = source
 
       @volume = ModulationValue.create(volume)
       @pan = ModulationValue.create(pan)

data/lib/synthesizer/oscillator_source.rb

@@ -0,0 +1,5 @@
+require 'synthesizer/shape'
+require 'synthesizer/oscillator_source/base'
+require 'synthesizer/oscillator_source/basic'
+require 'synthesizer/oscillator_source/pulse'
+require 'synthesizer/oscillator_source/formant_vocoder'

data/lib/synthesizer/oscillator_source/base.rb

@@ -0,0 +1,36 @@
+module Synthesizer
+  module OscillatorSource
+    class Base
+      def initialize
+      end
+
+      def next(context, delta, l_gain, r_gain)
+        channels = context.channels
+        window_size = context.window_size
+        pos = context.pos
+
+        dst = window_size.times.map {|i|
+          sample(context, pos.next(delta))
+        }
+        dst = Vdsp::DoubleArray.create(dst)
+
+        case channels
+        when 1
+          Buffer.new(dst * l_gain)
+        when 2
+          Buffer.new(dst * l_gain, dst * r_gain)
+        end
+      end
+
+      def sample(context, phase)
+        raise Error, "not implemented abstruct method: #{self.class.name}.sample(context, phase)"
+      end
+
+      def generate_context(soundinfo, note_perform, phase)
+        Context.new(soundinfo.window_size, soundinfo.channels, ShapePos.new(phase: phase))
+      end
+
+      Context = Struct.new("Context", :window_size, :channels, :pos)
+    end
+  end
+end

data/lib/synthesizer/oscillator_source/basic.rb

@@ -0,0 +1,13 @@
+module Synthesizer
+  module OscillatorSource
+    Shape.constants.each {|a|
+      eval "class #{a} < Base
+              include Singleton
+
+              def sample(context, phase)
+                Shape::#{a}[phase]
+              end
+            end"
+    }
+  end
+end

data/lib/synthesizer/oscillator_source/formant_vocoder.rb

@@ -0,0 +1,107 @@
+module Synthesizer
+  module OscillatorSource
+    class FormantVocoder
+      attr_reader :vowels
+      attr_reader :pronunciation
+
+      @@f = {
+        i: [110.0, 250.0, 2100.0, 2900.0, 3700.0],
+        e: [160.0, 450.0, 1900.0, 2650.0, 3800.0],
+        a: [110.0, 700.0, 1250.0, 2500.0, 3900.0],
+        o: [110.0, 500.0, 1050.0, 2700.0, 3700.0],
+        u: [110.0, 330.0, 1500.0, 2400.0, 3650.0],
+        x: [110.0, 335.0, 1550.0, 2450.0, 3800.0],
+      }
+      @@gain = [50.0, 70.0, 110.0, 200.0, 200.0].map {|x| Math::PI * x}
+
+      def initialize(vowels: [:i, :e, :a, :o, :u], pronunciation: 0)
+        self.vowels = vowels
+        self.pronunciation = pronunciation
+        @pulse = Pulse.instance
+      end
+
+      def vowels=(vowels)
+        vowels = vowels + [vowels[0]]
+        @vowels = vowels.map {|v| @@f[v]}
+        @vowels_len = @vowels.length
+      end
+
+      def pronunciation=(pronunciation)
+        @pronunciation = ModulationValue.create(pronunciation)
+      end
+
+      def next(context, delta, l_gain, r_gain)
+        channels = context.channels
+        window_size = context.window_size
+        samplerate = context.samplerate
+        tmpbufs = context.tmpbufs
+        pronunciation_mod = context.pronunciation_mod
+
+        @pulse_context ||= @pulse.generate_context(context.soundinfo, context.note_perform, context.phase)
+        pulse = @pulse.next(@pulse_context, delta, 0.5, 0.5).streams[0]
+
+        r_index = pronunciation_mod[]
+        index = r_index.to_i
+
+        dst = 5.times.map {|i|
+        #dst = (1...5).each.map {|i|
+          tmpbuf = tmpbufs[i]
+          freq = @vowels[index % @vowels_len][i]+(@vowels[(index+1) % @vowels_len][i]-@vowels[index % @vowels_len][i])*(r_index-index)
+          w = Math::PI * 2 * freq
+          resfil(pulse, tmpbufs[i], @@gain[i], w, 1.0/samplerate, window_size)
+        }.inject(:+)
+
+        case channels
+        when 1
+          Buffer.new(dst * l_gain)
+        when 2
+          Buffer.new(dst * l_gain, dst * r_gain)
+        end
+      end
+
+      def resfil(x, v, a, w, dt, len)
+        b = 2.0 * (Math::E ** (-a*dt)) * Math.cos(w*dt)
+        c = Math::E ** (-2.0 * a * dt)
+        d = ((a*a+w*w)/w) * (Math::E ** (-a*dt)) * Math.sin(w*dt)
+
+        #v[0] = v[len-2]
+        #v[1] = v[len-1]
+        #v[0] += 1.0
+
+        #Vdsp::UnsafeDouble.vsmsma(v, 1, 1, b, v, 0, 1, -c, v, 2, 1, len)
+        #v * (d / 25000.to_f)
+
+        v[0] = v[len-2]
+        v[1] = v[len-1]
+
+        y = len.times.map {|i|
+          v[i+2] = b * v[i+1] - c * v[i] + x[i]
+          v[i+1] * (d / 25000.to_f)
+        }
+
+        Vdsp::DoubleArray.create(y)
+      end
+
+      def generate_context(soundinfo, note_perform, phase)
+        pronunciation_mod = ModulationValue.balance_generator(note_perform, soundinfo.framerate, @pronunciation)
+        tmpbufs = Array.new(5) {|i| Vdsp::DoubleArray.new(soundinfo.window_size+2)}
+
+        FvContext.new(soundinfo, note_perform, phase, tmpbufs, pronunciation_mod)
+      end
+
+      FvContext = Struct.new("FvContext", :soundinfo, :note_perform, :phase, :tmpbufs, :pronunciation_mod) do
+        def window_size
+          soundinfo.window_size
+        end
+
+        def channels
+          soundinfo.channels
+        end
+
+        def samplerate
+          soundinfo.samplerate
+        end
+      end
+    end
+  end
+end

data/lib/synthesizer/oscillator_source/pulse.rb

@@ -0,0 +1,23 @@
+module Synthesizer
+  module OscillatorSource
+    class Pulse < Square
+      include Singleton
+
+      def initialize
+      end
+
+      def sample(context, phase)
+        val = super(context, phase)
+        result = context.prev<0.0 && 0.0<val ? 1.0 : 0.0
+        context.prev = val
+        result
+      end
+
+      def generate_context(soundinfo, note_perform, phase)
+        PulseContext.new(soundinfo.window_size, soundinfo.channels, phase, ShapePos.new(phase: phase), -1.0)
+      end
+
+      PulseContext = Struct.new("PulseContext", :window_size, :channels, :phase, :pos, :prev)
+    end
+  end
+end

data/lib/synthesizer/poly_synth.rb

@@ -6,7 +6,6 @@ module Synthesizer
     attr_reader :amplifier
     attr_reader :processor
 
-    attr_reader :quality
     attr_reader :soundinfo
 
     attr_reader :glide
@@ -16,15 +15,14 @@ module Synthesizer
     # @param filter [Synthesizer::Filter] filter
     # @param amplifier [Synthesizer::Amplifier] amplifier
     # @param soundinfo [AudioStream::SoundInfo]
-    def initialize(oscillators:, filter: nil, amplifier:, quality: Quality::LOW, soundinfo:)
+    def initialize(oscillators:, filter: nil, amplifier:, soundinfo:)
       @oscillators = [oscillators].flatten.compact
       @filter = filter
       @amplifier = amplifier
 
-      @quality = quality
       @soundinfo = soundinfo
 
-      @processor = Processor.create(quality)
+      @processor = Processor.new
       @performs = {}
       @pitch_bend = 0.0
     end

data/lib/synthesizer/processor.rb

@@ -1,10 +1,48 @@
-require 'synthesizer/processor/low'
-require 'synthesizer/processor/high'
-
 module Synthesizer
-  module Processor
-    def self.create(quality)
-      const_get(quality, false).new
+  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[]
+
+        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
+      }
     end
   end
 end

data/lib/synthesizer/shape.rb

@@ -15,8 +15,14 @@ module Synthesizer
     WhiteNoise = ->(phase) { Random.rand(-1.0...1.0) }
 
     # LFO
-    RampUp = ->(phase) { (phase % 1) * 2 - 1 }
-    RampDown = ->(phase) { (phase % 1) * -2 + 1 }
+    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}
+
+    ForeverRampUp = ->(phase) { phase}
+    ForeverRampDown = ->(phase) { -phase}
 
     # Complex
     self.constants.tap {|consts|
@@ -30,6 +36,5 @@ module Synthesizer
         }
       }
     }
-
   end
 end

data/lib/synthesizer/unison.rb

@@ -2,15 +2,15 @@ module Synthesizer
   class Unison
     UNI_NUM_MAX = 16
 
-    def initialize(note_perform, shape, phase)
-      @note_perform = note_perform
-      @shape = shape
-      @poss = UNI_NUM_MAX.times.map {|i|
-        ShapePos.new(phase: phase.value)
-      }
-
+    def initialize(note_perform, source, phase)
       synth = note_perform.synth
       @samplerate = synth.soundinfo.samplerate
+
+      @note_perform = note_perform
+      @source = source
+      @source_contexts = UNI_NUM_MAX.times.map {|i|
+        source.generate_context(synth.soundinfo, note_perform,  phase.value)
+      }
     end
 
     def next(uni_num, uni_detune, volume, pan, tune_semis, tune_cents)
@@ -20,11 +20,8 @@ module Synthesizer
         uni_num = UNI_NUM_MAX
       end
 
-      val_l = 0.0
-      val_r = 0.0
-
-      uni_num.ceil.times {|i|
-        pos = @poss[i]
+      uni_num.ceil.times.map {|i|
+        context = @source_contexts[i]
 
         uni_volume = 1.0
         if uni_num<i
@@ -40,12 +37,8 @@ module Synthesizer
         hz = @note_perform.note.hz(semis: tune_semis, cents: tune_cents + detune_cents)
         delta = hz / @samplerate
 
-        val = @shape[pos.next(delta)] * uni_volume
-        val_l += val * l_gain
-        val_r += val * r_gain
-      }
-
-      [val_l * volume / uni_num, val_r * volume / uni_num]
+        @source.next(context, delta, l_gain * volume * uni_volume / uni_num, r_gain * volume * uni_volume / uni_num)
+      }.inject(:+)
     end
   end
 end

data/lib/synthesizer/version.rb

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

data/synthesizer.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 
-  spec.add_dependency "audio_stream", ">= 3.0.0"
+  spec.add_dependency "audio_stream", ">= 3.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synthesizer
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 description: Synthesizer implemented in Ruby.
 email:
 - yoshida.eth0@gmail.com
@@ -83,6 +83,8 @@ files:
 - bin/setup
 - examples/adsr.ipynb
 - examples/curves.ipynb
+- examples/formant_vocoder.rb
+- examples/formant_vocoder_sweep.rb
 - examples/lpf.rb
 - examples/metronome.rb
 - examples/mono.rb
@@ -113,11 +115,13 @@ files:
 - lib/synthesizer/note.rb
 - lib/synthesizer/note_perform.rb
 - lib/synthesizer/oscillator.rb
+- lib/synthesizer/oscillator_source.rb
+- lib/synthesizer/oscillator_source/base.rb
+- lib/synthesizer/oscillator_source/basic.rb
+- lib/synthesizer/oscillator_source/formant_vocoder.rb
+- lib/synthesizer/oscillator_source/pulse.rb
 - lib/synthesizer/poly_synth.rb
 - lib/synthesizer/processor.rb
-- lib/synthesizer/processor/high.rb
-- lib/synthesizer/processor/low.rb
-- lib/synthesizer/quality.rb
 - lib/synthesizer/shape.rb
 - lib/synthesizer/shape_pos.rb
 - lib/synthesizer/step_editor.rb
@@ -148,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Synthesizer implemented in Ruby.

data/lib/synthesizer/processor/high.rb

@@ -1,91 +0,0 @@
-module Synthesizer
-  module Processor
-    class High
-      def generator(osc, note_perform)
-        synth = note_perform.synth
-        filter = synth.filter
-        amp = synth.amplifier
-        channels = synth.soundinfo.channels
-        window_size = synth.soundinfo.window_size
-        framerate = synth.soundinfo.samplerate.to_f
-
-        # 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.shape, osc.phase)
-
-        # Filter
-        filter_mod = nil
-        if filter
-          filter_mod = filter.generator(note_perform, framerate / window_size)
-        end
-
-        case channels
-        when 1
-          -> {
-            buf = AudioStream::Buffer.create_mono(window_size)
-            dst0 = buf.streams[0]
-
-            window_size.times.each {|i|
-              # Oscillator, Amplifier
-              volume = volume_mod[] * note_perform.velocity
-              tune_semis = tune_semis_mod[] + synth.pitch_bend
-              tune_cents = tune_cents_mod[]
-
-              uni_num = uni_num_mod[]
-              uni_detune = uni_detune_mod[]
-
-              sval = unison.next(uni_num, uni_detune, volume, 0.0, tune_semis, tune_cents)
-              mval = (sval[0] + sval[1]) / 2.0
-
-              dst0[i] = mval
-            }
-
-            # Filter
-            if filter_mod
-              filter_fx = filter_mod[]
-              buf = filter_fx.process(buf)
-            end
-
-            buf
-          }
-        when 2
-          -> {
-            buf = AudioStream::Buffer.create_stereo(window_size)
-            dst0 = buf.streams[0]
-            dst1 = buf.streams[1]
-
-            window_size.times.each {|i|
-              # Oscillator, Amplifier
-              volume = volume_mod[] * note_perform.velocity
-              pan = pan_mod[]
-              tune_semis = tune_semis_mod[] + synth.pitch_bend
-              tune_cents = tune_cents_mod[]
-
-              uni_num = uni_num_mod[]
-              uni_detune = uni_detune_mod[]
-
-              sval = unison.next(uni_num, uni_detune, volume, pan, tune_semis, tune_cents)
-
-              dst0[i] = sval[0]
-              dst1[i] = sval[1]
-            }
-
-            # Filter
-            if filter_mod
-              filter_fx = filter_mod[]
-              buf = filter_fx.process(buf)
-            end
-
-            buf
-          }
-        end
-      end
-    end
-  end
-end

data/lib/synthesizer/processor/low.rb

@@ -1,88 +0,0 @@
-module Synthesizer
-  module Processor
-    class Low
-      def generator(osc, note_perform)
-        synth = note_perform.synth
-        filter = synth.filter
-        amp = synth.amplifier
-        channels = synth.soundinfo.channels
-        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.shape, osc.phase)
-
-        # Filter
-        filter_mod = nil
-        if filter
-          filter_mod = filter.generator(note_perform, framerate)
-        end
-
-        case channels
-        when 1
-          -> {
-            buf = AudioStream::Buffer.create_mono(window_size)
-            dst0 = buf.streams[0]
-
-            # Oscillator, Amplifier
-            volume = volume_mod[] * note_perform.velocity
-            tune_semis = tune_semis_mod[] + synth.pitch_bend
-            tune_cents = tune_cents_mod[]
-
-            uni_num = uni_num_mod[]
-            uni_detune = uni_detune_mod[]
-
-            window_size.times.each {|i|
-              val = unison.next(uni_num, uni_detune, volume, 0.0, tune_semis, tune_cents)
-              dst0[i] = (val[0] + val[1]) / 2.0
-            }
-
-            # Filter
-            if filter_mod
-              filter_fx = filter_mod[]
-              buf = filter_fx.process(buf)
-            end
-
-            buf
-          }
-        when 2
-          -> {
-            buf = AudioStream::Buffer.create_stereo(window_size)
-            dst0 = buf.streams[0]
-            dst1 = buf.streams[1]
-
-            # Oscillator, Amplifier
-            volume = volume_mod[] * note_perform.velocity
-            pan = pan_mod[]
-            tune_semis = tune_semis_mod[] + synth.pitch_bend
-            tune_cents = tune_cents_mod[]
-
-            uni_num = uni_num_mod[]
-            uni_detune = uni_detune_mod[]
-
-            window_size.times.each {|i|
-              val = unison.next(uni_num, uni_detune, volume, pan, tune_semis, tune_cents)
-              dst0[i] = val[0]
-              dst1[i] = val[1]
-            }
-
-            # Filter
-            if filter_mod
-              filter_fx = filter_mod[]
-              buf = filter_fx.process(buf)
-            end
-
-            buf
-          }
-        end
-      end
-    end
-  end
-end

data/lib/synthesizer/quality.rb

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