albanpeignier-alsa-backup 0.0.6 → 0.0.7

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.7
+
+* Make configurable channels, sample rate and alsa device
+
 == 0.0.6
 
 * Fix file writing problem

data/TODO

@@ -1,4 +1 @@
-* configurable channels
-* configurable sample rate
-* configurable alsa device
 * improve spec coverage

data/alsa-backup.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{alsa-backup}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2009-05-28}
+  s.date = %q{2009-05-31}
   s.default_executable = %q{alsa.backup}
   s.description = %q{ALSA client to perform continuous recording}
   s.email = ["alban.peignier@free.fr"]

data/config.sample

@@ -21,6 +21,23 @@
 AlsaBackup.logger.info("load config #{__FILE__}")
 
 AlsaBackup.config do |recorder|
+
+  # 
+  # To specify the alsa device to be used
+  #
+  #recorder.device = "plughw:0"
+
+  # 
+  # To specify the channel count to be used
+  #
+  #recorder.channels = 1
+  #recorder.channels = 4
+
+  # 
+  # To specify the sample_rate to be used
+  #
+  #recorder.sample_rate = 48000
+                  
   #
   # To use files named like this :
   # - 2009/05-May/17-Sun/19h.wav

data/lib/alsa_backup.rb

@@ -10,7 +10,7 @@ require 'activesupport'
 require 'logger'
 
 module AlsaBackup
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 
   def self.recorder
     @recorder ||= AlsaBackup::Recorder.new

data/lib/alsa_backup/recorder.rb

@@ -7,10 +7,15 @@ module AlsaBackup
       @file = File.basename(file)
       @directory = File.dirname(file)
 
+      @device = "hw:0"
+      @sample_rate = 44100
+      @channels = 2
+
       @error_handler = Proc.new { |e| true }
     end
 
     attr_accessor :file, :directory, :error_handler
+    attr_accessor :device, :sample_rate, :channels
 
     def start(seconds_to_record = nil)
       length_controller = self.length_controller(seconds_to_record)
@@ -32,7 +37,7 @@ module AlsaBackup
     end
 
     def open_capture(&block)
-      ALSA::PCM::Capture.open("hw:0", self.format(:sample_format => :s16_le), &block)      
+      ALSA::PCM::Capture.open(device, self.format(:sample_format => :s16_le), &block)      
     end
 
     def handle_error(e, try_to_continue = true)
@@ -64,7 +69,7 @@ module AlsaBackup
     end
 
     def format(additional_parameters = {})
-      {:sample_rate => 44100, :channels => 2}.merge(additional_parameters)
+      {:sample_rate => sample_rate, :channels => channels}.merge(additional_parameters)
     end
 
     def length_controller(seconds_to_record)

data/lib/alsa_backup/writer.rb

@@ -39,7 +39,13 @@ module AlsaBackup
     def close
       if @sndfile
         AlsaBackup.logger.info('close current file')
-        @sndfile.close 
+        @sndfile.close
+
+        closed_file = @sndfile.path
+        if File.zero?(closed_file)
+          AlsaBackup.logger.warn('remove empty file #{closed_file}')
+          File.delete closed_file
+        end
       end
       @sndfile = nil
     end

data/spec/alsa_backup/recorder_spec.rb

@@ -13,6 +13,34 @@ describe AlsaBackup::Recorder do
     lambda { @recorder.start(2) }.should_not raise_error
   end
 
+  it "should use the specified alsa device" do
+    @recorder.device = alsa_device = "dummy"
+    ALSA::PCM::Capture.should_receive(:open).with(alsa_device, anything)
+    @recorder.open_capture
+  end
+
+  it "should use the specified sample rate" do
+    @recorder.sample_rate = 48000
+    @recorder.format[:sample_rate].should == @recorder.sample_rate
+  end
+
+  it "should use the specified channels" do
+    @recorder.channels = 4
+    @recorder.format[:channels].should == @recorder.channels
+  end
+
+  it "should use 44100 as default sample rate" do
+    @recorder.sample_rate.should == 44100
+  end
+
+  it "should use 2 as default channels" do
+    @recorder.channels.should == 2
+  end
+
+  it "should use hw:0 as default device" do
+    @recorder.device.should == "hw:0"
+  end
+
   describe "error handler" do
 
     class TestErrorHandler

data/spec/alsa_backup/writer_spec.rb

@@ -5,20 +5,20 @@ describe AlsaBackup::Writer do
   before(:each) do
     @file = "test.wav"
     @directory = test_directory
-    @recorder = AlsaBackup::Writer.new(@file, @directory)
+    @writer = AlsaBackup::Writer.new(@file, @directory)
   end
 
   describe "file" do
     
     it "should accept file as string" do
-      @recorder.file = file_name = "dummy"
-      @recorder.file.should == file_name
+      @writer.file = file_name = "dummy"
+      @writer.file.should == file_name
     end
 
     it "should accept file as Proc" do
       file_name = "dummy"
-      @recorder.file = Proc.new { file_name }
-      @recorder.file.should == file_name
+      @writer.file = Proc.new { file_name }
+      @writer.file.should == file_name
     end
     
   end
@@ -50,4 +50,23 @@ describe AlsaBackup::Writer do
 
   end
 
+  describe "close" do
+
+    it "should close current sndfile" do
+      sndfile = @writer.sndfile
+      sndfile.should_receive(:close)
+      @writer.close      
+    end
+    
+    it "should remove closed file if empty" do
+      @writer.sndfile
+
+      File.stub!(:zero?).and_return(true)
+      File.should_receive(:delete).with(@writer.target_file)
+
+      @writer.close
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: albanpeignier-alsa-backup
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-28 00:00:00 -07:00
+date: 2009-05-31 00:00:00 -07:00
 default_executable: alsa.backup
 dependencies: 
 - !ruby/object:Gem::Dependency