ruby-alsa 0.0.5 → 0.7

data/Manifest.txt

@@ -6,7 +6,12 @@ History.txt
 Manifest.txt
 README.rdoc
 Rakefile
+debian/changelog
+debian/compat
+debian/control
+debian/rules
 lib/alsa.rb
+lib/alsa/ffi_ext.rb
 lib/alsa/logger.rb
 lib/alsa/native.rb
 lib/alsa/pcm/capture.rb
@@ -14,13 +19,25 @@ lib/alsa/pcm/hw_parameters.rb
 lib/alsa/pcm/native.rb
 lib/alsa/pcm/playback.rb
 lib/alsa/pcm/stream.rb
+lib/alsa/pcm/sw_parameters.rb
+lib/alsa/sine.rb
 log/test.log
+refs/alsa_player
+refs/alsa_player.c
+refs/alsa_player.rb
+refs/alsa_player_async
+refs/alsa_player_async.c
+refs/alsa_player_async.rb
+refs/alsa_recorder.rb
+refs/alsa_recorder_async.rb
+refs/pcm_wrap.rb
 ruby-alsa.gemspec
 script/console
 script/destroy
 script/generate
 script/play
 script/record
+setup.rb
 spec.html
 spec/alsa/logger_spec.rb
 spec/alsa/native_spec.rb
@@ -34,4 +51,5 @@ spec/spec.opts
 spec/spec_helper.rb
 spec/support/logger.rb
 tasks/buildbot.rake
+tasks/debian.rake
 tasks/rspec.rake

data/debian/changelog

@@ -0,0 +1,11 @@
+libalsa-ruby (0.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Alban Peignier <alban@tryphon.eu>  Thu, 14 Oct 2010 10:09:54 +0200
+
+libalsa-ruby (0.1-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Alban Peignier <alban@tryphon.eu>  Sun, 1 Aug 2010 17:57:43 +0200

data/debian/compat

@@ -0,0 +1 @@
+5

data/debian/control

@@ -0,0 +1,18 @@
+Source: libalsa-ruby
+Section: sound
+Priority: optional
+Maintainer: Alban Peignier <alban@tryphon.eu>
+Build-Depends: debhelper, cdbs, ruby-pkg-tools, libsetup-ruby1.8
+Build-Depends-Indep: ruby1.8
+Standards-Version: 3.8.1
+Homepage: http://projects.tryphon.eu/ruby-alsa
+
+Package: libalsa-ruby1.8
+Architecture: all
+Depends: ruby1.8, libruby1.8, libasound2, libffi-ruby
+Description: Ruby 1.8 binding for ALSA library.
+
+Package: libalsa-ruby
+Architecture: all
+Depends: libalsa-ruby1.8
+Description: Ruby binding for ALSA library.

data/debian/rules

@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+
+install/libalsa-ruby::
+#	 cp $(DEB_SRCDIR)/debian/alsa-backup.conf debian/$(cdbs_curpkg)/etc/
+	echo DEB_RUBY_LIB_PACKAGES
+	echo $(DEB_RUBY_LIB_PACKAGES)
+	echo DEB_RUBY_REAL_LIB_PACKAGES
+	echo $(DEB_RUBY_REAL_LIB_PACKAGES)
+	echo DEB_RUBY_DUMMY_LIB_PACKAGES
+	echo $(DEB_RUBY_DUMMY_LIB_PACKAGES)
+	echo DEB_RUBY_LIB_DOC_PACKAGES
+	echo $(DEB_RUBY_LIB_DOC_PACKAGES)

data/lib/alsa.rb

@@ -5,15 +5,17 @@ require 'ffi'
 
 module ALSA
 
-  VERSION = "0.0.5"
+  VERSION = "0.7"
 
 end
 
 require 'logger'
+require 'alsa/ffi_ext'
 require 'alsa/logger'
 require 'alsa/native'
 require 'alsa/pcm/native'
 require 'alsa/pcm/hw_parameters'
+require 'alsa/pcm/sw_parameters'
 require 'alsa/pcm/stream'
 require 'alsa/pcm/capture'
 require 'alsa/pcm/playback'

data/lib/alsa/ffi_ext.rb

@@ -0,0 +1,35 @@
+class Integer 
+
+  def to_pointer
+    pointer = MemoryPointer.new(:int)
+    pointer.write_int(self)
+
+    unless block_given?
+      pointer
+    else
+      begin
+        return yield pointer
+      ensure
+        pointer.free
+      end
+    end
+  end
+
+end
+
+class Array 
+
+  def to_pointers
+    pointers = map(&:to_pointer)
+    unless block_given?
+      pointers
+    else
+      begin
+        return yield pointers
+      ensure
+        pointers.each(&:free)
+      end
+    end
+  end
+
+end

data/lib/alsa/native.rb

@@ -8,5 +8,10 @@ module ALSA
     def self.error_code?(response)
       response and response < 0
     end
+
+    callback :async_callback, [:pointer], :void
+    attach_function :async_add_pcm_handler, :snd_async_add_pcm_handler, [ :pointer, :pointer, :async_callback, :pointer ], :int
+    attach_function :async_handler_get_pcm, :snd_async_handler_get_pcm, [ :pointer ], :pointer
+    attach_function :async_handler_get_callback_private, :snd_async_handler_get_callback_private, [ :pointer ], :pointer
   end
 end

data/lib/alsa/pcm/capture.rb

@@ -2,15 +2,14 @@ module ALSA::PCM
   class Capture < Stream
 
     def native_constant
-      ALSA::PCM::Native::STREAM_CAPTURE
+      ALSA::PCM::Native::Stream::CAPTURE
     end
 
     def read
       check_handle!
 
-      ALSA.logger.debug { "start read with #{hw_params.sample_rate}, #{hw_params.channels} channels"}
+      ALSA.logger.debug { "start read with #{hw_params.inspect}"}
 
-      ALSA.logger.debug { "allocate #{hw_params.buffer_size_for(buffer_frame_count)} bytes for #{buffer_frame_count} frames" }
       FFI::MemoryPointer.new(:char, hw_params.buffer_size_for(buffer_frame_count)) do |buffer|
         begin
           read_buffer buffer, buffer_frame_count
@@ -18,6 +17,41 @@ module ALSA::PCM
       end
     end
 
+    def read_in_background(&block)
+      check_handle!
+
+      async_handler = FFI::MemoryPointer.new(:pointer)
+      buffer = FFI::MemoryPointer.new(:char, hw_params.buffer_size_for(buffer_frame_count))
+
+      started = false
+
+      capture_callback = Proc.new do |async_handler|
+        if started
+          frame_to_read = buffer_frame_count
+          read_buffer buffer, frame_to_read
+          yield buffer, frame_to_read
+        end
+      end
+
+      ALSA::try_to "add pcm handler" do
+        ALSA::Native::async_add_pcm_handler(async_handler, handle, capture_callback, nil)
+      end
+
+      ALSA::try_to "start capture" do
+        ALSA::PCM::Native::start(handle)
+      end
+
+      hole_frame_count = ALSA::try_to "read available space" do
+        ALSA::PCM::Native::avail_update(self.handle)
+      end
+      ALSA.logger.debug { "read synchronously #{hole_frame_count} frames"}
+      FFI::MemoryPointer.new(:char, hw_params.buffer_size_for(hole_frame_count)) do |hole|
+        ALSA::PCM::Native::readi self.handle, hole, hole_frame_count
+      end
+
+      started = true
+    end
+
     def read_buffer(buffer, frame_count)
       check_handle!
 
@@ -31,6 +65,8 @@ module ALSA::PCM
         end
       end
 
+      ALSA.logger.debug { "read frame count: #{read_count}/#{frame_count}"}
+
       missing_frame_count = frame_count - read_count
       if missing_frame_count > 0
         ALSA.logger.debug { "re-read missing frame count: #{missing_frame_count}"}

data/lib/alsa/pcm/hw_parameters.rb

@@ -59,10 +59,62 @@ module ALSA::PCM
       end
     end
 
+    def period_time=(period_time)
+      ALSA::try_to "set period time (#{period_time})" do
+        value = FFI::MemoryPointer.new(:int)
+        value.write_int(period_time)
+
+        dir = FFI::MemoryPointer.new(:int)
+        dir.write_int(-1)
+        error_code = ALSA::PCM::Native::hw_params_set_period_time_near self.device.handle, self.handle, value, dir
+
+        value.free
+        dir.free
+
+        error_code
+      end
+    end
+
+    def period_time
+      value = nil
+      ALSA::try_to "get period time" do
+        value_pointer = FFI::MemoryPointer.new(:int)
+        dir_pointer = FFI::MemoryPointer.new(:int)
+        dir_pointer.write_int(0)
+
+        error_code = ALSA::PCM::Native::hw_params_get_period_time self.handle, value_pointer, dir_pointer
+
+        value = value_pointer.read_int
+
+        value_pointer.free
+        dir_pointer.free
+
+        error_code
+      end
+      value
+    end
+
+    def buffer_time=(buffer_time)
+      ALSA::try_to "set buffer time (#{buffer_time})" do
+        value = FFI::MemoryPointer.new(:int)
+        value.write_int(buffer_time)
+
+        dir = FFI::MemoryPointer.new(:int)
+        dir.write_int(-1)
+        error_code = ALSA::PCM::Native::hw_params_set_buffer_time_near self.device.handle, self.handle, value, dir
+
+        value.free
+        dir.free
+
+        error_code
+      end
+    end
+
     def sample_rate
       rate = nil
       ALSA::try_to "get sample rate" do
         rate_pointer = FFI::MemoryPointer.new(:int)
+
         dir_pointer = FFI::MemoryPointer.new(:int)
         dir_pointer.write_int(0)
 
@@ -106,6 +158,39 @@ module ALSA::PCM
       channels
     end
 
+    def period_size
+      value = nil
+      ALSA::try_to "get period size" do
+        value_pointer = FFI::MemoryPointer.new(:int)
+        dir_pointer = FFI::MemoryPointer.new(:int)
+        dir_pointer.write_int(0)
+
+        error_code = ALSA::PCM::Native::hw_params_get_period_size self.handle, value_pointer, dir_pointer
+
+        value = value_pointer.read_int
+
+        value_pointer.free
+        dir_pointer.free
+
+        error_code
+      end
+      value
+    end
+
+    def buffer_size
+      value = nil
+      ALSA::try_to "get buffer size" do
+        value_pointer = FFI::MemoryPointer.new(:int)
+        error_code = ALSA::PCM::Native::hw_params_get_buffer_size self.handle, value_pointer
+        value = value_pointer.read_int
+
+        value_pointer.free
+
+        error_code
+      end
+      value
+    end
+
     def buffer_size_for(frame_count)
       ALSA::PCM::Native::format_size(self.sample_format, frame_count) * self.channels
     end
@@ -120,5 +205,9 @@ module ALSA::PCM
       end
     end
 
+    def inspect
+      "#<ALSA::PCM::HwParameters:#{object_id} sample_rate=#{sample_rate}, channels=#{channels}, period_time=#{period_time}, period_size=#{period_size}, buffer_size=#{buffer_size}>"
+    end
+
   end
 end

data/lib/alsa/pcm/native.rb

@@ -4,14 +4,19 @@ module ALSA::PCM
     extend FFI::Library
     ffi_lib "libasound.so.2"
 
-    STREAM_PLAYBACK = 0
-    STREAM_CAPTURE = 1
+    module Stream
+      PLAYBACK = 0
+      CAPTURE = 1
+    end
 
     BLOCK = 0
     attach_function :open, :snd_pcm_open, [:pointer, :string, :int, :int], :int
     attach_function :prepare, :snd_pcm_prepare, [ :pointer ], :int
     attach_function :close, :snd_pcm_close, [:pointer], :int
 
+    attach_function :wait, :snd_pcm_wait, [:pointer, :int], :int
+    attach_function :avail_update, :snd_pcm_avail_update, [:pointer], :int
+
     attach_function :readi, :snd_pcm_readi, [ :pointer, :pointer, :ulong ], :long
     attach_function :writei, :snd_pcm_writei, [ :pointer, :pointer, :ulong ], :long
 
@@ -43,10 +48,25 @@ module ALSA::PCM
     attach_function :hw_params_get_rate, :snd_pcm_hw_params_get_rate, [ :pointer, :pointer, :pointer ], :int
     attach_function :hw_params_set_rate_near, :snd_pcm_hw_params_set_rate_near, [ :pointer, :pointer, :pointer, :pointer ], :int
     attach_function :hw_params_set_channels, :snd_pcm_hw_params_set_channels, [ :pointer, :pointer, :uint ], :int
-    attach_function :hw_params_get_channels, :snd_pcm_hw_params_get_format, [ :pointer, :pointer ], :int
+    attach_function :hw_params_get_channels, :snd_pcm_hw_params_get_channels, [ :pointer, :pointer ], :int
     attach_function :hw_params_set_periods, :snd_pcm_hw_params_set_periods, [ :pointer, :pointer, :uint, :int ], :int
+    attach_function :hw_params_set_period_time_near, :snd_pcm_hw_params_set_period_time_near, [ :pointer, :pointer, :pointer, :pointer ], :int
+    attach_function :hw_params_get_period_time, :snd_pcm_hw_params_get_period_time, [ :pointer, :pointer, :pointer ], :int
+    attach_function :hw_params_get_period_size, :snd_pcm_hw_params_get_period_size, [ :pointer, :pointer, :pointer ], :int
+    attach_function :hw_params_get_buffer_size, :snd_pcm_hw_params_get_buffer_size, [ :pointer, :pointer ], :int
+    attach_function :hw_params_set_buffer_time_near, :snd_pcm_hw_params_set_buffer_time_near, [ :pointer, :pointer, :pointer, :pointer ], :int
+
+    attach_function :sw_params, :snd_pcm_sw_params, [:pointer, :pointer], :int
+    attach_function :sw_params_malloc, :snd_pcm_sw_params_malloc, [:pointer], :int
+    attach_function :sw_params_free, :snd_pcm_sw_params_free, [:pointer], :int
+    attach_function :sw_params_current, :snd_pcm_sw_params_current, [ :pointer, :pointer ], :int
+    attach_function :sw_params_set_avail_min, :snd_pcm_sw_params_set_avail_min, [ :pointer, :pointer, :uint ], :int
+    attach_function :sw_params_get_avail_min, :snd_pcm_sw_params_get_avail_min, [ :pointer, :pointer ], :int
 
     attach_function :format_size, :snd_pcm_format_size, [ :int, :uint ], :int
     attach_function :bytes_to_frames, :snd_pcm_bytes_to_frames, [ :pointer, :int ], :int
+
+    attach_function :start, :snd_pcm_start, [ :pointer ], :int
+    
   end
 end

data/lib/alsa/pcm/playback.rb

@@ -2,7 +2,7 @@ module ALSA::PCM
   class Playback < Stream
 
     def native_constant
-      ALSA::PCM::Native::STREAM_PLAYBACK
+      ALSA::PCM::Native::Stream::PLAYBACK
     end
 
     def write_buffer(buffer, frame_count)
@@ -11,28 +11,75 @@ module ALSA::PCM
       write_count = ALSA::try_to "write in audio interface" do
         response = ALSA::PCM::Native::writei(self.handle, buffer, frame_count)
         if ALSA::Native::error_code?(response)
-          ALSA.logger.warn { "try to recover '#{ALSA::Native::strerror(response)}' on read"}
+          ALSA.logger.warn { "try to recover '#{ALSA::Native::strerror(response)}' on write"}
           ALSA::PCM::Native::pcm_recover(self.handle, response, 1)
         else
           response
         end
       end
 
+      ALSA.logger.debug { "write frame count: #{write_count}/#{frame_count}"}
+
       missing_frame_count = frame_count - write_count
       if missing_frame_count > 0
         ALSA.logger.debug { "missing wroted frame count: #{missing_frame_count}"}
       end
     end
 
+    def write_in_background(&block)
+      check_handle!
+
+      async_handler = FFI::MemoryPointer.new(:pointer)
+      buffer = FFI::MemoryPointer.new(:char, hw_params.buffer_size_for(buffer_frame_count))
+
+      started = false
+
+      playback_callback = Proc.new do |async_handler|
+        if started
+          audio_content = yield(buffer.size)
+          buffer.write_string audio_content
+        
+          read_frame_count = 
+            if audio_content.size == buffer.size 
+              buffer_frame_count
+            else
+              hw_params.frame_count_for(audio_content.size)
+            end
+          
+          write_buffer buffer, read_frame_count
+        end
+      end
+
+      ALSA::try_to "add pcm handler" do
+        ALSA::Native::async_add_pcm_handler(async_handler, handle, playback_callback, nil)
+      end
+
+      ALSA::try_to "start playback" do
+        ALSA::PCM::Native::start(handle)
+      end
+
+      silent_frame_count = ALSA::try_to "read available space" do
+        ALSA::PCM::Native::avail_update(self.handle)
+      end
+      ALSA.logger.debug { "write synchronously a silence of #{silent_frame_count} frames"}
+      FFI::MemoryPointer.new(:char, hw_params.buffer_size_for(silent_frame_count)) do |silent|
+        ALSA::PCM::Native::writei self.handle, silent, silent_frame_count
+      end
+
+      started = true
+    end
+
     def write
       check_handle!
 
+      ALSA.logger.debug { "start write with #{hw_params.inspect}" }
+
       FFI::MemoryPointer.new(:char, hw_params.buffer_size_for(buffer_frame_count)) do |buffer|
         while audio_content = yield(buffer.size)
           buffer.write_string audio_content
 
           read_frame_count = 
-            if audio_content.size == buffer.size 
+            if audio_content.size == buffer.size
               buffer_frame_count 
             else
               hw_params.frame_count_for(audio_content.size)