audite 0.2.0 → 0.3.0

data/audite.gemspec

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

data/bin/audite

@@ -1,30 +1,25 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'audite'
 require 'curses'
 
+require_relative '../lib/audite'
+
 player = Audite.new
-player.load(ARGV[0])
-player.start_stream
 
 player.events.on(:complete) do
   exit
 end
 
-player.events.on(:level) do |level|
-  p = (level * Curses.cols).ceil
-  Curses.setpos(2, 0)
-  Curses.addstr(">" * p + " " * (Curses.cols - p))
-  Curses.refresh
-end
-
 player.events.on(:position_change) do |pos|
-  p = ((pos / player.length_in_seconds) * Curses.cols).ceil
+  p = (player.tell / player.length * Curses.cols).ceil
+  l = (player.level * Curses.cols).ceil
   Curses.setpos(0, 0)
   Curses.addstr("playing #{ARGV[0]}    #{player.position.ceil} seconds of #{player.length_in_seconds.ceil} total")
   Curses.setpos(1, 0)
   Curses.addstr("#" * p + " " * (Curses.cols - p))
+  Curses.setpos(2, 0)
+  Curses.addstr(">" * l + " " * (Curses.cols - l))
   Curses.refresh
 end
 
@@ -33,6 +28,9 @@ Curses.noecho
 Curses.stdscr.keypad(true)
 Curses.clear
 
+player.load(ARGV[0])
+player.start_stream
+
 while c = Curses.getch
   case c
   when Curses::KEY_LEFT

data/ext/portaudio/portaudio.c

@@ -1,11 +1,14 @@
 #include <ruby.h>
+#include <math.h>
 #include <pthread.h>
 #include <portaudio.h>
+#include <mpg123.h>
 
 typedef struct {
   PaStream *stream;
   int size;
   float *buffer;
+  float rms;
   pthread_mutex_t mutex;
   pthread_cond_t cond;
 } Portaudio;
@@ -41,9 +44,7 @@ static int paCallback(const void *inputBuffer,
 
   pthread_mutex_lock(&portaudio->mutex);
 
-  for (i = 0; i < framesPerBuffer * 2; i++) {
-    *out++ = portaudio->buffer[i];
-  }
+  memcpy(out, portaudio->buffer, sizeof(float) * portaudio->size);
 
   pthread_cond_broadcast(&portaudio->cond);
   pthread_mutex_unlock(&portaudio->mutex);
@@ -94,6 +95,54 @@ VALUE portaudio_wait(void *ptr)
   return Qnil;
 }
 
+float rms(float *v, int n)
+{
+  int i;
+  float sum = 0.0;
+
+  for (i = 0; i < n; i++) {
+    sum += v[i] * v[i];
+  }
+
+  return sqrt(sum / n);
+}
+
+VALUE rb_portaudio_write_from_mpg(VALUE self, VALUE mpg)
+{
+  int err;
+  size_t done = 0;
+  Portaudio *portaudio;
+  mpg123_handle *mh = NULL;
+
+  Data_Get_Struct(self, Portaudio, portaudio);
+  Data_Get_Struct(mpg, mpg123_handle, mh);
+
+  err = mpg123_read(mh, (unsigned char *) portaudio->buffer, portaudio->size * sizeof(float), &done);
+
+  portaudio->rms = rms(portaudio->buffer, portaudio->size);
+
+  switch (err) {
+    case MPG123_OK: return ID2SYM(rb_intern("ok"));
+    case MPG123_DONE: return ID2SYM(rb_intern("done"));
+  }
+
+  rb_raise(rb_eStandardError, "%s", mpg123_plain_strerror(err));
+}
+
+VALUE rb_portaudio_wait(VALUE self)
+{
+  Portaudio *portaudio;
+  Data_Get_Struct(self, Portaudio, portaudio);
+
+  Data_Get_Struct(self, Portaudio, portaudio);
+#ifdef RUBY_UBF_IO
+  rb_thread_blocking_region(portaudio_wait, portaudio, RUBY_UBF_IO, NULL);
+#else
+  portaudio_wait(portaudio);
+#endif
+  return self;
+}
+
 VALUE rb_portaudio_write(VALUE self, VALUE buffer)
 {
   int i, len;
@@ -112,15 +161,16 @@ VALUE rb_portaudio_write(VALUE self, VALUE buffer)
     portaudio->buffer[i] = NUM2DBL(rb_ary_entry(buffer, i));
   }
 
-#ifdef RUBY_UBF_IO
-  rb_thread_blocking_region(portaudio_wait, portaudio, RUBY_UBF_IO, NULL);
-#else
-  portaudio_wait(portaudio);
-#endif
-
   return self;
 }
 
+VALUE rb_portaudio_rms(VALUE self)
+{
+  Portaudio *portaudio;
+  Data_Get_Struct(self, Portaudio, portaudio);
+  return rb_float_new(portaudio->rms);
+}
+
 VALUE rb_portaudio_start(VALUE self)
 {
   Portaudio *portaudio;
@@ -161,7 +211,10 @@ void Init_portaudio(void) {
   rb_cPortaudio = rb_define_class("Portaudio", rb_cObject);
 
   rb_define_singleton_method(rb_cPortaudio, "new", rb_portaudio_new, 1);
+  rb_define_method(rb_cPortaudio, "wait", rb_portaudio_wait, 0);
+  rb_define_method(rb_cPortaudio, "rms", rb_portaudio_rms, 0);
   rb_define_method(rb_cPortaudio, "write", rb_portaudio_write, 1);
+  rb_define_method(rb_cPortaudio, "write_from_mpg", rb_portaudio_write_from_mpg, 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,37 +20,31 @@ class Audite
 
   attr_reader :events, :active
 
-  def initialize(buffer_size = 2**14)
+  def initialize(buffer_size = 2**12)
     @buffer_size = buffer_size
     @events = Events.new
     @stream = Portaudio.new(@buffer_size)
-    @thread = start_thread
   end
 
   def start_thread
     Thread.start do
       loop do
-        @stream.write(process(@buffer_size * 2))
+        process @stream.write_from_mpg(@mp3)
+        @stream.wait
       end
     end
   end
 
-  def silence(samples)
-    Array.new(samples, 0)
+  def level
+    @stream.rms
   end
 
-  def process(samples)
-    if tell >= length
+  def process(status)
+    if status == :done
       stop_stream
       events.trigger(:complete)
-      silence(samples)
-
-    elsif slice = read(samples)
-      events.trigger(:level, level(slice))
-      events.trigger(:position_change, position)
-      slice
     else
-      silence(samples)
+      events.trigger(:position_change, position)
     end
 
   rescue => e
@@ -83,6 +77,7 @@ class Audite
   def load(file)
     @file = file
     @mp3 = Mpg123.new(file)
+    @thread ||= start_thread
   end
 
   def time_per_frame
@@ -101,10 +96,6 @@ class Audite
     @mp3 ? @mp3.length : 0
   end
 
-  def read(samples)
-    @mp3.read(samples)
-  end
-
   def seconds_to_frames(seconds)
     seconds / time_per_frame
   end
@@ -140,10 +131,6 @@ class Audite
     samples_to_seconds(length)
   end
 
-  def level(slice)
-    slice.map {|i| i.abs }.max
-  end
-
   def rewind(seconds = 2)
     seek(position - seconds)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies: []
 description: Portable mp3 player built on mpg123 and portaudio
 email: matti.georgi@gmail.com
@@ -59,4 +59,3 @@ signing_key:
 specification_version: 3
 summary: Portable mp3 player
 test_files: []
-has_rdoc: