audite 0.1.3 → 0.1.4

data/audite.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = "audite"
-  s.version       = "0.1.3"
+  s.version       = "0.1.4"
   s.author        = "Matthias Georgi"
   s.email         = "matti.georgi@gmail.com"
   s.homepage      = "http://georgi.github.com/audite"

data/ext/portaudio/portaudio.c

@@ -46,8 +46,8 @@ static int paCallback(const void *inputBuffer,
     *out++ = portaudio->buffer[i];
   }
 
+  pthread_cond_broadcast(&portaudio->cond);
   pthread_mutex_unlock(&portaudio->mutex);
-  pthread_cond_signal(&portaudio->cond);
 
   return 0;
 }
@@ -115,6 +115,8 @@ VALUE rb_portaudio_start(VALUE self)
   Data_Get_Struct(self, Portaudio, portaudio);
   int err = Pa_StartStream(portaudio->stream);
 
+  pthread_cond_broadcast(&portaudio->cond);
+
   if (err != paNoError) {
     rb_raise(rb_eStandardError, "%s", Pa_GetErrorText(err));
   }
@@ -128,6 +130,8 @@ VALUE rb_portaudio_stop(VALUE self)
   Data_Get_Struct(self, Portaudio, portaudio);
   int err = Pa_StopStream(portaudio->stream);
 
+  pthread_cond_broadcast(&portaudio->cond);
+
   if (err != paNoError) {
     rb_raise(rb_eStandardError, "%s", Pa_GetErrorText(err));
   }

data/lib/audite.rb

@@ -29,19 +29,18 @@ class Audite
   def start_thread
     Thread.start do
       loop do
-        @stream.write(process(4096))
+        @stream.write(process(4096 * 2))
       end
     end
   end
 
   def process(samples)
     if tell >= length
-      @thread.kill
-      events.trigger(:complete)
       stop_stream
+      events.trigger(:complete)
       (0..samples).map { 0 }
 
-    elsif slice = read(samples * 2)
+    elsif slice = read(samples)
       events.trigger(:level, level(slice))
       events.trigger(:position_change, position)
 
@@ -51,8 +50,8 @@ class Audite
     end
 
   rescue => e
-    puts e.message
-    puts e.backtrace
+    $stderr.puts e.message
+    $stderr.puts e.backtrace
   end
 
   def start_stream
@@ -78,6 +77,7 @@ class Audite
   end
 
   def load(file)
+    @file = file
     @mp3 = Mpg123.new(file)
   end
 
@@ -118,11 +118,13 @@ class Audite
   end
 
   def seek(seconds)
-    samples = seconds_to_samples(seconds)
+    if @mp3
+      samples = seconds_to_samples(seconds)
 
-    if (0..length).include?(samples)
-      @mp3.seek(samples)
-      events.trigger(:position_change, position)
+      if (0..length).include?(samples)
+        @mp3.seek(samples)
+        events.trigger(:position_change, position)
+      end
     end
   end
 
@@ -138,17 +140,11 @@ class Audite
     slice.inject(0) {|s, i| s + i.abs } / slice.size
   end
 
-  def rewind(seconds = 1)
-    if @mp3
-      start_stream
-      seek(position - seconds)
-    end
+  def rewind(seconds = 2)
+    seek(position - seconds)
   end
 
-  def forward(seconds = 1)
-    if @mp3
-      start_stream
-      seek(position + seconds)
-    end
+  def forward(seconds = 2)
+    seek(position + seconds)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audite
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies: []
 description: Portable mp3 player built on mpg123 and portaudio
 email: matti.georgi@gmail.com