synthesizer 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d7146a5b2c57f02ce56e5fb831403b9b7a54595209e49128eda52632088248
-  data.tar.gz: d4377976ce5f4cb871ca955346904bc23a59665e24a2ae0d29238bcd33654531
+  metadata.gz: 0abef47757011239dac5fe3bf5b746504491ba44eca05ce22fc6564fe00e390b
+  data.tar.gz: f34263d9c956a57a096987824371ea1baf69f0a4cbc87fc40059101b07ce436c
 SHA512:
-  metadata.gz: '036904dc01a816f8229173105ab88ca289078ddba804b647abb54e943b1e3859a196c2b250e078c6efea5a274f446b2b565a28985abe68f431ef25be20b6fc9a'
-  data.tar.gz: 5387eea5b5b5b2f4326b34598927ceb0be87229eb9b1c74100d254b827d68154339594a43f50cc0b28d7781833efff023a6977d8865faf774215fc485c9aca68
+  metadata.gz: 60974d1c179a679d67cd5c044378f64b31b000a83baf2c989937969165fd7d317b3ef2f8747734a75fad24d40fb1cd1de02137dd1f1ffff5e6b758968e5e9626
+  data.tar.gz: 97c4177887836a7a0d48165e6b6181eefe9e7993b53dd451f176e427620b42f8aed431d3b24e7fe33399a5e15c1e8479426054f21355001f5cd64898e5100896

data/lib/audio_stream/audio_input_synth.rb

@@ -6,10 +6,21 @@ module AudioStream
       super()
 
       @synth = synth
-
       @soundinfo = soundinfo
     end
 
+    def connect
+      self
+    end
+
+    def disconnect
+      self
+    end
+
+    def connected?
+      true
+    end
+
     def each(&block)
       Enumerator.new do |y|
         loop {

data/lib/synthesizer/filter.rb

@@ -10,5 +10,6 @@ require 'synthesizer/filter/parallel'
 
 module Synthesizer
   module Filter
+    DEFAULT_Q = AudioStream::Fx::BiquadFilter::DEFAULT_Q
   end
 end

data/lib/synthesizer/filter/band_pass_filter.rb

@@ -1,7 +1,7 @@
 module Synthesizer
   module Filter
     class BandPassFilter
-      def initialize(freq:, bandwidth:)
+      def initialize(freq:, bandwidth: 1.0)
         @freq = ModulationValue.create(freq)
         @bandwidth = ModulationValue.create(bandwidth)
       end

data/lib/synthesizer/filter/high_pass_filter.rb

@@ -1,9 +1,9 @@
 module Synthesizer
   module Filter
     class HighPassFilter
-      def initialize(freq:, q: nil)
+      def initialize(freq:, q: DEFAULT_Q)
         @freq = ModulationValue.create(freq)
-        @q = ModulationValue.create(q || 1.0 / Math.sqrt(2))
+        @q = ModulationValue.create(q)
       end
 
       def generator(note_perform, framerate, &block)

data/lib/synthesizer/filter/high_shelf_filter.rb

@@ -1,9 +1,9 @@
 module Synthesizer
   module Filter
     class HighShelfFilter
-      def initialize(freq:, q: nil, gain:)
+      def initialize(freq:, q: DEFAULT_Q, gain: 1.0)
         @freq = ModulationValue.create(freq)
-        @q = ModulationValue.create(q || 1.0 / Math.sqrt(2))
+        @q = ModulationValue.create(q)
         @gain = ModulationValue.create(gain)
       end
 

data/lib/synthesizer/filter/low_pass_filter.rb

@@ -1,9 +1,9 @@
 module Synthesizer
   module Filter
     class LowPassFilter
-      def initialize(freq:, q: nil)
+      def initialize(freq:, q: DEFAULT_Q)
         @freq = ModulationValue.create(freq)
-        @q = ModulationValue.create(q || 1.0 / Math.sqrt(2))
+        @q = ModulationValue.create(q)
       end
 
       def generator(note_perform, framerate, &block)

data/lib/synthesizer/filter/low_shelf_filter.rb

@@ -1,9 +1,9 @@
 module Synthesizer
   module Filter
     class LowShelfFilter
-      def initialize(freq:, q: nil, gain:)
+      def initialize(freq:, q: DEFAULT_Q, gain: 1.0)
         @freq = ModulationValue.create(freq)
-        @q = ModulationValue.create(q || 1.0 / Math.sqrt(2))
+        @q = ModulationValue.create(q)
         @gain = ModulationValue.create(gain)
       end
 

data/lib/synthesizer/filter/parallel.rb

@@ -19,37 +19,15 @@ module Synthesizer
       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
-
+        def process(input)
           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
+          AudioStream::Buffer.merge(outputs, average: true)
         end
       end
     end

data/lib/synthesizer/filter/peaking_filter.rb

@@ -1,7 +1,7 @@
 module Synthesizer
   module Filter
     class PeakingFilter
-      def initialize(freq:, bandwidth: 1.0, gain:)
+      def initialize(freq:, bandwidth: 1.0, gain: 40.0)
         @freq = ModulationValue.create(freq)
         @bandwidth = ModulationValue.create(bandwidth)
         @gain = ModulationValue.create(gain)

data/lib/synthesizer/filter/serial.rb

@@ -19,15 +19,13 @@ module Synthesizer
       end
 
       class Fx
-        include AudioStream::Fx::BangProcess
-
         def initialize(fxs)
           @fxs = fxs
         end
 
-        def process!(input)
+        def process(input)
           @fxs.each {|fx|
-            fx.process!(input)
+            input = fx.process(input)
           }
           input
         end

data/lib/synthesizer/mono_synth.rb

@@ -40,7 +40,7 @@ module Synthesizer
           @perform = nil
         end
       end
-      buf || AudioStream::Buffer.float(@soundinfo.window_size, @soundinfo.channels)
+      buf || AudioStream::Buffer.create(@soundinfo.window_size, @soundinfo.channels)
     end
 
     # @param note [Synthesizer::Note]

data/lib/synthesizer/poly_synth.rb

@@ -37,9 +37,11 @@ module Synthesizer
         # delete released note performs
         @performs.delete_if {|note_num, perform| perform.released? }
 
-        buf = bufs.inject(:+)
+        if 0<bufs.length
+          buf = AudioStream::Buffer.merge(bufs)
+        end
       end
-      buf || AudioStream::Buffer.float(@soundinfo.window_size, @soundinfo.channels)
+      buf || AudioStream::Buffer.create(@soundinfo.window_size, @soundinfo.channels)
     end
 
     # @param note [Synthesizer::Note]

data/lib/synthesizer/processor/high.rb

@@ -29,7 +29,8 @@ module Synthesizer
           case channels
           when 1
             loop {
-              buf = AudioStream::Buffer.float(window_size, channels)
+              buf = AudioStream::Buffer.create_mono(window_size)
+              dst0 = buf.streams[0]
 
               window_size.times.each {|i|
                 # Oscillator, Amplifier
@@ -49,14 +50,16 @@ module Synthesizer
                   mval = filter_fx.process_mono(mval)
                 end
 
-                buf[i] = mval
+                dst0[i] = mval
               }
 
               y << buf
             }
           when 2
             loop {
-              buf = AudioStream::Buffer.float(window_size, channels)
+              buf = AudioStream::Buffer.create_stereo(window_size)
+              dst0 = buf.streams[0]
+              dst1 = buf.streams[1]
 
               window_size.times.each {|i|
                 # Oscillator, Amplifier
@@ -76,7 +79,8 @@ module Synthesizer
                   sval = filter_fx.process_stereo(sval)
                 end
 
-                buf[i] = sval
+                dst0[i] = sval[0]
+                dst1[i] = sval[1]
               }
 
               y << buf

data/lib/synthesizer/processor/low.rb

@@ -29,7 +29,8 @@ module Synthesizer
           case channels
           when 1
             loop {
-              buf = AudioStream::Buffer.float(window_size, channels)
+              buf = AudioStream::Buffer.create_mono(window_size)
+              dst0 = buf.streams[0]
 
               # Oscillator, Amplifier
               volume = volume_mod.next * note_perform.velocity
@@ -41,20 +42,22 @@ module Synthesizer
 
               window_size.times.each {|i|
                 val = unison.next(uni_num, uni_detune, volume, 0.0, tune_semis, tune_cents)
-                buf[i] = (val[0] + val[1]) / 2.0
+                dst0[i] = (val[0] + val[1]) / 2.0
               }
 
               # Filter
               if filter_mod
                 filter_fx = filter_mod.next
-                filter_fx.process!(buf)
+                buf = filter_fx.process(buf)
               end
 
               y << buf
             }
           when 2
             loop {
-              buf = AudioStream::Buffer.float(window_size, channels)
+              buf = AudioStream::Buffer.create_stereo(window_size)
+              dst0 = buf.streams[0]
+              dst1 = buf.streams[1]
 
               # Oscillator, Amplifier
               volume = volume_mod.next * note_perform.velocity
@@ -66,13 +69,15 @@ module Synthesizer
               uni_detune = uni_detune_mod.next
 
               window_size.times.each {|i|
-                buf[i] = unison.next(uni_num, uni_detune, volume, pan, tune_semis, tune_cents)
+                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.next
-                filter_fx.process!(buf)
+                buf = filter_fx.process(buf)
               end
 
               y << buf

data/lib/synthesizer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synthesizer
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-27 00:00:00.000000000 Z
+date: 2019-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
 description: Synthesizer implemented in Ruby.
 email:
 - yoshida.eth0@gmail.com