audio_stream 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00808bca83da43c81bd03e94f420f7ecce53b9211450c76a09d6d1856edf8be2'
-  data.tar.gz: 64d161eedf393c991fe2692aa7328afceed56e926fed3101f92dbc862b820446
+  metadata.gz: e44fc50ce5993f26948cf0429df83eb1dac15556dbc89f7db605fa398a79f928
+  data.tar.gz: 8a4f2bcb04ca5d26b2574ac0b960211769d9d8f1f3474dcfb9823780ec0c90d7
 SHA512:
-  metadata.gz: 4665c0f70102e40057ec0f799f21a8d422bd9ce395f74b7075f22cad0d7024ed8701e682cf644df55822055cf6720dacbb499de0766958dfa17bc46d6d0039b3
-  data.tar.gz: 0be2c27573b1918ac6a01ffaa0b678c44338630415c28a3b13c06b432888c8b467f9443ad26b1e326aab9b4d2277eecb5268b8d541189f5827c35109443a93c9
+  metadata.gz: e3e1ac2bde745775aa261b02fa130f98720e3c549ed67d0ff1237e7ca5815a74fb3608f87fb020a03ea8af933bd0c3c78488b5d879310e8cd9d0df845b8fc8d3
+  data.tar.gz: 79502696e497e3307f35867cbcc8f585a977530b7f2bf1c2223aed6e84323467ee11e9a9e5cdbe4af7e40cbe77aa3a40a3eccfce1fd20cdb8365145389be5703

data/audio_stream.gemspec

@@ -33,6 +33,5 @@ Gem::Specification.new do |spec|
   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"
 end

data/examples/buffer.ipynb

@@ -51,7 +51,7 @@
    ],
    "source": [
     "$LOAD_PATH << File.dirname(__FILE__) + \"/../lib\"\n",
-    "require 'audio_stream/core_ext'\n",
+    "require 'audio_stream'\n",
     "\n",
     "include AudioStream\n",
     "include AudioStream::Fx\n",
@@ -118,7 +118,7 @@
    ],
    "source": [
     "$LOAD_PATH << File.dirname(__FILE__) + \"/../lib\"\n",
-    "require 'audio_stream/core_ext'\n",
+    "require 'audio_stream'\n",
     "\n",
     "include AudioStream\n",
     "include AudioStream::Fx\n",

data/examples/chorus.rb

@@ -22,8 +22,7 @@ stereo_out = AudioOutput.device(soundinfo: $soundinfo)
 # Mixer
 
 track1
-  .stream
-  .fx(MonoToStereo.new)
+  .fx(MonoToStereo.instance)
   .fx(chorus)
   .send_to(bus1, gain: 1.0, pan: 0.0)
 

data/examples/distortion.rb

@@ -23,7 +23,6 @@ stereo_out = AudioOutput.device(soundinfo: $soundinfo)
 # Mixer
 
 track1
-  .stream
   .fx(noise_gate)
   .fx(compressor)
   .fx(distortion)

data/examples/example_options.rb

@@ -1,4 +1,4 @@
-require 'audio_stream/core_ext'
+require 'audio_stream'
 require 'optparse'
 
 include AudioStream
@@ -6,7 +6,7 @@ include AudioStream::Fx
 
 
 $soundinfo = SoundInfo.new(
-  channels: 1,
+  channels: 2,
   samplerate: 44100,
   window_size: 1024,
   format: RubyAudio::FORMAT_WAV|RubyAudio::FORMAT_PCM_16

data/examples/lpf.rb

@@ -24,8 +24,7 @@ stereo_out = AudioOutput.device(soundinfo: $soundinfo)
 # Mixer
 
 track1
-  .stream
-  .fx(StereoToMono.new)
+  .fx(StereoToMono.instance)
   .fx(lpf)
   .send_to(stereo_out)
 

data/examples/rec.rb

@@ -1,4 +1,4 @@
-require 'audio_stream/core_ext'
+require 'audio_stream'
 
 include AudioStream
 include AudioStream::Fx
@@ -6,7 +6,7 @@ include AudioStream::Fx
 soundinfo = SoundInfo.new(
   channels: 2,
   samplerate: 44100,
-  window_size: 1024
+  window_size: 1024,
   format: RubyAudio::FORMAT_WAV|RubyAudio::FORMAT_PCM_16
 )
 
@@ -31,7 +31,6 @@ stereo_out = AudioOutput.device(soundinfo: soundinfo)
 # Mixer
 
 track1
-  .stream
   .send_to(file_out)
   .send_to(bus1)
 
@@ -39,7 +38,6 @@ bus1
   .send_to(stereo_out, gain: 0.5)
 
 track2
-  .stream
   .send_to(stereo_out)
 
 

data/examples/tuner.rb

@@ -1,4 +1,4 @@
-require 'audio_stream/core_ext'
+require 'audio_stream'
 
 include AudioStream
 include AudioStream::Fx

data/lib/audio_stream.rb

@@ -1,8 +1,8 @@
 require 'ruby-audio'
 require 'coreaudio'
 require 'numru/fftw3'
-require 'rx'
 require 'rbplotly'
+require 'singleton'
 
 require 'audio_stream/version'
 require 'audio_stream/error'
@@ -11,6 +11,10 @@ require 'audio_stream/buffer'
 require 'audio_stream/ring_buffer'
 require 'audio_stream/sync'
 require 'audio_stream/conductor'
+require 'audio_stream/audio_observer'
+require 'audio_stream/audio_observable'
+require 'audio_stream/audio_observable_fx'
+require 'audio_stream/audio_notification'
 require 'audio_stream/audio_input'
 require 'audio_stream/audio_input_file'
 require 'audio_stream/audio_input_device'

data/lib/audio_stream/audio_bus.rb

@@ -1,28 +1,68 @@
 module AudioStream
-  class AudioBus < Rx::Subject
+  class AudioBus
+    include AudioObserver
+    include AudioObservable
+
     def initialize
-      super
-      @observables = []
-      @zip_observable = nil
-      @detach = nil
+      @mutex = Mutex.new
+      @callers = Set[]
+      @notifications = {}
     end
 
     def add(observable, gain:, pan:)
       if gain && gain!=1.0
-        observable = observable.map(&Fx::AGain.new(level: gain).method(:process))
+        observable = observable.fx(Fx::AGain.new(level: gain))
       end
 
       if pan && pan!=0.0
-        observable = observable.map(&Fx::Panning.new(pan: pan).method(:process))
+        observable = observable.fx(Fx::Panning.new(pan: pan))
       end
 
-      @observables << observable
-      if @detach
-        @detach.unsubscribe
+      @mutex.synchronize {
+        @callers << observable
+        observable.add_observer(self)
+      }
+    end
+
+    def update(notification)
+      do_notify = false
+      next_notifications = nil
+
+      @mutex.synchronize {
+        @notifications[notification.caller_obj] = notification
+
+        if @callers.length==@notifications.length
+          next_notifications = []
+          @notifications.each {|caller_obj, notification|
+            case notification.stat
+            when AudioNotification::STAT_NEXT
+              next_notifications << notification
+            when AudioNotification::STAT_COMPLETE
+              @callers.delete(caller_obj)
+            end
+          }
+
+          do_notify = true
+          @notifications.clear
+        end
+      }
+
+      if do_notify
+        if 0<next_notifications.length
+          output = next_notifications.map(&:input).inject(:+)
+          on_next(output)
+        else
+          on_complete
+        end
       end
+    end
+
+    def on_next(input)
+      notify_next(input)
+    end
 
-      @zip_observable = Rx::Observable.zip(*@observables).map{|a| a.inject(:+)}
-      @detach = @zip_observable.subscribe(self)
+    def on_complete
+      notify_complete
     end
   end
 end

data/lib/audio_stream/audio_input.rb

@@ -2,6 +2,7 @@ module AudioStream
 
   module AudioInput
     include Enumerable
+    include AudioObservable
 
     attr_reader :connection
 
@@ -9,13 +10,24 @@ module AudioStream
       @sync ||= Sync.new
     end
 
-    def connect
+    def publish
       @connection = Thread.start {
-        stream.connect
+        each {|input|
+          sync.resume_wait
+          notify_next(input)
+          sync.yield
+        }
+        sync.resume_wait
+        notify_complete
+        sync.finish
       }
       self
     end
 
+    def connect
+      nil
+    end
+
     def disconnect
       if @connection
         @connection.kill
@@ -24,17 +36,12 @@ module AudioStream
       self
     end
 
-    def stream
-      @stream ||= Rx::Observable.create do |observer|
-        each {|buf|
-          sync.resume_wait
-          observer.on_next(buf)
-          sync.yield
-        }
-        sync.resume_wait
-        sync.finish
-        observer.on_completed
-      end.publish
+    def connected?
+      nil
+    end
+
+    def published?
+      !!@connection
     end
 
 

data/lib/audio_stream/audio_input_buffer.rb

@@ -6,6 +6,18 @@ module AudioStream
       @buffers = [buffers].flatten.compact
     end
 
+    def connect
+      self
+    end
+
+    def disconnect
+      self
+    end
+
+    def connected?
+      true
+    end
+
     def each(&block)
       Enumerator.new do |y|
         @buffers.each {|buf|

data/lib/audio_stream/audio_input_device.rb

@@ -14,22 +14,28 @@ module AudioStream
     end
 
     def connect
-      @inbuf = @dev.input_buffer(@soundinfo.window_size)
-      @inbuf.start
-      super
+      if !connected?
+        @inbuf = @dev.input_buffer(@soundinfo.window_size)
+        @inbuf.start
+      end
+      self
     end
 
     def disconnect
-      if @inbuf
+      if connected?
         @inbuf.stop
         @inbuf = nil
       end
       super
     end
 
+    def connected?
+      !!@inbuf
+    end
+
     def each(&block)
       Enumerator.new do |y|
-        if !@inbuf
+        if !connected?
           raise Error, "Device is not connected. You need to exec #{self.class.name}.connect: #{name}"
         end
 

data/lib/audio_stream/audio_input_file.rb

@@ -10,25 +10,35 @@ module AudioStream
     end
 
     def connect
-      @sound = RubyAudio::Sound.open(@path)
-      super
+      if !connected?
+        @sound = RubyAudio::Sound.open(@path)
+      end
+      self
     end
 
     def disconnect
-      if @sound && !@sound.closed?
+      if connected?
         @sound.close
       end
       super
     end
 
+    def connected?
+      @sound && !@sound.closed?
+    end
+
     def seek(frames, whence=IO::SEEK_SET)
+      if !connected?
+        raise Error, "File is not opened. You need to exec #{self.class.name}.connect: #{@path}"
+      end
+
       @sound.seek(frames, whence)
       self
     end
 
     def each(&block)
       Enumerator.new do |y|
-        if !@sound || @sound.closed?
+        if !connected?
           raise Error, "File is not opened. You need to exec #{self.class.name}.connect: #{@path}"
         end
 

data/lib/audio_stream/audio_notification.rb

@@ -0,0 +1,17 @@
+module AudioStream
+
+  class AudioNotification
+    STAT_NEXT = :next
+    STAT_COMPLETE = :complete
+
+    attr_reader :stat
+    attr_reader :input
+    attr_reader :caller_obj
+
+    def initialize(stat, input, caller_obj)
+      @stat = stat
+      @input = input
+      @caller_obj = caller_obj
+    end
+  end
+end

data/lib/audio_stream/audio_observable.rb

@@ -0,0 +1,29 @@
+require 'observer'
+
+module AudioStream
+
+  module AudioObservable
+    include Observable
+
+    def notify_next(input)
+      changed
+      notify_observers(AudioNotification.new(AudioNotification::STAT_NEXT, input, self))
+    end
+
+    def notify_complete
+      changed
+      notify_observers(AudioNotification.new(AudioNotification::STAT_COMPLETE, nil, self))
+    end
+
+    def fx(effector)
+      observer = AudioObservableFx.new(effector)
+      add_observer(observer)
+      observer
+    end
+
+    def send_to(bus, gain: nil, pan: nil)
+      bus.add(self, gain: gain, pan: pan)
+      self
+    end
+  end
+end

data/lib/audio_stream/audio_observable_fx.rb

@@ -0,0 +1,25 @@
+module AudioStream
+
+  class AudioObservableFx
+    include AudioObserver
+    include AudioObservable
+
+    def initialize(effector)
+      @effector = effector
+    end
+
+    def on_next(input)
+      if Fx::BangProcess===input
+        @effector.process!(input)
+        output = input
+      else
+        output = @effector.process(input)
+      end
+      notify_next(output)
+    end
+
+    def on_complete
+      notify_complete
+    end
+  end
+end

data/lib/audio_stream/audio_observer.rb

@@ -0,0 +1,13 @@
+module AudioStream
+
+  module AudioObserver
+    def update(notification)
+      case notification.stat
+      when AudioNotification::STAT_NEXT
+        on_next(notification.input)
+      when AudioNotification::STAT_COMPLETE
+        on_complete
+      end
+    end
+  end
+end

data/lib/audio_stream/audio_output_device.rb

@@ -23,9 +23,9 @@ module AudioStream
 
       case @channels
       when 1
-        input = Fx::StereoToMono.new.process(input)
+        input = Fx::StereoToMono.instance.process(input)
       when 2
-        input = Fx::MonoToStereo.new.process(input)
+        input = Fx::MonoToStereo.instance.process(input)
       end
 
       sint_a = input.to_a.flatten.map{|f| (f*0x7FFF).round}

data/lib/audio_stream/buffer.rb

@@ -25,7 +25,7 @@ module AudioStream
           }
         }
       when 2
-        m2s = Fx::MonoToStereo.new
+        m2s = Fx::MonoToStereo.instance
         a = [
           m2s.process(self),
           m2s.process(other),

data/lib/audio_stream/conductor.rb

@@ -8,18 +8,20 @@ module AudioStream
     def connect
       @outputs.map(&:connect)
       @inputs.map(&:connect)
+      @inputs.map(&:publish)
 
       @sync_thread = Thread.start {
         catch :break do
           loop {
-            @inputs.each {|t|
-              t.sync.resume
+            @inputs.each {|input|
+              input.sync.resume
             }
 
-            @inputs.each {|t|
-              stat = t.sync.yield_wait
+            @inputs.each {|input|
+              stat = input.sync.yield_wait
               if stat==Sync::COMPLETED
-                throw :break
+                @inputs.delete(input)
+                #throw :break
               end
             }
 

data/lib/audio_stream/fx/hanning_window.rb

@@ -1,6 +1,7 @@
 module AudioStream
   module Fx
     class HanningWindow
+      include Singleton
       include BangProcess
 
       def process!(input)

data/lib/audio_stream/fx/mono_to_stereo.rb

@@ -1,6 +1,8 @@
 module AudioStream
   module Fx
     class MonoToStereo
+      include Singleton
+
       def process(input)
         case input.channels
         when 1

data/lib/audio_stream/fx/noise_gate.rb

@@ -5,7 +5,7 @@ module AudioStream
 
       def initialize(threshold: 0.01)
         @threshold = threshold
-        @window = HanningWindow.new
+        @window = HanningWindow.instance
       end
 
       def process!(input)

data/lib/audio_stream/fx/stereo_to_mono.rb

@@ -1,6 +1,8 @@
 module AudioStream
   module Fx
     class StereoToMono
+      include Singleton
+
       def process(input)
         case input.channels
         when 1

data/lib/audio_stream/fx/tuner.rb

@@ -15,14 +15,14 @@ module AudioStream
         
       def initialize(soundinfo, window: nil)
         @samplerate = soundinfo.samplerate.to_f
-        @window = window || HanningWindow.new
+        @window = window || HanningWindow.instance
       end
 
       def process(input)
         window_size = input.size
 
         # mono window
-        input = StereoToMono.new.process(input)
+        input = StereoToMono.instance.process(input)
         @window.process!(input)
 
         gain = input.to_a.flatten.max

data/lib/audio_stream/plot.rb

@@ -12,7 +12,7 @@ module AudioStream
     end
 
     def fft(window=nil)
-      window ||= HanningWindow.new
+      window ||= HanningWindow.instance
 
       na = window.process(@input).to_na
       fft = FFTW3.fft(na, FFTW3::FORWARD) / na.length

data/lib/audio_stream/version.rb

@@ -1,3 +1,3 @@
 module AudioStream
-  VERSION = "1.2.4"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !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
@@ -152,12 +138,15 @@ files:
 - lib/audio_stream/audio_input_buffer.rb
 - lib/audio_stream/audio_input_device.rb
 - lib/audio_stream/audio_input_file.rb
+- lib/audio_stream/audio_notification.rb
+- lib/audio_stream/audio_observable.rb
+- lib/audio_stream/audio_observable_fx.rb
+- lib/audio_stream/audio_observer.rb
 - lib/audio_stream/audio_output.rb
 - lib/audio_stream/audio_output_device.rb
 - lib/audio_stream/audio_output_file.rb
 - lib/audio_stream/buffer.rb
 - lib/audio_stream/conductor.rb
-- lib/audio_stream/core_ext.rb
 - lib/audio_stream/error.rb
 - lib/audio_stream/fx.rb
 - lib/audio_stream/fx/a_gain.rb

data/lib/audio_stream/core_ext.rb

@@ -1,13 +0,0 @@
-require 'audio_stream'
-
-module Rx::Observable
-  def fx(effector)
-    #map(&effector.:process)
-    map(&effector.method(:process))
-  end
-
-  def send_to(bus, gain: nil, pan: nil)
-    bus.add(self, gain: gain, pan: pan)
-    self
-  end
-end