audite 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: baea4463996cab05f7b2fc2b73c86bed0e7b1edd
+  data.tar.gz: 2a8c6dfa90bc9cfc1dd793facd86345ebd00ad2f
+SHA512:
+  metadata.gz: bda5687a14156ab552215563734a27dee5f28f97cbeb5261c33abd25eda7d4ad32264c67aa9ce443ef70db5b98de8519308f4e49af513bccc115bdd1f0591f20
+  data.tar.gz: 24d8c3007ffc63487689f23b5430be017cd8ba0c88193e61800c58d57a87f21e1d25fdccd31a8ad593956e09a61aa95f963d1a04e3e8b4e54560d2482b381a24

data/.gitignore

@@ -3,3 +3,4 @@
 ext/*/Makefile
 ext/*/*.o
 ext/*/*.bundle
+Gemfile.lock

data/Gemfile

@@ -1,5 +1,4 @@
-source "http://rubygems.org"
-group :test do
-  gem "rspec", :require => "spec"
-end
+source 'https://rubygems.org'
 
+# Specify your gem's dependencies in audite.gemspec
+gemspec

data/README.md

@@ -31,17 +31,14 @@ player.events.on(:complete) do
   puts "COMPLETE"
 end
 
-player.events.on(:level) do |level|
-  puts "LEVEL: #{level}"
-end
-
 player.events.on(:position_change) do |pos|
-  puts "POSITION: #{pos} seconds"
+  puts "POSITION: #{pos} seconds  level #{player.level}"
 end
 
 player.load('test.mp3')
 player.start_stream
-player.forward(20) 
+player.forward(20)
+player.thread.join
 
 ```
 
@@ -62,6 +59,7 @@ gem install audite
 
 ## Debian / Ubuntu Install
 ```
+apt-get install libjack0 libjack-dev
 apt-get install libportaudiocpp0 portaudio19-dev libmpg123-dev
 gem install audite
 ```

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/audite.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = "audite"
-  s.version       = "0.3.0"
+  s.version       = "0.4.0"
   s.author        = "Matthias Georgi"
   s.email         = "matti.georgi@gmail.com"
   s.homepage      = "http://georgi.github.com/audite"
@@ -14,6 +14,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+
   s.extra_rdoc_files = ["README.md"]
 
   s.extensions << 'ext/mpg123/extconf.rb'

data/bin/audite

@@ -1,21 +1,15 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'curses'
-
-require_relative '../lib/audite'
+require 'audite'
 
 player = Audite.new
 
-player.events.on(:complete) do
-  exit
-end
-
 player.events.on(:position_change) do |pos|
   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.addstr("playing #{player.current_song_name}    #{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)
@@ -23,12 +17,18 @@ player.events.on(:position_change) do |pos|
   Curses.refresh
 end
 
+player.events.on(:complete) do
+  if !player.active
+    player.close
+  end
+end
+
 Curses.init_screen
 Curses.noecho
 Curses.stdscr.keypad(true)
 Curses.clear
 
-player.load(ARGV[0])
+player.load(ARGV)
 player.start_stream
 
 while c = Curses.getch
@@ -41,3 +41,5 @@ while c = Curses.getch
     player.toggle
   end
 end
+
+player.thread.join

data/ext/mpg123/mpg123.c

@@ -39,7 +39,14 @@ VALUE rb_mpg123_new(VALUE klass, VALUE filename) {
   mpg123_format_none(mh);
   mpg123_format(mh, rate, channels, encoding);
 
-  return Data_Wrap_Struct(rb_cMpg123, 0, cleanup, mh);
+  VALUE new_mpg123 = Data_Wrap_Struct(rb_cMpg123, 0, cleanup, mh);
+  rb_iv_set(new_mpg123, "@file", filename);
+  return new_mpg123;
+}
+
+static VALUE rb_mpg123_file(VALUE self, VALUE obj)
+{
+  return rb_iv_get(self, "@file");
 }
 
 VALUE rb_mpg123_close(VALUE self)
@@ -48,7 +55,6 @@ VALUE rb_mpg123_close(VALUE self)
   return self;
 }
 
-
 VALUE rb_mpg123_read(VALUE self, VALUE _size)
 {
   int size = FIX2INT(_size);
@@ -77,6 +83,14 @@ VALUE rb_mpg123_read(VALUE self, VALUE _size)
 
 VALUE rb_mpg123_length(VALUE self)
 {
+  /*
+   * mpg123_length() only returns an estimated duration
+   * if the song hasn't previously been scanned.
+   * This can be incorrect if, for example, the song is corrupted
+   * and cannot be played after a certain point.
+   * Run mpg123_scan() first to get an accurate length reading.
+   */
+  mpg123_scan(DATA_PTR(self));
   return INT2FIX(mpg123_length(DATA_PTR(self)));
 }
 
@@ -128,6 +142,8 @@ void Init_mpg123(void) {
 
   rb_define_singleton_method(rb_cMpg123, "new", rb_mpg123_new, 1);
 
+  rb_define_method(rb_cMpg123, "file", rb_mpg123_file, 0);
+
   rb_define_method(rb_cMpg123, "close", rb_mpg123_close, 0);
   rb_define_method(rb_cMpg123, "read", rb_mpg123_read, 1);
   rb_define_method(rb_cMpg123, "length", rb_mpg123_length, 0);

data/ext/portaudio/portaudio.c

@@ -124,6 +124,7 @@ VALUE rb_portaudio_write_from_mpg(VALUE self, VALUE mpg)
   switch (err) {
     case MPG123_OK: return ID2SYM(rb_intern("ok"));
     case MPG123_DONE: return ID2SYM(rb_intern("done"));
+    case MPG123_NEED_MORE: return ID2SYM(rb_intern("need_more"));
   }
 
   rb_raise(rb_eStandardError, "%s", mpg123_plain_strerror(err));
@@ -134,9 +135,8 @@ 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);
+  rb_thread_call_without_gvl(portaudio_wait, portaudio, RUBY_UBF_IO, NULL);
 #else
   portaudio_wait(portaudio);
 #endif
@@ -201,6 +201,36 @@ VALUE rb_portaudio_stop(VALUE self)
   return self;
 }
 
+VALUE rb_portaudio_stream_stopped(VALUE self)
+{
+  Portaudio *portaudio;
+  Data_Get_Struct(self, Portaudio, portaudio);
+  int err = Pa_IsStreamStopped(portaudio->stream);
+
+  if (err == 1) {
+    return Qtrue;
+  } else if (err == 0) {
+    return Qfalse;
+  }
+
+  rb_raise(rb_eStandardError, "%s", Pa_GetErrorText(err));
+}
+
+VALUE rb_portaudio_close(VALUE self)
+{
+  Portaudio *portaudio;
+  Data_Get_Struct(self, Portaudio, portaudio);
+  int err = Pa_CloseStream(portaudio->stream);
+
+  pthread_cond_broadcast(&portaudio->cond);
+
+  if (err != paNoError) {
+    rb_raise(rb_eStandardError, "%s", Pa_GetErrorText(err));
+  }
+
+  return self;
+}
+
 void Init_portaudio(void) {
   int err = Pa_Initialize();
 
@@ -212,6 +242,8 @@ void Init_portaudio(void) {
 
   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, "stopped?", rb_portaudio_stream_stopped, 0);
+  rb_define_method(rb_cPortaudio, "close", rb_portaudio_close, 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);

data/lib/audite.rb

@@ -1,6 +1,8 @@
 require 'portaudio'
 require 'mpg123'
 
+trap('INT') { puts "\nClosing" ; exit }
+
 class Audite
   class Events
     def initialize
@@ -18,16 +20,17 @@ class Audite
     end
   end
 
-  attr_reader :events, :active
+  attr_reader :events, :active, :stream, :mp3, :thread, :file, :song_list
 
   def initialize(buffer_size = 2**12)
     @buffer_size = buffer_size
     @events = Events.new
     @stream = Portaudio.new(@buffer_size)
+    @song_list = []
   end
 
   def start_thread
-    Thread.start do
+    @thread ||= Thread.start do
       loop do
         process @stream.write_from_mpg(@mp3)
         @stream.wait
@@ -40,8 +43,8 @@ class Audite
   end
 
   def process(status)
-    if status == :done
-      stop_stream
+    if [:done, :need_more].include? status
+      request_next_song
       events.trigger(:complete)
     else
       events.trigger(:position_change, position)
@@ -52,17 +55,41 @@ class Audite
     $stderr.puts e.backtrace
   end
 
+  def current_song_name
+    File.basename mp3.file
+  end
+
+  def request_next_song
+    if songs_in_queue?
+      set_current_song
+      start_stream
+    else
+      stop_stream
+    end
+  end
+
+  def close
+    stream.close
+    exit
+  end
+
   def start_stream
-    unless @active
+    unless @active || !song_loaded?
       @active = true
       @stream.start
+      start_thread
+      events.trigger(:toggle, @active)
     end
   end
 
   def stop_stream
     if @active
       @active = false
-      @stream.stop
+      @thread = nil unless @thread.alive?
+      unless @stream.stopped?
+        @stream.stop
+        events.trigger(:toggle, @active)
+      end
     end
   end
 
@@ -74,10 +101,31 @@ class Audite
     end
   end
 
-  def load(file)
-    @file = file
-    @mp3 = Mpg123.new(file)
-    @thread ||= start_thread
+  def load(files)
+    files = [] << files unless Array === files
+    files.each {|file| queue file }
+    set_current_song
+  end
+
+  def song_loaded?
+    !@mp3.nil?
+  end
+
+  def set_current_song
+    @mp3 = song_list.shift
+    start_thread
+  end
+
+  def queue song
+    @song_list << Mpg123.new(song)
+  end
+
+  def queued_songs
+    @song_list.map {|s| File.basename s.file }
+  end
+
+  def songs_in_queue?
+    !@song_list.empty?
   end
 
   def time_per_frame

metadata

@@ -1,16 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: audite
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Matthias Georgi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
-dependencies: []
+date: 2015-01-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Portable mp3 player built on mpg123 and portaudio
 email: matti.georgi@gmail.com
 executables:
@@ -21,10 +62,11 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - audite.gemspec
 - bin/audite
 - ext/mpg123/extconf.rb
@@ -36,26 +78,25 @@ files:
 - spec/audite_spec.rb
 homepage: http://georgi.github.com/audite
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Portable mp3 player
 test_files: []