synthesizer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04ecefcdbf996dac3b8b38315ba0fa1c88ee9ce9a353ae13189c6f59d7ca764c
-  data.tar.gz: 5804b29acadece1016f420b85ee2c7fc43521e0cf14dc633240b09f2d80fa1f5
+  metadata.gz: ab192c339eebdc39d867ac206c82454c8b3509f92967e54f4aa4f4660b2e3cdf
+  data.tar.gz: 86fadad577d12289b652be8bfa4ac55f6a6bad136fa5dc9ce21eac4df3f536e6
 SHA512:
-  metadata.gz: bd465c0efba7fdf5608297fbd85214370328a801a97074d37670a19681a96045b68f7cbb18cb9af5d809a2a63f33d2219ef3c27319c517bba3c2a9c11c1102bd
-  data.tar.gz: ee9e14bde33fbf7eff84b2b9c88afa4ff45ae8e73b6c170ef1e03fd95d0dda4562abecd58811da9a6f0e7dcf2cacfecab344624a4b0d2d4a5ba231697c460caa
+  metadata.gz: ce723ad9a5fd4817ce33f362fb15cdce50132b066c0aff60b203d13e04ab4bef99f947f6e4d871d2a24ad0a66b98aa1b899e72b579d23dbad64245b848ffc94d
+  data.tar.gz: c42def904f7c6531d2f68d1000c5cd0a4cc2b54088f7af0c3414d3ffa59d1da8750eca6efd961b987953cde385266f187066ca71ba4f41c3bf2798fb0f1fcec3

data/examples/lpf.rb

@@ -0,0 +1,78 @@
+require 'synthesizer'
+require 'audio_stream/core_ext'
+
+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(
+      shape: Shape::WhiteNoise
+    ),
+  ],
+  filter: Filter::Serial.new(
+    Filter::LowPassFilter.new(
+      freq: ModulationValue.new(440.0)
+        .add(Modulation::Adsr.new(
+          attack: 3.0,
+          hold: 0.0,
+          decay: 0.0,
+          sustain: 0.0,
+          release: 1.0
+        ), depth: 3000.0),
+    ),
+    Filter::HighPassFilter.new(
+      freq: ModulationValue.new(400.0)
+        .add(Modulation::Adsr.new(
+          attack: 3.0,
+          hold: 0.0,
+          decay: 0.0,
+          sustain: 0.0,
+          release: 1.0
+        ), depth: 3000.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),
+    ),
+  quality: Quality::LOW,
+  soundinfo: soundinfo,
+)
+bufs = []
+
+synth.note_on(Note.new(60))
+bufs += 100.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
+  .stream
+  .send_to(stereo_out, gain: 0.25)
+
+
+conductor = Conductor.new(
+  input: [track1],
+  output: [stereo_out]
+)
+conductor.connect
+conductor.join

data/examples/mono.rb

@@ -2,6 +2,7 @@ require 'synthesizer'
 require 'audio_stream/core_ext'
 
 include AudioStream
+include Synthesizer
 
 soundinfo = SoundInfo.new(
   channels: 2,
@@ -10,31 +11,31 @@ soundinfo = SoundInfo.new(
   format: RubyAudio::FORMAT_WAV|RubyAudio::FORMAT_PCM_16
 )
 
-synth = Synthesizer::Mono.new(
+synth = MonoSynth.new(
   oscillators: [
-    Synthesizer::Oscillator.new(
-      shape: Synthesizer::Shape::SquareSawtooth,
-      uni_num: Synthesizer::ModulationValue.new(4),
-        #.add(Synthesizer::Modulation::Lfo.new(
+    Oscillator.new(
+      shape: Shape::SquareSawtooth,
+      uni_num: ModulationValue.new(4),
+        #.add(Modulation::Lfo.new(
         #)),
       uni_detune: 0.1,
     ),
-    #Synthesizer::Oscillator.new(
-    #  shape: Synthesizer::Shape::SquareSawtooth,
+    #Oscillator.new(
+    #  shape: Shape::SquareSawtooth,
     #  tune_cents: 0.1,
     #  uni_num: 4,
     #  uni_detune: 0.1,
     #),
-    #Synthesizer::Oscillator.new(
-    #  shape: Synthesizer::Shape::SquareSawtooth,
+    #Oscillator.new(
+    #  shape: Shape::SquareSawtooth,
     #  tune_semis: -12,
     #  uni_num: 4,
     #  uni_detune: 0.1,
     #),
   ],
-  amplifier: Synthesizer::Amplifier.new(
-    volume: Synthesizer::ModulationValue.new(1.0)
-      .add(Synthesizer::Modulation::Adsr.new(
+  amplifier: Amplifier.new(
+    volume: ModulationValue.new(1.0)
+      .add(Modulation::Adsr.new(
         attack: 0.05,
         hold: 0.1,
         decay: 0.4,
@@ -43,28 +44,28 @@ synth = Synthesizer::Mono.new(
       ), depth: 1.0),
     ),
   glide: 0.2,
-  quality: Synthesizer::Quality::LOW,
+  quality: Quality::LOW,
   soundinfo: soundinfo,
 )
 bufs = []
 
-synth.note_on(Synthesizer::Note.new(60))
+synth.note_on(Note.new(60))
 bufs += 50.times.map {|_| synth.next}
-synth.note_on(Synthesizer::Note.new(62))
+synth.note_on(Note.new(62))
 bufs += 50.times.map {|_| synth.next}
-synth.note_on(Synthesizer::Note.new(64))
+synth.note_on(Note.new(64))
 bufs += 50.times.map {|_| synth.next}
-synth.note_on(Synthesizer::Note.new(62))
+synth.note_on(Note.new(62))
 bufs += 50.times.map {|_| synth.next}
 
-synth.note_off(Synthesizer::Note.new(62))
+synth.note_off(Note.new(62))
 bufs += 50.times.map {|_| synth.next}
-synth.note_off(Synthesizer::Note.new(64))
+synth.note_off(Note.new(64))
 bufs += 50.times.map {|_| synth.next}
-synth.note_off(Synthesizer::Note.new(60))
-synth.note_on(Synthesizer::Note.new(65))
+synth.note_off(Note.new(60))
+synth.note_on(Note.new(65))
 bufs += 50.times.map {|_| synth.next}
-synth.note_off(Synthesizer::Note.new(65))
+synth.note_off(Note.new(65))
 bufs += 50.times.map {|_| synth.next}
 
 

data/examples/poly.rb

@@ -2,6 +2,7 @@ require 'synthesizer'
 require 'audio_stream/core_ext'
 
 include AudioStream
+include Synthesizer
 
 soundinfo = SoundInfo.new(
   channels: 2,
@@ -10,31 +11,31 @@ soundinfo = SoundInfo.new(
   format: RubyAudio::FORMAT_WAV|RubyAudio::FORMAT_PCM_16
 )
 
-synth = Synthesizer::Poly.new(
+synth = PolySynth.new(
   oscillators: [
-    Synthesizer::Oscillator.new(
-      shape: Synthesizer::Shape::SquareSawtooth,
-      uni_num: Synthesizer::ModulationValue.new(4)
-        .add(Synthesizer::Modulation::Lfo.new(
+    Oscillator.new(
+      shape: Shape::SquareSawtooth,
+      uni_num: ModulationValue.new(4)
+        .add(Modulation::Lfo.new(
         )),
       uni_detune: 0.1,
     ),
-    #Synthesizer::Oscillator.new(
-    #  shape: Synthesizer::Shape::SquareSawtooth,
+    #Oscillator.new(
+    #  shape: Shape::SquareSawtooth,
     #  tune_cents: 0.1,
     #  uni_num: 4,
     #  uni_detune: 0.1,
     #),
-    #Synthesizer::Oscillator.new(
-    #  shape: Synthesizer::Shape::SquareSawtooth,
+    #Oscillator.new(
+    #  shape: Shape::SquareSawtooth,
     #  tune_semis: -12,
     #  uni_num: 4,
     #  uni_detune: 0.1,
     #),
   ],
-  amplifier: Synthesizer::Amplifier.new(
-    volume: Synthesizer::ModulationValue.new(1.0)
-      .add(Synthesizer::Modulation::Adsr.new(
+  amplifier: Amplifier.new(
+    volume: ModulationValue.new(1.0)
+      .add(Modulation::Adsr.new(
         attack: 0.05,
         hold: 0.1,
         decay: 0.4,
@@ -42,23 +43,23 @@ synth = Synthesizer::Poly.new(
         release: 0.2
       ), depth: 1.0),
     ),
-  quality: Synthesizer::Quality::LOW,
+  quality: Quality::LOW,
   soundinfo: soundinfo,
 )
 bufs = []
 
-synth.note_on(Synthesizer::Note.new(60))
-synth.note_on(Synthesizer::Note.new(62))
-synth.note_on(Synthesizer::Note.new(64))
+synth.note_on(Note.new(60))
+synth.note_on(Note.new(62))
+synth.note_on(Note.new(64))
 bufs += 10.times.map {|_| synth.next}
 synth.pitch_bend = 1
 bufs += 10.times.map {|_| synth.next}
 synth.pitch_bend = 2
 bufs += 10.times.map {|_| synth.next}
 
-synth.note_off(Synthesizer::Note.new(60))
-synth.note_off(Synthesizer::Note.new(62))
-synth.note_off(Synthesizer::Note.new(64))
+synth.note_off(Note.new(60))
+synth.note_off(Note.new(62))
+synth.note_off(Note.new(64))
 bufs += 50.times.map {|_| synth.next}
 
 

data/lib/synthesizer.rb

@@ -4,9 +4,10 @@ require 'audio_stream'
 require 'audio_stream/audio_input_synth.rb'
 require 'audio_stream/audio_input_metronome.rb'
 
-require 'synthesizer/poly'
-require 'synthesizer/mono'
+require 'synthesizer/poly_synth'
+require 'synthesizer/mono_synth'
 require 'synthesizer/oscillator'
+require 'synthesizer/filter'
 require 'synthesizer/amplifier'
 require 'synthesizer/shape'
 require 'synthesizer/shape_pos'

data/lib/synthesizer/filter.rb

@@ -0,0 +1,14 @@
+require 'synthesizer/filter/low_pass_filter'
+require 'synthesizer/filter/high_pass_filter'
+require 'synthesizer/filter/band_pass_filter'
+require 'synthesizer/filter/low_shelf_filter'
+require 'synthesizer/filter/high_shelf_filter'
+require 'synthesizer/filter/peaking_filter'
+
+require 'synthesizer/filter/serial'
+require 'synthesizer/filter/parallel'
+
+module Synthesizer
+  module Filter
+  end
+end

data/lib/synthesizer/filter/band_pass_filter.rb

@@ -0,0 +1,25 @@
+module Synthesizer
+  module Filter
+    class BandPassFilter
+      def initialize(freq:, bandwidth:)
+        @freq = ModulationValue.create(freq)
+        @bandwidth = ModulationValue.create(bandwidth)
+      end
+
+      def generator(note_perform, framerate, &block)
+        Enumerator.new do |y|
+          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)
+
+          loop {
+            filter.update_coef(freq: freq_mod.next, bandwidth: bandwidth_mod.next)
+            y << filter
+          }
+        end.each(&block)
+      end
+    end
+  end
+end

data/lib/synthesizer/filter/high_pass_filter.rb

@@ -0,0 +1,25 @@
+module Synthesizer
+  module Filter
+    class HighPassFilter
+      def initialize(freq:, q: nil)
+        @freq = ModulationValue.create(freq)
+        @q = ModulationValue.create(q || 1.0 / Math.sqrt(2))
+      end
+
+      def generator(note_perform, framerate, &block)
+        Enumerator.new do |y|
+          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)
+
+          loop {
+            filter.update_coef(freq: freq_mod.next, q: q_mod.next)
+            y << filter
+          }
+        end.each(&block)
+      end
+    end
+  end
+end

data/lib/synthesizer/filter/high_shelf_filter.rb

@@ -0,0 +1,27 @@
+module Synthesizer
+  module Filter
+    class HighShelfFilter
+      def initialize(freq:, q: nil, gain:)
+        @freq = ModulationValue.create(freq)
+        @q = ModulationValue.create(q || 1.0 / Math.sqrt(2))
+        @gain = ModulationValue.create(gain)
+      end
+
+      def generator(note_perform, framerate, &block)
+        Enumerator.new do |y|
+          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)
+
+          loop {
+            filter.update_coef(freq: freq_mod.next, q: q_mod.next, gain: gain_mod.next)
+            y << filter
+          }
+        end.each(&block)
+      end
+    end
+  end
+end

data/lib/synthesizer/filter/low_pass_filter.rb

@@ -0,0 +1,25 @@
+module Synthesizer
+  module Filter
+    class LowPassFilter
+      def initialize(freq:, q: nil)
+        @freq = ModulationValue.create(freq)
+        @q = ModulationValue.create(q || 1.0 / Math.sqrt(2))
+      end
+
+      def generator(note_perform, framerate, &block)
+        Enumerator.new do |y|
+          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)
+
+          loop {
+            filter.update_coef(freq: freq_mod.next, q: q_mod.next)
+            y << filter
+          }
+        end.each(&block)
+      end
+    end
+  end
+end

data/lib/synthesizer/filter/low_shelf_filter.rb

@@ -0,0 +1,27 @@
+module Synthesizer
+  module Filter
+    class LowShelfFilter
+      def initialize(freq:, q: nil, gain:)
+        @freq = ModulationValue.create(freq)
+        @q = ModulationValue.create(q || 1.0 / Math.sqrt(2))
+        @gain = ModulationValue.create(gain)
+      end
+
+      def generator(note_perform, framerate, &block)
+        Enumerator.new do |y|
+          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)
+
+          loop {
+            filter.update_coef(freq: freq_mod.next, q: q_mod.next, gain: gain_mod.next)
+            y << filter
+          }
+        end.each(&block)
+      end
+    end
+  end
+end

data/lib/synthesizer/filter/parallel.rb

@@ -0,0 +1,57 @@
+module Synthesizer
+  module Filter
+    class Parallel
+      def initialize(*filters)
+        @filters = filters
+      end
+
+      def generator(note_perform, framerate, &block)
+        Enumerator.new do |y|
+          filter_mods = @filters.map {|filter|
+            filter.generator(note_perform, framerate)
+          }
+
+          loop {
+            fxs = filter_mods.map(&:next)
+            y << Fx.new(fxs)
+          }
+        end.each(&block)
+      end
+
+      class Fx
+        include AudioStream::Fx::BangProcess
+
+        def initialize(fxs)
+          @fxs = fxs
+        end
+
+        def process!(input)
+          window_size = input.size
+          channels = input.channels
+          fx_size = @fxs.size
+
+          outputs = @fxs.map {|fx|
+            fx.process(input)
+          }
+
+          case channels
+          when 1
+            input.size.times {|i|
+              input[i] = outputs.map{|buf| buf[i]}.sum / fx_size
+            }
+          when 2
+            input.size.times {|i|
+              samples = outputs.map{|buf| buf[i]}
+              input[i] = [
+                samples.map{|sval| sval[0]}.sum / fx_size,
+                samples.map{|sval| sval[1]}.sum / fx_size
+              ]
+            }
+          end
+
+          input
+        end
+      end
+    end
+  end
+end

data/lib/synthesizer/filter/peaking_filter.rb

@@ -0,0 +1,27 @@
+module Synthesizer
+  module Filter
+    class PeakingFilter
+      def initialize(freq:, bandwidth: 1.0, gain:)
+        @freq = ModulationValue.create(freq)
+        @bandwidth = ModulationValue.create(bandwidth)
+        @gain = ModulationValue.create(gain)
+      end
+
+      def generator(note_perform, framerate, &block)
+        Enumerator.new do |y|
+          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)
+
+          loop {
+            filter.update_coef(freq: freq_mod.next, bandwidth: bandwidth_mod.next, gain: gain_mod.next)
+            y << filter
+          }
+        end.each(&block)
+      end
+    end
+  end
+end

data/lib/synthesizer/filter/serial.rb

@@ -0,0 +1,37 @@
+module Synthesizer
+  module Filter
+    class Serial
+      def initialize(*filters)
+        @filters = filters
+      end
+
+      def generator(note_perform, framerate, &block)
+        Enumerator.new do |y|
+          filter_mods = @filters.map {|filter|
+            filter.generator(note_perform, framerate)
+          }
+
+          loop {
+            fxs = filter_mods.map(&:next)
+            y << Fx.new(fxs)
+          }
+        end.each(&block)
+      end
+
+      class Fx
+        include AudioStream::Fx::BangProcess
+
+        def initialize(fxs)
+          @fxs = fxs
+        end
+
+        def process!(input)
+          @fxs.each {|fx|
+            fx.process!(input)
+          }
+          input
+        end
+      end
+    end
+  end
+end

data/lib/synthesizer/modulation/adsr.rb

@@ -21,10 +21,10 @@ module Synthesizer
         @release_curve = release_curve
       end
 
-      def note_on_envelope(samplerate, sustain: false, &block)
+      def note_on_envelope(framerate, sustain: false, &block)
         Enumerator.new do |yld|
           # attack
-          rate = @attack * samplerate
+          rate = @attack * framerate
           rate.to_i.times {|i|
             x = i.to_f / rate
             y = @attack_curve[x]
@@ -32,13 +32,13 @@ module Synthesizer
           }
 
           # hold
-          rate = @hold * samplerate
+          rate = @hold * framerate
           rate.to_i.times {|i|
             yld << 1.0
           }
 
           # decay
-          rate = @decay * samplerate
+          rate = @decay * framerate
           rate.to_i.times {|i|
             x = i.to_f / rate
             y = 1.0 - @sustain_curve[x]  * (1.0 - @sustain)
@@ -54,10 +54,10 @@ module Synthesizer
         end.each(&block)
       end
 
-      def note_off_envelope(samplerate, sustain: false, &block)
+      def note_off_envelope(framerate, sustain: false, &block)
         Enumerator.new do |yld|
           # release
-          rate = @release * samplerate
+          rate = @release * framerate
           rate.to_i.times {|i|
             x = i.to_f / rate
             y = 1.0 - @release_curve[x]
@@ -73,10 +73,10 @@ module Synthesizer
         end.each(&block)
       end
 
-      def generator(note_perform, samplerate, release_sustain:, &block)
+      def generator(note_perform, framerate, release_sustain:, &block)
         Enumerator.new do |y|
-          note_on = note_on_envelope(samplerate, sustain: true)
-          note_off = note_off_envelope(samplerate, sustain: release_sustain)
+          note_on = note_on_envelope(framerate, sustain: true)
+          note_off = note_off_envelope(framerate, sustain: release_sustain)
           last = 0.0
 
           loop {
@@ -91,23 +91,23 @@ module Synthesizer
       end
 
 
-      def amp_generator(note_perform, samplerate, depth, &block)
+      def amp_generator(note_perform, framerate, depth, &block)
         bottom = 1.0 - depth
 
-        generator(note_perform, samplerate, release_sustain: 0.0<bottom).lazy.map {|val|
+        generator(note_perform, framerate, release_sustain: 0.0<bottom).lazy.map {|val|
           val * depth + bottom
         }.each(&block)
       end
 
-      def balance_generator(note_perform, samplerate, depth, &block)
-        generator(note_perform, samplerate).lazy.map {|val|
+      def balance_generator(note_perform, framerate, depth, &block)
+        generator(note_perform, framerate, release_sustain: true).lazy.map {|val|
           val * depth
         }.each(&block)
       end
 
-      def plot_data(samplerate: 44100)
-        note_on = note_on_envelope(samplerate, sustain: false)
-        note_off = note_off_envelope(samplerate, sustain: false)
+      def plot_data(framerate: 44100)
+        note_on = note_on_envelope(framerate, sustain: false)
+        note_off = note_off_envelope(framerate, sustain: false)
         last = 0.0
 
         xs = []
@@ -127,8 +127,8 @@ module Synthesizer
         {x: xs, y: ys}
       end
 
-      def plot(samplerate: 44100)
-        data = plot_data(samplerate: samplerate)
+      def plot(framerate: 44100)
+        data = plot_data(framerate: framerate)
         Plotly::Plot.new(data: [data])
       end
     end

data/lib/synthesizer/modulation/lfo.rb

@@ -17,20 +17,20 @@ module Synthesizer
         @rate = rate
       end
 
-      def generator(note_perform, samplerate, &block)
+      def generator(note_perform, framerate, &block)
         Enumerator.new do |yld|
-          delta = @rate / samplerate
+          delta = @rate / framerate
 
           pos = ShapePos.new(phase: @phase)
 
           # delay
-          rate = @delay * samplerate
+          rate = @delay * framerate
           rate.to_i.times {|i|
             yld << 0.0
           }
 
           # attack
-          rate = @attack * samplerate
+          rate = @attack * framerate
           rate.to_i.times {|i|
             x = i.to_f / rate
             y = @attack_curve[x]
@@ -45,17 +45,17 @@ module Synthesizer
         end.each(&block)
       end
 
-      def amp_generator(note_perform, samplerate, depth, &block)
+      def amp_generator(note_perform, framerate, depth, &block)
         bottom = 1.0 - depth
 
-        generator(note_perform, samplerate).lazy.map {|val|
+        generator(note_perform, framerate).lazy.map {|val|
           val = (val + 1) / 2
           val * depth + bottom
         }.each(&block)
       end
 
-      def balance_generator(note_perform, samplerate, depth, &block)
-        generator(note_perform, samplerate).lazy.map {|val|
+      def balance_generator(note_perform, framerate, depth, &block)
+        generator(note_perform, framerate).lazy.map {|val|
           val * depth
         }.each(&block)
       end

data/lib/synthesizer/modulation_value.rb

@@ -14,14 +14,14 @@ module Synthesizer
     end
 
     # @param mod [Synthesizer::Modulation]
-    # @param depth [Float] (-1.0~1.0)
+    # @param depth [Float] depth. volume => percent(-1.0~1.0, default=1.0), filter freq => relative value(hz), other => relative value
     def add(mod, depth: 1.0)
       depth ||= 1.0
-      if depth<-1.0
-        depth = -1.0
-      elsif 1.0<depth
-        depth = 1.0
-      end
+      #if depth<-1.0
+      #  depth = -1.0
+      #elsif 1.0<depth
+      #  depth = 1.0
+      #end
 
       @mods << [mod, depth]
       self
@@ -35,7 +35,7 @@ module Synthesizer
       end
     end
 
-    def self.amp_generator(note_perform, samplerate, *modvals)
+    def self.amp_generator(note_perform, framerate, *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, samplerate, depth)
+          mods << mod.amp_generator(note_perform, framerate, depth)
         }
       }
 
@@ -57,7 +57,7 @@ module Synthesizer
       end
     end
 
-    def self.balance_generator(note_perform, samplerate, *modvals, center: 0)
+    def self.balance_generator(note_perform, framerate, *modvals, center: 0)
       modvals = modvals.flatten.compact
 
       # value
@@ -68,7 +68,7 @@ module Synthesizer
       mods = []
       modvals.each {|modval|
         modval.mods.each {|mod, depth|
-          mods << mod.balance_generator(note_perform, samplerate, depth)
+          mods << mod.balance_generator(note_perform, framerate, depth)
         }
       }
 

data/lib/synthesizer/{mono.rb → mono_synth.rb}

@@ -1,7 +1,8 @@
 module Synthesizer
-  class Mono
+  class MonoSynth
 
     attr_reader :oscillators
+    attr_reader :filter
     attr_reader :amplifier
     attr_reader :processor
 
@@ -14,8 +15,9 @@ module Synthesizer
     # @param oscillators [Synthesizer::Oscillator] oscillator
     # @param amplifier [Synthesizer::Amplifier] amplifier
     # @param soundinfo [AudioStream::SoundInfo]
-    def initialize(oscillators:, amplifier:, glide: 0.1, quality: Quality::LOW, soundinfo:)
+    def initialize(oscillators:, filter: nil, amplifier:, glide: 0.1, quality: Quality::LOW, soundinfo:)
       @oscillators = [oscillators].flatten.compact
+      @filter = filter
       @amplifier = amplifier
 
       @quality = quality

data/lib/synthesizer/{poly.rb → poly_synth.rb}

@@ -1,7 +1,8 @@
 module Synthesizer
-  class Poly
+  class PolySynth
 
     attr_reader :oscillators
+    attr_reader :filter
     attr_reader :amplifier
     attr_reader :processor
 
@@ -12,10 +13,12 @@ module Synthesizer
     attr_accessor :pitch_bend
 
     # @param oscillators [Synthesizer::Oscillator] Oscillator
+    # @param filter [Synthesizer::Filter] filter
     # @param amplifier [Synthesizer::Amplifier] amplifier
     # @param soundinfo [AudioStream::SoundInfo]
-    def initialize(oscillators:, amplifier:, quality: Quality::LOW, soundinfo:)
+    def initialize(oscillators:, filter: nil, amplifier:, quality: Quality::LOW, soundinfo:)
       @oscillators = [oscillators].flatten.compact
+      @filter = filter
       @amplifier = amplifier
 
       @quality = quality

data/lib/synthesizer/processor/high.rb

@@ -4,26 +4,35 @@ module Synthesizer
       def generator(osc, note_perform, &block)
         Enumerator.new do |y|
           synth = note_perform.synth
+          filter = synth.filter
           amp = synth.amplifier
           channels = synth.soundinfo.channels
           window_size = synth.soundinfo.window_size
-          samplerate = synth.soundinfo.samplerate
+          framerate = synth.soundinfo.samplerate
 
-          volume_mod = ModulationValue.amp_generator(note_perform, samplerate, osc.volume, amp.volume)
-          pan_mod = ModulationValue.balance_generator(note_perform, samplerate, osc.pan, amp.pan)
-          tune_semis_mod = ModulationValue.balance_generator(note_perform, samplerate, osc.tune_semis, amp.tune_semis, synth.glide&.to_modval)
-          tune_cents_mod = ModulationValue.balance_generator(note_perform, samplerate, osc.tune_cents, amp.tune_cents)
+          # 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, samplerate, osc.uni_num, amp.uni_num, center: 1.0)
-          uni_detune_mod = ModulationValue.balance_generator(note_perform, samplerate, osc.uni_detune, amp.uni_detune)
+          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
             loop {
               buf = AudioStream::Buffer.float(window_size, channels)
 
               window_size.times.each {|i|
+                # Oscillator, Amplifier
                 volume = volume_mod.next
                 tune_semis = tune_semis_mod.next + synth.pitch_bend
                 tune_cents = tune_cents_mod.next
@@ -31,8 +40,16 @@ module Synthesizer
                 uni_num = uni_num_mod.next
                 uni_detune = uni_detune_mod.next
 
-                val = unison.next(uni_num, uni_detune, volume, 0.0, tune_semis, tune_cents)
-                buf[i] = (val[0] + val[1]) / 2.0
+                sval = unison.next(uni_num, uni_detune, volume, 0.0, tune_semis, tune_cents)
+                mval = (sval[0] + sval[1]) / 2.0
+
+                # Filter
+                if filter_mod
+                  filter_fx = filter_mod.next
+                  mval = filter_fx.process_mono(mval)
+                end
+
+                buf[i] = mval
               }
 
               y << buf
@@ -42,6 +59,7 @@ module Synthesizer
               buf = AudioStream::Buffer.float(window_size, channels)
 
               window_size.times.each {|i|
+                # Oscillator, Amplifier
                 volume = volume_mod.next
                 pan = pan_mod.next
                 tune_semis = tune_semis_mod.next + synth.pitch_bend
@@ -50,7 +68,15 @@ module Synthesizer
                 uni_num = uni_num_mod.next
                 uni_detune = uni_detune_mod.next
 
-                buf[i] = unison.next(uni_num, uni_detune, volume, pan, tune_semis, tune_cents)
+                sval = unison.next(uni_num, uni_detune, volume, pan, tune_semis, tune_cents)
+
+                # Filter
+                if filter_mod
+                  filter_fx = filter_mod.next
+                  sval = filter_fx.process_stereo(sval)
+                end
+
+                buf[i] = sval
               }
 
               y << buf

data/lib/synthesizer/processor/low.rb

@@ -4,25 +4,34 @@ module Synthesizer
       def generator(osc, note_perform, &block)
         Enumerator.new do |y|
           synth = note_perform.synth
+          filter = synth.filter
           amp = synth.amplifier
           channels = synth.soundinfo.channels
           window_size = synth.soundinfo.window_size
-          samplerate = synth.soundinfo.samplerate.to_f / window_size
+          framerate = synth.soundinfo.samplerate.to_f / window_size
 
-          volume_mod = ModulationValue.amp_generator(note_perform, samplerate, osc.volume, amp.volume)
-          pan_mod = ModulationValue.balance_generator(note_perform, samplerate, osc.pan, amp.pan)
-          tune_semis_mod = ModulationValue.balance_generator(note_perform, samplerate, osc.tune_semis, amp.tune_semis, synth.glide&.to_modval)
-          tune_cents_mod = ModulationValue.balance_generator(note_perform, samplerate, osc.tune_cents, amp.tune_cents)
+          # 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, samplerate, osc.uni_num, amp.uni_num, center: 1.0)
-          uni_detune_mod = ModulationValue.balance_generator(note_perform, samplerate, osc.uni_detune, amp.uni_detune)
+          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
             loop {
               buf = AudioStream::Buffer.float(window_size, channels)
 
+              # Oscillator, Amplifier
               volume = volume_mod.next
               tune_semis = tune_semis_mod.next + synth.pitch_bend
               tune_cents = tune_cents_mod.next
@@ -35,12 +44,19 @@ module Synthesizer
                 buf[i] = (val[0] + val[1]) / 2.0
               }
 
+              # Filter
+              if filter_mod
+                filter_fx = filter_mod.next
+                filter_fx.process!(buf)
+              end
+
               y << buf
             }
           when 2
             loop {
               buf = AudioStream::Buffer.float(window_size, channels)
 
+              # Oscillator, Amplifier
               volume = volume_mod.next
               pan = pan_mod.next
               tune_semis = tune_semis_mod.next + synth.pitch_bend
@@ -53,6 +69,12 @@ module Synthesizer
                 buf[i] = unison.next(uni_num, uni_detune, volume, pan, tune_semis, tune_cents)
               }
 
+              # Filter
+              if filter_mod
+                filter_fx = filter_mod.next
+                filter_fx.process!(buf)
+              end
+
               y << buf
             }
           end

data/lib/synthesizer/shape.rb

@@ -5,7 +5,7 @@ module Synthesizer
     Sawtooth = ->(phase) { ((phase + 0.5) % 1) * 2 - 1 }
     Square = ->(phase) { 0.5<=((phase + 0.5) % 1) ? 1.0 : -1.0 }
     Triangle = ->(phase) {
-      t = ((phase*4).floor % 4);
+      t = ((phase*4).floor % 4)
       t==0 ? (phase % 0.5)*4 :
       t==1 ? (2-(phase % 0.5)*4) :
       t==2 ? (-(phase % 0.5)*4) : (phase % 0.5)*4-2

data/lib/synthesizer/version.rb

@@ -1,3 +1,3 @@
 module Synthesizer
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/synthesizer.gemspec

@@ -30,10 +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", ">= 1.0"
-  spec.add_dependency "ruby-audio", ">= 1.6.1"
-  spec.add_dependency "coreaudio", ">= 0.0.12" 
-  spec.add_dependency "ruby-fftw3", ">= 1.0.2"
-  spec.add_dependency "rx", ">= 0.0.3"
-  spec.add_dependency "rbplotly", ">= 0.1.2"
+  spec.add_dependency "audio_stream", ">= 1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synthesizer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,84 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-audio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: coreaudio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.12
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.12
-- !ruby/object:Gem::Dependency
-  name: ruby-fftw3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: rx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-- !ruby/object:Gem::Dependency
-  name: rbplotly
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 1.2.1
 description: Synthesizer implemented in Ruby.
 email:
 - yoshida.eth0@gmail.com
@@ -153,6 +83,7 @@ files:
 - bin/setup
 - examples/adsr.ipynb
 - examples/curves.ipynb
+- examples/lpf.rb
 - examples/metronome.rb
 - examples/mono.rb
 - examples/poly.rb
@@ -161,17 +92,26 @@ files:
 - lib/audio_stream/audio_input_synth.rb
 - lib/synthesizer.rb
 - lib/synthesizer/amplifier.rb
+- lib/synthesizer/filter.rb
+- lib/synthesizer/filter/band_pass_filter.rb
+- lib/synthesizer/filter/high_pass_filter.rb
+- lib/synthesizer/filter/high_shelf_filter.rb
+- lib/synthesizer/filter/low_pass_filter.rb
+- lib/synthesizer/filter/low_shelf_filter.rb
+- lib/synthesizer/filter/parallel.rb
+- lib/synthesizer/filter/peaking_filter.rb
+- lib/synthesizer/filter/serial.rb
 - lib/synthesizer/modulation.rb
 - lib/synthesizer/modulation/adsr.rb
 - lib/synthesizer/modulation/curve.rb
 - lib/synthesizer/modulation/glide.rb
 - lib/synthesizer/modulation/lfo.rb
 - lib/synthesizer/modulation_value.rb
-- lib/synthesizer/mono.rb
+- lib/synthesizer/mono_synth.rb
 - lib/synthesizer/note.rb
 - lib/synthesizer/note_perform.rb
 - lib/synthesizer/oscillator.rb
-- lib/synthesizer/poly.rb
+- lib/synthesizer/poly_synth.rb
 - lib/synthesizer/processor.rb
 - lib/synthesizer/processor/high.rb
 - lib/synthesizer/processor/low.rb