audio-playback 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 315481daaba2617f0d73152c97a05f6aacd7ac82
-  data.tar.gz: a6b72af924a20066a5ef290ee98fc7d3e4487c85
+  metadata.gz: eecccbe6c5faee30c7857d77f3d89e230b435f2a
+  data.tar.gz: 4621a617d40eaa1b923642b6caec93595e7fd40d
 SHA512:
-  metadata.gz: 229fc708dee47f9a559780defc1819cf6d133bfb1c34018aaf2c02103bbbb59670a47e833ab258d06c4bc8c509626c278b0df796ef6cb29eadef9f46524b9302
-  data.tar.gz: f2d343c8f9e7d88f3ba5415debdc32ab9f024d0dc949d757b2e8d108b535bff7322b2e3a30d8e20993a249b5ea7789d79249af8e2fd385332b49d30f19925552
+  metadata.gz: 582c662be9f91bb72c4958e0978b852beef42a0cdcf2c9a552452a3a870f8832165db47075bc0ccd3def87cefbcc901af26b52555b26e8b3da3bd5febddefcc3
+  data.tar.gz: 8f7c7cb70b298584fa091806139453a0e6a634263fbbbe7a463f69ec6e4450c5b3aa427b89782567c867d321e794d41f76a13f34f5bd300acd2d7dedc9075127

data/README.md

@@ -87,7 +87,8 @@ More Ruby code examples:
 * [Select a file and play](https://github.com/arirusso/audio-playback/blob/master/examples/select_and_play.rb)
 * [Play multiple files in one stream simultaneously](https://github.com/arirusso/audio-playback/blob/master/examples/play_multiple_simultaneous.rb)
 * [Play multiple files in one stream sequentially](https://github.com/arirusso/audio-playback/blob/master/examples/play_multiple_sequential.rb)
-* [Play multiple files in multiple streams](https://github.com/arirusso/audio-playback/blob/master/examples/play_multiple.rb)
+* [Play multiple files in multiple streams](https://github.com/arirusso/audio-playback/blob/master/examples/play_multiple_streams.rb)
+* [Looping playback](https://github.com/arirusso/audio-playback/blob/master/examples/loop.rb)
 
 ## License
 

data/lib/audio-playback.rb

@@ -24,7 +24,7 @@ require "audio-playback/sound"
 # Play audio files
 module AudioPlayback
 
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 
   # Convenience method to play an audio file
   # @param [Array<::File>, Array<String>, ::File, String] file_paths

data/lib/audio-playback/device/stream.rb

@@ -4,6 +4,9 @@ module AudioPlayback
 
     class Stream < FFI::PortAudio::Stream
 
+      attr_reader :is_playing
+      alias_method :playing?, :is_playing
+
       # Keep track of all streams
       # @return [Array<Stream>]
       def self.streams
@@ -14,6 +17,7 @@ module AudioPlayback
       # @param [Hash] options
       # @option options [IO] logger
       def initialize(output, options = {})
+        @is_playing = false
         @is_muted = false
         @gain = 1.0
         @input = nil
@@ -28,8 +32,13 @@ module AudioPlayback
       # @option options [IO] logger
       # @return [Stream]
       def play(playback, options = {})
+        @is_playing = true
         report(playback, options[:logger]) if options[:logger]
-        open_playback(playback)
+        if @stream.nil?
+          open_playback(playback)
+        else
+          continue(playback)
+        end
         start
         self
       end
@@ -52,13 +61,25 @@ module AudioPlayback
           end
         rescue SystemExit, Interrupt
           # Control-C
-        ensure
-          true
+          @is_playing = false
+          exit
         end
+        @is_playing = false
+        true
       end
 
       private
 
+      def open_stream(playback)
+        @userdata = playback.data.to_pointer
+        FFI::PortAudio::API.Pa_OpenStream(@stream, @input, @output, @freq, @frames, @flags, @method, @userdata)
+      end
+
+      def continue(playback)
+        playback.reset
+        open_stream(playback)
+      end
+
       # Initialize the callback that's fired when the stream exits
       # @return [Stream]
       def initialize_exit_callback(options = {})
@@ -75,6 +96,7 @@ module AudioPlayback
           #close
           FFI::PortAudio::API.Pa_Terminate
         end
+        @is_playing = false
         true
       end
 
@@ -82,7 +104,12 @@ module AudioPlayback
       # @param [Playback] playback
       # @return [Boolean]
       def open_playback(playback)
-        open(@input, @output, playback.sample_rate.to_i, playback.buffer_size, FFI::PortAudio::API::NoFlag, playback.data)
+        @freq = playback.sample_rate.to_i
+        @frames = playback.buffer_size
+        @flags = FFI::PortAudio::API::NoFlag
+        @stream = FFI::Buffer.new(:pointer)
+        @method = method(:process)
+        open_stream(playback)
         true
       end
 

data/lib/audio-playback/playback.rb

@@ -22,7 +22,8 @@ module AudioPlayback
 
       attr_reader :buffer_size, :channels, :data, :output, :num_channels, :sounds, :stream
       def_delegators :@sounds, :audio_files
-
+      def_delegators :@data, :reset
+      
       # @param [Array<Sound>, Sound] sounds
       # @param [Output] output
       # @param [Hash] options
@@ -135,7 +136,7 @@ module AudioPlayback
       # @return [Playback::Action]
       def populate(options = {})
         populate_channels(options)
-        @data = StreamData.to_pointer(self)
+        @data = StreamData.new(self)
         self
       end
 

data/lib/audio-playback/playback/frame_set.rb

@@ -7,7 +7,7 @@ module AudioPlayback
 
       extend Forwardable
 
-      def_delegators :@data, :flatten, :slice, :to_ary, :unshift
+      def_delegators :@data, :[], :[]=, :flatten, :slice, :to_ary, :unshift
 
       # @param [Playback::Action] playback
       def initialize(playback)

data/lib/audio-playback/playback/stream_data.rb

@@ -19,6 +19,15 @@ module AudioPlayback
         populate
       end
 
+      def reset
+        indexes = [
+          Playback::METADATA.index(:pointer),
+          Playback::METADATA.index(:is_eof)
+        ]
+        indexes.each { |index| @data[index] = 0.0 }
+        true
+      end
+
       # A C pointer version of the audio data
       # @return [FFI::Pointer]
       def to_pointer

data/test/device/stream_test.rb

@@ -35,6 +35,7 @@ class AudioPlayback::Device::StreamTest < Minitest::Test
         @stream.expects(:report).once
         @stream.expects(:open_playback).once
         @stream.expects(:start).once
+        @result = @stream.play(@playback)
       end
 
       teardown do
@@ -44,7 +45,11 @@ class AudioPlayback::Device::StreamTest < Minitest::Test
       end
 
       should "return self" do
-        assert_equal @stream, @stream.play(@playback)
+        assert_equal @stream, @result
+      end
+
+      should "flag as playing" do
+        assert @stream.playing?
       end
 
     end

data/test/playback/stream_data_test.rb

@@ -15,9 +15,9 @@ class AudioPlayback::Playback::StreamDataTest < Minitest::Test
         @data = @playback.data
       end
 
-      should "return a pointer" do
+      should "return a stream data object" do
         refute_nil @data
-        assert_kind_of FFI::Pointer, @data
+        assert_kind_of AudioPlayback::Playback::StreamData, @data
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio-playback
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest