audio_stream 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d68afffda6b1f4c82e28430669330ef49e22c7765d70264686cc6011428ade0e
-  data.tar.gz: 783d2ab1c2f6a69e783064a581c472d66e8f1139e8da208715b4edfef3999dfe
+  metadata.gz: '00808bca83da43c81bd03e94f420f7ecce53b9211450c76a09d6d1856edf8be2'
+  data.tar.gz: 64d161eedf393c991fe2692aa7328afceed56e926fed3101f92dbc862b820446
 SHA512:
-  metadata.gz: 1a4c6364f40be8a8125d1c08124a4b4b2e81e955e9f17dff7189f353bca537f581fe6beaba2d3044b61f3eb389e02a2e34531d6f618fee82808371ad4e73e987
-  data.tar.gz: 7c6b41a5baec7931ac771aee1838ed614b13cefd3134fe4e7954ac26993e59b98c33e2a55512ad95a457e64c5af5954f5bc746c0c09814156b15c934a2a01a1c
+  metadata.gz: 4665c0f70102e40057ec0f799f21a8d422bd9ce395f74b7075f22cad0d7024ed8701e682cf644df55822055cf6720dacbb499de0766958dfa17bc46d6d0039b3
+  data.tar.gz: 0be2c27573b1918ac6a01ffaa0b678c44338630415c28a3b13c06b432888c8b467f9443ad26b1e326aab9b4d2277eecb5268b8d541189f5827c35109443a93c9

data/lib/audio_stream/audio_input.rb

@@ -13,13 +13,15 @@ module AudioStream
       @connection = Thread.start {
         stream.connect
       }
+      self
     end
 
     def disconnect
       if @connection
-        @connection.join
+        @connection.kill
         @connection = nil
       end
+      self
     end
 
     def stream

data/lib/audio_stream/audio_input_device.rb

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

data/lib/audio_stream/audio_input_file.rb

@@ -17,8 +17,8 @@ module AudioStream
     def disconnect
       if @sound && !@sound.closed?
         @sound.close
-        super
       end
+      super
     end
 
     def seek(frames, whence=IO::SEEK_SET)
@@ -28,7 +28,11 @@ module AudioStream
 
     def each(&block)
       Enumerator.new do |y|
-        buf = Buffer.float(@soundinfo.window_size, @sound.info.channels)
+        if !@sound || @sound.closed?
+          raise Error, "File is not opened. You need to exec #{self.class.name}.connect: #{@path}"
+        end
+
+        buf = Buffer.float(@soundinfo.window_size, @soundinfo.channels)
         while @sound.read(buf)!=0
           buf.real_size = buf.size
           y << buf.clone

data/lib/audio_stream/audio_output_file.rb

@@ -11,7 +11,9 @@ module AudioStream
     end
 
     def disconnect
-      @sound.close
+      if @sound && !@sound.closed?
+        @sound.close
+      end
     end
 
     def on_next(input)

data/lib/audio_stream/fx/delay.rb

@@ -8,7 +8,7 @@ module AudioStream
         @level = level
         @feedback = feedback
 
-        @delaysample = soundinfo.samplerate * time / 1000.0
+        @delaysample = (soundinfo.samplerate * time).round
         @delaybuf0 = Array.new(@delaysample, 0.0)
         @delaybuf1 = Array.new(@delaysample, 0.0)
         @seek = 0

data/lib/audio_stream/sound_info.rb

@@ -2,6 +2,10 @@ module AudioStream
   class SoundInfo < RubyAudio::SoundInfo
     attr_accessor :window_size
 
+    def framerate
+      self.samplerate.to_f / self.window_size
+    end
+
     def clone
       SoundInfo.new(channels: channels, samplerate: samplerate, format: format, window_size: window_size)
     end

data/lib/audio_stream/version.rb

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

metadata

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