audite 0.1.6 → 0.2.0

data/README.md

@@ -28,15 +28,15 @@ require 'audite'
 player = Audite.new
 
 player.events.on(:complete) do
-  exit
+  puts "COMPLETE"
 end
 
 player.events.on(:level) do |level|
-  puts level
+  puts "LEVEL: #{level}"
 end
 
 player.events.on(:position_change) do |pos|
-  puts pos
+  puts "POSITION: #{pos} seconds"
 end
 
 player.load('test.mp3')
@@ -45,6 +45,11 @@ player.forward(20)
 
 ```
 
+## Requirements
+
+* Portaudio >= 19
+* Mpg123 >= 1.14
+
 ## OSX Install
 
 ```

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.6"
+  s.version       = "0.2.0"
   s.author        = "Matthias Georgi"
   s.email         = "matti.georgi@gmail.com"
   s.homepage      = "http://georgi.github.com/audite"

data/ext/portaudio/portaudio.c

@@ -51,7 +51,7 @@ static int paCallback(const void *inputBuffer,
   return 0;
 }
 
-VALUE rb_portaudio_new(VALUE klass)
+VALUE rb_portaudio_new(VALUE klass, VALUE framesPerBuffer)
 {
   PaStreamParameters outputParameters;
   const PaDeviceInfo *deviceInfo;
@@ -63,16 +63,16 @@ VALUE rb_portaudio_new(VALUE klass)
   pthread_mutex_init(&portaudio->mutex, NULL);
   pthread_cond_init(&portaudio->cond, NULL);
 
-  portaudio->size = 4096 * 2;
+  portaudio->size = FIX2INT(framesPerBuffer) * 2;
   portaudio->buffer = (float *) malloc(sizeof(float) * portaudio->size);
 
   err = Pa_OpenDefaultStream(&portaudio->stream,
                              0,           /* no input channels */
                              2,           /* stereo output */
                              paFloat32,   /* 32 bit floating point output */
-                             44100,       /* 44100 sample rate*/
-                             4096,        /* frames per buffer */
-                             paCallback,  /* this is your callback function */
+                             44100,       /* sample rate*/
+                             FIX2INT(framesPerBuffer),
+                             paCallback,
                              (void*) portaudio);
 
   if (err != paNoError) {
@@ -96,13 +96,19 @@ VALUE portaudio_wait(void *ptr)
 
 VALUE rb_portaudio_write(VALUE self, VALUE buffer)
 {
-  int i;
+  int i, len;
   Portaudio *portaudio;
   Data_Get_Struct(self, Portaudio, portaudio);
 
   Check_Type(buffer, T_ARRAY);
 
-  for (i = 0; i < portaudio->size; i++) {
+  len = RARRAY_LEN(buffer);
+
+  if (len != portaudio->size) {
+    rb_raise(rb_eStandardError, "array length does not match buffer size: %d != %d", len, portaudio->size);
+  }
+
+  for (i = 0; i < len; i++) {
     portaudio->buffer[i] = NUM2DBL(rb_ary_entry(buffer, i));
   }
 
@@ -154,7 +160,7 @@ void Init_portaudio(void) {
 
   rb_cPortaudio = rb_define_class("Portaudio", rb_cObject);
 
-  rb_define_singleton_method(rb_cPortaudio, "new", rb_portaudio_new, 0);
+  rb_define_singleton_method(rb_cPortaudio, "new", rb_portaudio_new, 1);
   rb_define_method(rb_cPortaudio, "write", rb_portaudio_write, 1);
   rb_define_method(rb_cPortaudio, "start", rb_portaudio_start, 0);
   rb_define_method(rb_cPortaudio, "stop", rb_portaudio_stop, 0);

data/lib/audite.rb

@@ -20,33 +20,37 @@ class Audite
 
   attr_reader :events, :active
 
-  def initialize
+  def initialize(buffer_size = 2**14)
+    @buffer_size = buffer_size
     @events = Events.new
-    @stream = Portaudio.new
+    @stream = Portaudio.new(@buffer_size)
     @thread = start_thread
   end
 
   def start_thread
     Thread.start do
       loop do
-        @stream.write(process(4096 * 2))
+        @stream.write(process(@buffer_size * 2))
       end
     end
   end
 
+  def silence(samples)
+    Array.new(samples, 0)
+  end
+
   def process(samples)
     if tell >= length
       stop_stream
       events.trigger(:complete)
-      (0..samples).map { 0 }
+      silence(samples)
 
     elsif slice = read(samples)
       events.trigger(:level, level(slice))
       events.trigger(:position_change, position)
-
       slice
     else
-      (0..samples).map { 0 }
+      silence(samples)
     end
 
   rescue => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audite
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: