synthesizer 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de75bd1dce21cbe4d6fb77b3f7dac7b35a5db994a1e7ee3d4109d660cbb69d68
-  data.tar.gz: 6d4f22b0ee34003ce64ab908f39ab9bfdd5df448c738eed516d2cb8312f2dbbe
+  metadata.gz: fb327b711e81b9980b065cb446c278e1b74207ef4f2351646c1dc217c52925de
+  data.tar.gz: 621c2d0970d3d5d5c2663bc56cce7ddc1e4c9e369b9fad56121a597d619a7637
 SHA512:
-  metadata.gz: df6f09c4951a5925bc77f6821c53327307f9aeb16d4e273dc440c034c261fb06a35abd0f6c9b19735b3a581267afc30d98e3a05f722829bac9f2aa99e0cd5f34
-  data.tar.gz: 17da6f4b246047632d921e15d5b0b6975cc6c4ecda29ce9b1cdbe9231ea1832bef9b3601a91a98fe044711d5eef5a37e67aa74be6ef3691bf102380efc646b46
+  metadata.gz: '028d65fe391817a4e4c52e9dee9bea5803698e348d64a92fa41c239da7219fb60afe0dfb8b7e63fc5a96839544bd264ee3813dfa4c1ba4dd043d09ba9b104c5b'
+  data.tar.gz: b39b4a1860af12bbe5c45c2d972ab4b41c0944ab849380cec8445a8a940a03ae92bad717f7fb50a9573de82a7512f2663e4ff642c021b157e9c34bc25766b8fd

data/examples/formant_vocoder.rb

@@ -72,7 +72,7 @@ bufs += 50.times.map {|_| synth.next}
 track1 = AudioInput.buffer(bufs)
 
 stereo_out = AudioOutput.device(soundinfo: soundinfo)
-#stereo_out = AudioOutput.file("formatvocoder.wav", soundinfo: soundinfo)
+#stereo_out = AudioOutput.file("formant_vocoder.wav", soundinfo: soundinfo)
 
 track1
   .send_to(stereo_out, gain: 1.0)

data/examples/formant_vocoder_sweep.rb

@@ -51,9 +51,9 @@ 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))
+synth.note_on(Note.new(base+7))
 bufs += 100.times.map {|_| synth.next}
-synth.note_off(Note.new(base+8))
+synth.note_off(Note.new(base+7))
 bufs += 20.times.map {|_| synth.next}
 
 bufs += 50.times.map {|_| synth.next}
@@ -62,7 +62,7 @@ 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)
+#stereo_out = AudioOutput.file("formant_vocoder_sweep.wav", soundinfo: soundinfo)
 
 track1
   .send_to(stereo_out, gain: 1.0)

data/examples/sync.rb

@@ -0,0 +1,63 @@
+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::Sawtooth.instance,
+      sync: ModulationValue.new(0.0)
+        .add(Modulation::Lfo.new(
+          shape: Shape::PositiveRampUp,
+          delay: 0.0,
+          attack: 0.0,
+          attack_curve: Modulation::Curve::Straight,
+          phase: 0.0,
+          rate: 0.2
+        ), depth: 48),
+    ),
+  ],
+  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 = []
+
+bufs += 50.times.map {|_| synth.next}
+synth.note_on(Note.new(60))
+bufs += 200.times.map {|_| synth.next}
+synth.note_off(Note.new(60))
+bufs += 50.times.map {|_| synth.next}
+
+
+track1 = AudioInput.buffer(bufs)
+
+stereo_out = AudioOutput.device(soundinfo: soundinfo)
+
+track1
+  .send_to(stereo_out, gain: 0.25)
+
+
+conductor = Conductor.new(
+  input: [track1],
+  output: [stereo_out]
+)
+conductor.connect
+conductor.join

data/lib/synthesizer/amplifier.rb

@@ -7,6 +7,7 @@ module Synthesizer
     attr_reader :tune_cents
     attr_reader :uni_num
     attr_reader :uni_detune
+    attr_reader :uni_stereo
 
     # @param volume [Float] master volume. mute=0.0 max=1.0
     # @param pan [Float] master pan. left=-1.0 center=0.0 right=1.0 (-1.0~1.0)
@@ -14,7 +15,8 @@ module Synthesizer
     # @param tune_cents [Integer] master pitch cent
     # @param uni_num [Float] master voicing number (1.0~16.0)
     # @param uni_detune [Float] master 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, uni_num: 1.0, uni_detune: 0.0)
+    # @param uni_stereo [Float] oscillator voicing spread pan. -1.0=full inv 0.0=mono 1.0=full (-1.0~1.0)
+    def initialize(shape: Shape::Sine, volume: 1.0, pan: 0.0, tune_semis: 0, tune_cents: 0, uni_num: 1.0, uni_detune: 0.0, uni_stereo: 0.0)
       @volume = ModulationValue.create(volume)
       @pan = ModulationValue.create(pan)
       @tune_semis = ModulationValue.create(tune_semis)
@@ -22,6 +24,7 @@ module Synthesizer
 
       @uni_num = ModulationValue.create(uni_num)
       @uni_detune = ModulationValue.create(uni_detune)
+      @uni_stereo = ModulationValue.create(uni_stereo)
     end
   end
 end

data/lib/synthesizer/filter/band_pass_filter.rb

@@ -6,12 +6,12 @@ module Synthesizer
         @bandwidth = ModulationValue.create(bandwidth)
       end
 
-      def generator(note_perform, framerate)
+      def generator(note_perform)
         soundinfo = note_perform.synth.soundinfo
         filter = AudioStream::Fx::BandPassFilter.new(soundinfo)
 
-        freq_mod = ModulationValue.balance_generator(note_perform, framerate, @freq)
-        bandwidth_mod = ModulationValue.balance_generator(note_perform, framerate, @bandwidth)
+        freq_mod = ModulationValue.balance_generator(note_perform, @freq)
+        bandwidth_mod = ModulationValue.balance_generator(note_perform, @bandwidth)
 
         -> {
           filter.update_coef(freq: freq_mod[], bandwidth: bandwidth_mod[])

data/lib/synthesizer/filter/high_pass_filter.rb

@@ -6,12 +6,12 @@ module Synthesizer
         @q = ModulationValue.create(q)
       end
 
-      def generator(note_perform, framerate)
+      def generator(note_perform)
         soundinfo = note_perform.synth.soundinfo
         filter = AudioStream::Fx::HighPassFilter.new(soundinfo)
 
-        freq_mod = ModulationValue.balance_generator(note_perform, framerate, @freq)
-        q_mod = ModulationValue.balance_generator(note_perform, framerate, @q)
+        freq_mod = ModulationValue.balance_generator(note_perform, @freq)
+        q_mod = ModulationValue.balance_generator(note_perform, @q)
 
         -> {
           filter.update_coef(freq: freq_mod[], q: q_mod[])

data/lib/synthesizer/filter/high_shelf_filter.rb

@@ -7,13 +7,13 @@ module Synthesizer
         @gain = ModulationValue.create(gain)
       end
 
-      def generator(note_perform, framerate)
+      def generator(note_perform)
         soundinfo = note_perform.synth.soundinfo
         filter = AudioStream::Fx::HighShelfFilter.new(soundinfo)
 
-        freq_mod = ModulationValue.balance_generator(note_perform, framerate, @freq)
-        q_mod = ModulationValue.balance_generator(note_perform, framerate, @q)
-        gain_mod = ModulationValue.balance_generator(note_perform, framerate, @gain)
+        freq_mod = ModulationValue.balance_generator(note_perform, @freq)
+        q_mod = ModulationValue.balance_generator(note_perform, @q)
+        gain_mod = ModulationValue.balance_generator(note_perform, @gain)
 
         -> {
           filter.update_coef(freq: freq_mod[], q: q_mod[], gain: gain_mod[])

data/lib/synthesizer/filter/low_pass_filter.rb

@@ -6,12 +6,12 @@ module Synthesizer
         @q = ModulationValue.create(q)
       end
 
-      def generator(note_perform, framerate)
+      def generator(note_perform)
         soundinfo = note_perform.synth.soundinfo
         filter = AudioStream::Fx::LowPassFilter.new(soundinfo)
 
-        freq_mod = ModulationValue.balance_generator(note_perform, framerate, @freq)
-        q_mod = ModulationValue.balance_generator(note_perform, framerate, @q)
+        freq_mod = ModulationValue.balance_generator(note_perform, @freq)
+        q_mod = ModulationValue.balance_generator(note_perform, @q)
 
         -> {
           filter.update_coef(freq: freq_mod[], q: q_mod[])

data/lib/synthesizer/filter/low_shelf_filter.rb

@@ -7,13 +7,13 @@ module Synthesizer
         @gain = ModulationValue.create(gain)
       end
 
-      def generator(note_perform, framerate)
+      def generator(note_perform)
         soundinfo = note_perform.synth.soundinfo
         filter = AudioStream::Fx::LowShelfFilter.new(soundinfo)
 
-        freq_mod = ModulationValue.balance_generator(note_perform, framerate, @freq)
-        q_mod = ModulationValue.balance_generator(note_perform, framerate, @q)
-        gain_mod = ModulationValue.balance_generator(note_perform, framerate, @gain)
+        freq_mod = ModulationValue.balance_generator(note_perform, @freq)
+        q_mod = ModulationValue.balance_generator(note_perform, @q)
+        gain_mod = ModulationValue.balance_generator(note_perform, @gain)
 
         -> {
           filter.update_coef(freq: freq_mod[], q: q_mod[], gain: gain_mod[])

data/lib/synthesizer/filter/parallel.rb

@@ -5,9 +5,9 @@ module Synthesizer
         @filters = filters
       end
 
-      def generator(note_perform, framerate)
+      def generator(note_perform)
         filter_mods = @filters.map {|filter|
-          filter.generator(note_perform, framerate)
+          filter.generator(note_perform)
         }
 
         -> {

data/lib/synthesizer/filter/peaking_filter.rb

@@ -7,13 +7,13 @@ module Synthesizer
         @gain = ModulationValue.create(gain)
       end
 
-      def generator(note_perform, framerate)
+      def generator(note_perform)
         soundinfo = note_perform.synth.soundinfo
         filter = AudioStream::Fx::LowShelfFilter.new(soundinfo)
 
-        freq_mod = ModulationValue.balance_generator(note_perform, framerate, @freq)
-        bandwidth_mod = ModulationValue.balance_generator(note_perform, framerate, @bandwidth)
-        gain_mod = ModulationValue.balance_generator(note_perform, framerate, @gain)
+        freq_mod = ModulationValue.balance_generator(note_perform, @freq)
+        bandwidth_mod = ModulationValue.balance_generator(note_perform, @bandwidth)
+        gain_mod = ModulationValue.balance_generator(note_perform, @gain)
 
         -> {
           filter.update_coef(freq: freq_mod[], bandwidth: bandwidth_mod[], gain: gain_mod[])

data/lib/synthesizer/filter/serial.rb

@@ -5,9 +5,9 @@ module Synthesizer
         @filters = filters
       end
 
-      def generator(note_perform, framerate)
+      def generator(note_perform)
         filter_mods = @filters.map {|filter|
-          filter.generator(note_perform, framerate)
+          filter.generator(note_perform)
         }
 
         -> {

data/lib/synthesizer/modulation/adsr.rb

@@ -2,15 +2,15 @@ module Synthesizer
   module Modulation
     class Adsr
 
-      # @param attack [Float] attack sec (0.0~)
+      # @param attack [AudioStream::Rate] attack sec (0.0~)
       # @param attack_curve [Synthesizer::Curve]
-      # @param hold [Float] hold sec (0.0~)
-      # @param decay [Float] decay sec (0.0~)
+      # @param hold [AudioStream::Rate] hold sec (0.0~)
+      # @param decay [AudioStream::Rate] decay sec (0.0~)
       # @param sustain_curve [Synthesizer::Curve]
-      # @param sustain [Float] sustain sec (0.0~)
-      # @param release [Float] release sec (0.0~)
+      # @param sustain [Float] sustain level (0.0~1.0)
+      # @param release [AudioStream::Rate] release sec (0.0~)
       # @param release_curve [Synthesizer::Curve]
-      def initialize(attack:, attack_curve: Curve::EaseOut, hold: 0.0, decay:, sustain_curve: Curve::EaseOut, sustain:, release:, release_curve: Curve::EaseOut)
+      def initialize(attack:, attack_curve: Curve::EaseOut, hold: AudioStream::Rate.sec(0.0), decay:, sustain_curve: Curve::EaseOut, sustain:, release:, release_curve: Curve::EaseOut)
         @attack = attack
         @attack_curve = attack_curve
         @hold = hold
@@ -21,27 +21,26 @@ module Synthesizer
         @release_curve = release_curve
       end
 
-      def note_on_envelope(framerate, sustain: false, &block)
+      def note_on_envelope(soundinfo, sustain: false, &block)
         Enumerator.new do |yld|
           # attack
-          rate = @attack * framerate
-          rate.to_i.times {|i|
-            x = i.to_f / rate
+          attack_len = @attack.frame(soundinfo).to_i
+          attack_len.times {|i|
+            x = i.to_f / attack_len
             y = @attack_curve[x]
             yld << y
           }
 
           # hold
-          rate = @hold * framerate
-          rate.to_i.times {|i|
+          @hold.frame(soundinfo).to_i.times {|i|
             yld << 1.0
           }
 
           # decay
-          rate = @decay * framerate
-          rate.to_i.times {|i|
-            x = i.to_f / rate
-            y = 1.0 - @sustain_curve[x]  * (1.0 - @sustain)
+          decay_len = @decay.frame(soundinfo).to_i
+          decay_len.times {|i|
+            x = i.to_f / decay_len
+            y = 1.0 - @sustain_curve[x] * (1.0 - @sustain)
             yld << y
           }
 
@@ -54,12 +53,12 @@ module Synthesizer
         end.each(&block)
       end
 
-      def note_off_envelope(framerate, sustain: false, &block)
+      def note_off_envelope(soundinfo, sustain: false, &block)
         Enumerator.new do |yld|
           # release
-          rate = @release * framerate
-          rate.to_i.times {|i|
-            x = i.to_f / rate
+          release_len = @release.frame(soundinfo).to_i
+          release_len.times {|i|
+            x = i.to_f / release_len
             y = 1.0 - @release_curve[x]
             yld << y
           }
@@ -73,9 +72,11 @@ module Synthesizer
         end.each(&block)
       end
 
-      def generator(note_perform, framerate, release_sustain:)
-        note_on = note_on_envelope(framerate, sustain: true)
-        note_off = note_off_envelope(framerate, sustain: release_sustain)
+      def generator(note_perform, release_sustain:)
+        soundinfo = note_perform.synth.soundinfo
+
+        note_on = note_on_envelope(soundinfo, sustain: true)
+        note_off = note_off_envelope(soundinfo, sustain: release_sustain)
         last = 0.0
 
         -> {
@@ -88,26 +89,26 @@ module Synthesizer
       end
 
 
-      def amp_generator(note_perform, framerate, depth, &block)
+      def amp_generator(note_perform, depth, &block)
         bottom = 1.0 - depth
-        gen = generator(note_perform, framerate, release_sustain: 0.0<bottom)
+        gen = generator(note_perform, release_sustain: 0.0<bottom)
 
         -> {
           gen[] * depth + bottom
         }
       end
 
-      def balance_generator(note_perform, framerate, depth, &block)
-        gen = generator(note_perform, framerate, release_sustain: true)
+      def balance_generator(note_perform, depth, &block)
+        gen = generator(note_perform, release_sustain: true)
 
         -> {
           gen[] * depth
         }
       end
 
-      def plot_data(framerate: 44100)
-        note_on = note_on_envelope(framerate, sustain: false)
-        note_off = note_off_envelope(framerate, sustain: false)
+      def plot_data(soundinfo)
+        note_on = note_on_envelope(soundinfo, sustain: false)
+        note_off = note_off_envelope(soundinfo, sustain: false)
         last = 0.0
 
         xs = []
@@ -127,8 +128,8 @@ module Synthesizer
         {x: xs, y: ys}
       end
 
-      def plot(framerate: 44100)
-        data = plot_data(framerate: framerate)
+      def plot(soundinfo)
+        data = plot_data(soundinfo)
         Plotly::Plot.new(data: [data])
       end
     end

data/lib/synthesizer/modulation/glide.rb

@@ -2,9 +2,9 @@ module Synthesizer
   module Modulation
     class Glide
 
-      # @param time [Float] glide time sec (0.0~)
+      # @param time [AudioStream::Rate] glide time sec (0.0~)
       def initialize(time:)
-        @time = time.to_f
+        @time = time
 
         @base = 0.0
         @current = 0.0
@@ -26,15 +26,16 @@ module Synthesizer
         @diff = target - @current
       end
 
-      def generator(note_perform, samplerate)
-        rate = @time * samplerate
+      def generator(note_perform)
+        soundinfo = note_perform.synth.soundinfo
+        rate = @time.frame(soundinfo)
 
         -> {
           ret = nil
 
-          if note_perform.note_on?
+          if !note_perform.released?
             # Note On
-            if 0<@time && @target!=@current
+            if 0<rate && @target!=@current
               # Gliding
               x = @diff / rate
               if x.abs<(@target-@current).abs
@@ -60,8 +61,8 @@ module Synthesizer
         }
       end
 
-      def balance_generator(note_perform, samplerate, depth)
-        gen = generator(note_perform, samplerate)
+      def balance_generator(note_perform, depth)
+        gen = generator(note_perform)
 
         -> {
           gen[] * depth

data/lib/synthesizer/modulation/lfo.rb

@@ -3,12 +3,12 @@ module Synthesizer
     class Lfo
 
       # @param shape [Synthesizer::Shape]
-      # @param delay [Float] delay sec (0.0~)
-      # @param attack [Float] attack sec (0.0~)
+      # @param delay [AudioStream::Rate] delay sec (0.0~)
+      # @param attack [AudioStream::Rate] attack sec (0.0~)
       # @param attack_curve [Synthesizer::Curve]
       # @param phase [Float] phase percent (0.0~1.0)
-      # @param rate [Float] wave freq (0.0~)
-      def initialize(shape: Shape::Sine, delay: 0.0, attack: 0.0, attack_curve: Curve::Straight, phase: 0.0, rate: 3.5)
+      # @param rate [AudioStream::Rate] wave freq (0.0~)
+      def initialize(shape: Shape::Sine, delay: AudioStream::Rate.sec(0.0), attack: AudioStream::Rate.sec(0.0), attack_curve: Curve::Straight, phase: 0.0, rate: AudioStream::Rate.freq(3.5))
         @shape = shape
         @delay = delay
         @attack = attack
@@ -17,37 +17,37 @@ module Synthesizer
         @rate = rate
       end
 
-      def generator(note_perform, framerate, &block)
-        Enumerator.new do |yld|
-          delta = @rate / framerate
+      def generator(note_perform, &block)
+        soundinfo = note_perform.synth.soundinfo
+        hz = @rate.freq(soundinfo)
 
-          pos = ShapePos.new(phase: @phase)
+        Enumerator.new do |yld|
+          pos = ShapePos.new(soundinfo.samplerate, @phase)
 
           # delay
-          rate = @delay * framerate
-          rate.to_i.times {|i|
+          @delay.frame(soundinfo).to_i.times {|i|
             yld << 0.0
           }
 
           # attack
-          rate = @attack * framerate
-          rate.to_i.times {|i|
-            x = i.to_f / rate
+          attack_len = @attack.frame(soundinfo).to_i
+          attack_len.times {|i|
+            x = i.to_f / attack_len
             y = @attack_curve[x]
-            yld << @shape[pos.next(delta)] * y
+            yld << @shape[pos.next(hz, 0.0, 0.0)] * y
           }
 
           # sustain
           loop {
-            val = @shape[pos.next(delta)]
+            val = @shape[pos.next(hz, 0.0, 0.0)]
             yld << val
           }
         end.each(&block)
       end
 
-      def amp_generator(note_perform, framerate, depth, &block)
+      def amp_generator(note_perform, depth, &block)
         bottom = 1.0 - depth
-        gen = generator(note_perform, framerate)
+        gen = generator(note_perform)
 
         -> {
           val = (gen.next + 1) / 2
@@ -55,8 +55,8 @@ module Synthesizer
         }
       end
 
-      def balance_generator(note_perform, framerate, depth, &block)
-        gen = generator(note_perform, framerate)
+      def balance_generator(note_perform, depth, &block)
+        gen = generator(note_perform)
 
         -> {
           gen.next * depth

data/lib/synthesizer/modulation_value.rb

@@ -9,7 +9,7 @@ module Synthesizer
       @mods = []
 
       mods.each {|mod, depth|
-        add(mod, depth: depth)
+        add(mod, depth: depth || 1.0)
       }
     end
 
@@ -35,7 +35,7 @@ module Synthesizer
       end
     end
 
-    def self.amp_generator(note_perform, framerate, *modvals)
+    def self.amp_generator(note_perform, *modvals)
       modvals = modvals.flatten.compact
 
       # value
@@ -45,7 +45,7 @@ module Synthesizer
       mods = []
       modvals.each {|modval|
         modval.mods.each {|mod, depth|
-          mods << mod.amp_generator(note_perform, framerate, depth)
+          mods << mod.amp_generator(note_perform, depth)
         }
       }
 
@@ -55,7 +55,7 @@ module Synthesizer
       }
     end
 
-    def self.balance_generator(note_perform, framerate, *modvals, center: 0)
+    def self.balance_generator(note_perform, *modvals, center: 0)
       modvals = modvals.flatten.compact
 
       # value
@@ -66,7 +66,7 @@ module Synthesizer
       mods = []
       modvals.each {|modval|
         modval.mods.each {|mod, depth|
-          mods << mod.balance_generator(note_perform, framerate, depth)
+          mods << mod.balance_generator(note_perform, depth)
         }
       }
 

data/lib/synthesizer/mono_synth.rb

@@ -12,9 +12,11 @@ module Synthesizer
     attr_accessor :pitch_bend
 
     # @param oscillators [Synthesizer::Oscillator] oscillator
+    # @param filter [Synthesizer::Filter] filter
     # @param amplifier [Synthesizer::Amplifier] amplifier
+    # @param glide [AudioStream::Rate] glide time sec (0.0~)
     # @param soundinfo [AudioStream::SoundInfo]
-    def initialize(oscillators:, filter: nil, amplifier:, glide: 0.1, soundinfo:)
+    def initialize(oscillators:, filter: nil, amplifier:, glide: AudioStream::Rate.sec(0.1), soundinfo:)
       @oscillators = [oscillators].flatten.compact
       @filter = filter
       @amplifier = amplifier

data/lib/synthesizer/oscillator.rb

@@ -11,6 +11,7 @@ module Synthesizer
     attr_reader :sync
     attr_reader :uni_num
     attr_reader :uni_detune
+    attr_reader :uni_stereo
 
     # @param source [Synthesizer::OscillatorSource] oscillator waveform source
     # @param volume [Float] oscillator volume. mute=0.0 max=1.0
@@ -19,10 +20,11 @@ module Synthesizer
     # @param tune_cents [Integer] oscillator pitch cent
     # @param sym [nil] TODO not implemented
     # @param phase [Float] oscillator waveform shape start phase percent (0.0~1.0,nil) nil=random
-    # @param sync [Integer] TODO not implemented
+    # @param sync [Integer] oscillator sync pitch 1.0=semitone 12.0=octave (0.0~48.0)
     # @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(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)
+    # @param uni_stereo [Float] oscillator voicing spread pan. -1.0=full inv 0.0=mono 1.0=full (-1.0~1.0)
+    def initialize(source: OscillatorSource::Sine.instance, 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, uni_stereo: 0.0)
       @source = source
 
       @volume = ModulationValue.create(volume)

data/lib/synthesizer/oscillator_source/base.rb

@@ -4,13 +4,15 @@ module Synthesizer
       def initialize
       end
 
-      def next(context, delta, l_gain, r_gain)
+      def next(context, rate, sym, sync, l_gain, r_gain)
+        soundinfo = context.soundinfo
         channels = context.channels
         window_size = context.window_size
         pos = context.pos
+        hz = rate.freq(soundinfo)
 
         dst = window_size.times.map {|i|
-          sample(context, pos.next(delta))
+          sample(context, pos.next(hz, sym, sync))
         }
         dst = Vdsp::DoubleArray.create(dst)
 
@@ -26,11 +28,39 @@ module Synthesizer
         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))
+      def generate_context(soundinfo, note_perform, init_phase)
+        Context.new(soundinfo, note_perform, init_phase)
       end
 
-      Context = Struct.new("Context", :window_size, :channels, :pos)
+      class Context
+        attr_reader :soundinfo
+        attr_reader :note_perform
+        attr_reader :init_phase
+        attr_reader :pos
+
+        def initialize(soundinfo, note_perform, init_phase)
+          @soundinfo = soundinfo
+          @note_perform = note_perform
+          @init_phase = init_phase
+          @pos = ShapePos.new(@soundinfo.samplerate, init_phase)
+        end
+
+        def window_size
+          @window_size ||= soundinfo.window_size
+        end
+
+        def channels
+          @channels ||= soundinfo.channels
+        end
+
+        def samplerate
+          @samplerate ||= soundinfo.samplerate
+        end
+
+        def framerate
+          @framerate ||= soundinfo.framerate
+        end
+      end
     end
   end
 end

data/lib/synthesizer/oscillator_source/formant_vocoder.rb

@@ -30,15 +30,25 @@ module Synthesizer
         @pronunciation = ModulationValue.create(pronunciation)
       end
 
-      def next(context, delta, l_gain, r_gain)
+      def next(context, rate, sym, sync, l_gain, r_gain)
+        soundinfo = context.soundinfo
         channels = context.channels
         window_size = context.window_size
         samplerate = context.samplerate
         tmpbufs = context.tmpbufs
         pronunciation_mod = context.pronunciation_mod
+        pulse_context = context.pulse_context
 
-        @pulse_context ||= @pulse.generate_context(context.soundinfo, context.note_perform, context.phase)
-        pulse = @pulse.next(@pulse_context, delta, 0.5, 0.5).streams[0]
+        pulse = Pulse.instance.next(pulse_context, rate, sym, sync, 0.5, 0.5).streams[0]
+
+        notediff = Math.log2(rate.freq(soundinfo) / 440.0) * 12 + 69 - 36
+        if notediff<0.0
+          notediff = 0.0
+        end
+        notediff = Math.sqrt(notediff)
+        vowels = @vowels.map {|vowel|
+          vowel.map{|f| f * (ShapePos::SEMITONE_RATIO ** notediff)}
+        }
 
         r_index = pronunciation_mod[]
         index = r_index.to_i
@@ -46,7 +56,7 @@ module Synthesizer
         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)
+          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(:+)
@@ -82,24 +92,21 @@ module Synthesizer
         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)
+      def generate_context(soundinfo, note_perform, init_phase)
+        Context.new(soundinfo, note_perform, init_phase, @pronunciation)
       end
 
-      FvContext = Struct.new("FvContext", :soundinfo, :note_perform, :phase, :tmpbufs, :pronunciation_mod) do
-        def window_size
-          soundinfo.window_size
-        end
+      class Context < Base::Context
+        attr_reader :pronunciation_mod
+        attr_reader :tmpbufs
+        attr_reader :pulse_context
 
-        def channels
-          soundinfo.channels
-        end
+        def initialize(soundinfo, note_perform, init_phase, pronunciation)
+          super(soundinfo, note_perform, init_phase)
 
-        def samplerate
-          soundinfo.samplerate
+          @pronunciation_mod = ModulationValue.balance_generator(note_perform, @pronunciation)
+          @tmpbufs = Array.new(5) {|i| Vdsp::DoubleArray.new(soundinfo.window_size+2)}
+          @pulse_context = Pulse.instance.generate_context(soundinfo, note_perform, init_phase)
         end
       end
     end

data/lib/synthesizer/oscillator_source/pulse.rb

@@ -13,11 +13,19 @@ module Synthesizer
         result
       end
 
-      def generate_context(soundinfo, note_perform, phase)
-        PulseContext.new(soundinfo.window_size, soundinfo.channels, phase, ShapePos.new(phase: phase), -1.0)
+      def generate_context(soundinfo, note_perform, init_phase)
+        Context.new(soundinfo, note_perform, init_phase)
       end
 
-      PulseContext = Struct.new("PulseContext", :window_size, :channels, :phase, :pos, :prev)
+      class Context < Base::Context
+        attr_accessor :prev
+
+        def initialize(soundinfo, note_perform, init_phase)
+          super(soundinfo, note_perform, init_phase)
+
+          @prev = -1.0
+        end
+      end
     end
   end
 end

data/lib/synthesizer/processor.rb

@@ -4,23 +4,26 @@ module Synthesizer
       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)
+      volume_mod = ModulationValue.amp_generator(note_perform, osc.volume, amp.volume)
+      pan_mod = ModulationValue.balance_generator(note_perform, osc.pan, amp.pan)
+      tune_semis_mod = ModulationValue.balance_generator(note_perform, osc.tune_semis, amp.tune_semis, synth.glide&.to_modval)
+      tune_cents_mod = ModulationValue.balance_generator(note_perform, osc.tune_cents, amp.tune_cents)
+
+      sym_mod = ModulationValue.balance_generator(note_perform, osc.sym)
+      sync_mod = ModulationValue.balance_generator(note_perform, osc.sync)
+
+      uni_num_mod = ModulationValue.balance_generator(note_perform, osc.uni_num, amp.uni_num, center: 1.0)
+      uni_detune_mod = ModulationValue.balance_generator(note_perform, osc.uni_detune, amp.uni_detune)
+      uni_stereo_mod = ModulationValue.balance_generator(note_perform, osc.uni_stereo, amp.uni_stereo)
 
-      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)
+        filter_mod = filter.generator(note_perform)
       end
 
       -> {
@@ -30,10 +33,14 @@ module Synthesizer
         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, volume, pan, tune_semis, tune_cents)
+        buf = unison.next(uni_num, uni_detune, uni_stereo, volume, pan, tune_semis, tune_cents, sym, sync)
 
         # Filter
         if filter_mod

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,41 @@ 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
+        @source.next(context, AudioStream::Rate.freq(hz), sym, sync, l_gain * volume, r_gain * volume)
+      else
+        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 * volume * uni_volume / uni_num, r_gain * volume * uni_volume / uni_num)
+        }.inject(:+)
+      end
     end
   end
 end

data/lib/synthesizer/version.rb

@@ -1,3 +1,3 @@
 module Synthesizer
-  VERSION = "3.1.0"
+  VERSION = "3.2.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.2.0"
+  spec.add_dependency "audio_stream", ">= 3.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synthesizer
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.1
 description: Synthesizer implemented in Ruby.
 email:
 - yoshida.eth0@gmail.com
@@ -91,6 +91,7 @@ files:
 - examples/poly.rb
 - examples/shapes.ipynb
 - examples/step_editor.rb
+- examples/sync.rb
 - lib/audio_stream/audio_input_metronome.rb
 - lib/audio_stream/audio_input_step_editor.rb
 - lib/audio_stream/audio_input_synth.rb