audio_stream 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 450d5f725255284de3f97fa089d98a34603cee45b7cdfe1145f35925f87ecd6d
-  data.tar.gz: 285d5688d7f1b87644f613e9339bd0fccd38b20f1321cce00b5ba46bfe4709a4
+  metadata.gz: d68afffda6b1f4c82e28430669330ef49e22c7765d70264686cc6011428ade0e
+  data.tar.gz: 783d2ab1c2f6a69e783064a581c472d66e8f1139e8da208715b4edfef3999dfe
 SHA512:
-  metadata.gz: 6a836a10b9a92aaf6b91d2c4c8ca93a2d669d579f41ad1f6431357f789fadc161747fd15532c7d17c96ffd8d84211abbd4ab0fca87af92f8b99d07eed07125a7
-  data.tar.gz: caa08fc1765ad8aa22ea177ea50231b2775ecbf43563b798f8617930e6ce30601a0c2a783b2cd2632d4df1844a43d0d1c8854f469968c825c4edf533b6793874
+  metadata.gz: 1a4c6364f40be8a8125d1c08124a4b4b2e81e955e9f17dff7189f353bca537f581fe6beaba2d3044b61f3eb389e02a2e34531d6f618fee82808371ad4e73e987
+  data.tar.gz: 7c6b41a5baec7931ac771aee1838ed614b13cefd3134fe4e7954ac26993e59b98c33e2a55512ad95a457e64c5af5954f5bc746c0c09814156b15c934a2a01a1c

data/lib/audio_stream/audio_input.rb

@@ -15,6 +15,13 @@ module AudioStream
       }
     end
 
+    def disconnect
+      if @connection
+        @connection.join
+        @connection = nil
+      end
+    end
+
     def stream
       @stream ||= Rx::Observable.create do |observer|
         each {|buf|
@@ -40,9 +47,5 @@ module AudioStream
     def self.device(soundinfo:)
       AudioInputDevice.default_device(soundinfo: soundinfo)
     end
-
-    def self.sin(hz, repeat, soundinfo:)
-      AudioInputSin.new(hz, repeat, soundinfo: soundinfo)
-    end
   end
 end

data/lib/audio_stream/audio_input_device.rb

@@ -13,11 +13,21 @@ module AudioStream
       @dev.name
     end
 
+    def connect
+      @inbuf = @dev.input_buffer(@soundinfo.window_size)
+      @inbuf.start
+      super
+    end
+
+    def disconnect
+      if @inbuf
+        @inbuf.stop
+        super
+      end
+    end
+
     def each(&block)
       Enumerator.new do |y|
-        @inbuf = @dev.input_buffer(@soundinfo.window_size)
-        @inbuf.start
-
         channels = @dev.input_stream.channels
         buf = Buffer.float(@soundinfo.window_size, channels)
 

data/lib/audio_stream/audio_input_file.rb

@@ -6,10 +6,21 @@ module AudioStream
 
     def initialize(path, soundinfo:)
       @path = path
-      @sound = RubyAudio::Sound.open(path)
       @soundinfo = soundinfo
     end
 
+    def connect
+      @sound = RubyAudio::Sound.open(@path)
+      super
+    end
+
+    def disconnect
+      if @sound && !@sound.closed?
+        @sound.close
+        super
+      end
+    end
+
     def seek(frames, whence=IO::SEEK_SET)
       @sound.seek(frames, whence)
       self

data/lib/audio_stream/audio_output.rb

@@ -3,7 +3,6 @@ module AudioStream
 
     def initialize
       super()
-      @sync = Sync.new
     end
 
     def self.file(fname, soundinfo:)

data/lib/audio_stream/audio_output_device.rb

@@ -17,10 +17,6 @@ module AudioStream
       @buf.stop
     end
 
-    def join
-      @sync.yield_wait
-    end
-
     def on_next(input)
       window_size = input.size
       channels = input.channels
@@ -44,7 +40,7 @@ module AudioStream
     end
 
     def on_completed
-      @sync.finish
+      disconnect
     end
 
     def self.default_device(soundinfo:)

data/lib/audio_stream/audio_output_file.rb

@@ -11,10 +11,7 @@ module AudioStream
     end
 
     def disconnect
-    end
-
-    def join
-      @sync.yield_wait
+      @sound.close
     end
 
     def on_next(input)
@@ -28,8 +25,7 @@ module AudioStream
     end
 
     def on_completed
-      @sound.close
-      @sync.finish
+      disconnect
     end
   end
 end

data/lib/audio_stream/conductor.rb

@@ -7,32 +7,34 @@ module AudioStream
 
     def connect
       @outputs.map(&:connect)
-      @input_connections = @inputs.map(&:connect)
+      @inputs.map(&:connect)
 
       @sync_thread = Thread.start {
-        loop {
-          @inputs.each {|t|
-            t.sync.resume
-          }
+        catch :break do
+          loop {
+            @inputs.each {|t|
+              t.sync.resume
+            }
+
+            @inputs.each {|t|
+              stat = t.sync.yield_wait
+              if stat==Sync::COMPLETED
+                throw :break
+              end
+            }
 
-          @inputs.each {|t|
-            stat = t.sync.yield_wait
-            if stat==Sync::COMPLETED
-              @inputs.delete(t)
+            if @inputs.length==0
+              throw :break
             end
           }
-
-          if @inputs.length==0
-            break
-          end
-        }
+        end
       }
     end
 
     def join
-      @outputs.map(&:join)
-      @input_connections.map(&:join)
       @sync_thread.join
+      @inputs.map(&:disconnect)
+      @outputs.map(&:disconnect)
     end
   end
 end

data/lib/audio_stream/sync.rb

@@ -4,9 +4,8 @@ module AudioStream
     COMPLETED = :completed
 
     def initialize
-      buffering = 1
-      @resume_queue = SizedQueue.new(buffering)
-      @yield_queue = SizedQueue.new(buffering)
+      @resume_queue = SizedQueue.new(1)
+      @yield_queue = SizedQueue.new(1)
     end 
 
     def resume

data/lib/audio_stream/version.rb

@@ -1,3 +1,3 @@
 module AudioStream
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_stream
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler