plllayer 0.0.2 → 0.0.3

data/lib/plllayer/single_player.rb

@@ -2,6 +2,9 @@ class Plllayer
   # Raise this exception when the file at the given track path doesn't exist.
   FileNotFoundError = Class.new(ArgumentError)
 
+  # Raise this one when the file can't be played for whatever reason
+  InvalidAudioFileError = Class.new(ArgumentError)
+
   # A SinglePlayer takes care of playing a single track, and controlling the
   # playback with commands like pause, resume, seek, and so on. It probably
   # starts an external audio player process to do this job. This class is an

data/lib/plllayer/single_players/mplayer.rb

@@ -37,8 +37,10 @@ class Plllayer
 
         # This should skip past mplayer's initial lines of output so we can
         # start reading its replies to our commands.
-        until @stdout.gets["playback"]
-        end
+        begin
+          line = @stdout.gets
+          raise InvalidAudioFileError, "file '#{track_path}' isn't a valid audio file" if line.nil?
+        end until line.chomp == "Starting playback..."
 
         @paused = false
         @track_path = track_path
@@ -46,7 +48,9 @@ class Plllayer
         # Persist the previous speed, volume, and mute properties into this
         # process.
         self.speed = @speed
+        muted = @muted
         self.volume = @volume
+        @muted = muted
         mute if @muted
 
         # Start a thread that waits for the mplayer process to end, then calls
@@ -61,6 +65,8 @@ class Plllayer
           on_end.call
         end
 
+        at_exit { stop }
+
         true
       end
 
@@ -68,6 +74,10 @@ class Plllayer
         _quit
       end
 
+      def paused?
+        @paused
+      end
+
       def pause
         if not @paused
           @paused = true
@@ -148,6 +158,14 @@ class Plllayer
         answer ? (answer.to_f * 1000).to_i : false
       end
 
+      def log_start!
+        @log = true
+      end
+
+      def log_stop!
+        @log = false
+      end
+
       private
 
       # Issue a command to mplayer through the slave protocol. False is returned
@@ -169,12 +187,15 @@ class Plllayer
 
           # Send the command to mplayer.
           @stdin.puts cmd
+          File.open("log", "a") { |f| f << cmd << "\n" } if @log
 
           if options[:expect_answer]
             # Read lines of output from mplayer until we get an actual message.
             answer = "\n"
             while answer == "\n"
-              answer = @stdout.gets.sub("\e[A\r\e[K", "")
+              answer = @stdout.gets
+              File.open("log", "a") { |f| f << answer } if @log
+              answer.sub! "\e[A\r\e[K", ""
               answer = "\n" if options[:expect_answer].is_a?(Regexp) && answer !~ options[:expect_answer]
             end
 

data/lib/plllayer/single_players/nop.rb

@@ -0,0 +1,149 @@
+class Plllayer
+  module SinglePlayers
+    # This is the SinglePlayer implentation used for testing. It doesn't actually
+    # do anything, it just pretends to play a music file using sleeps.
+    class Nop < Plllayer::SinglePlayer
+      attr_reader :track_path
+
+      def initialize
+        @paused = false
+        @muted = false
+        @volume = 50
+        @speed = 1.0
+        @track_path = nil
+      end
+
+      def playing?
+        not @track_path.nil?
+      end
+
+      def play(track_path, &on_end)
+        _quit
+
+        # Make sure the audio file exists.
+        raise FileNotFoundError, "file '#{track_path}' doesn't exist" unless File.exists? track_path
+
+        @paused = false
+        @track_path = track_path
+
+        # Assume the filename starts with the song length in milliseconds, so we
+        # don't actually have to read the file.
+        @total_time = File.basename(@track_path, ".*").to_i
+        @time_left = @total_time
+        @last_tick = Time.now
+
+        @quit_hook_active = false
+        @quit_hook = Thread.new do
+          while @time_left > 0
+            unless @paused
+              @time_left -= ((Time.now - @last_tick) * 1000 * @speed).to_i
+            end
+            @last_tick = Time.now
+            sleep 0.01
+          end
+          @quit_hook_active = true
+          @paused = false
+          @track_path = nil
+          @started = nil
+          on_end.call
+        end
+
+        true
+      end
+
+      def stop
+        _quit
+      end
+
+      def paused?
+        @paused
+      end
+
+      def pause
+        if not @paused and playing?
+          @paused = true
+        else
+          false
+        end
+      end
+
+      def resume
+        if @paused
+          @paused = false
+          true
+        else
+          false
+        end
+      end
+
+      def seek(where, type = :absolute)
+        if playing?
+          case type
+          when :absolute
+            @time_left = @total_time - where
+          when :relative
+            @time_left -= where
+          when :percent
+            @time_left = @total_time - (@total_time * where) / 100
+          end
+          true
+        else
+          false
+        end
+      end
+
+      def speed
+        @speed
+      end
+
+      def speed=(new_speed)
+        @speed = new_speed.to_f
+        true
+      end
+
+      def muted?
+        @muted
+      end
+
+      def mute
+        @muted = true
+      end
+
+      def unmute
+        @muted = false
+        true
+      end
+
+      def volume
+        @volume
+      end
+
+      def volume=(new_volume)
+        @muted = false
+        @volume = new_volume.to_f
+        true
+      end
+
+      def position
+        playing? ? @total_time - @time_left : false
+      end
+
+      def track_length
+        playing? ? @total_time : false
+      end
+
+      private
+
+      def _quit
+        if playing?
+          @quit_hook.kill unless @quit_hook_active
+          @paused = false
+          @track_path = nil
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/plllayer/time_helpers.rb

@@ -4,6 +4,8 @@ class Plllayer
     # "1:03:56.555". The only option is :include_milliseconds, true by default. If
     # false, milliseconds won't be included in the formatted string.
     def format_time(milliseconds, options = {})
+      raise ArgumentError, "can't format negative time" if milliseconds < 0
+
       ms = milliseconds % 1000
       seconds = (milliseconds / 1000) % 60
       minutes = (milliseconds / 60000) % 60
@@ -25,8 +27,12 @@ class Plllayer
     # Helper method to parse a string like "1:03:56.555" and return the number of
     # milliseconds that time length represents.
     def parse_time(string)
-      parts = string.split(":").map(&:to_f)
-      parts = [0] + parts if parts.length == 2
+      parts = string.split(":", -1).map(&:to_f)
+
+      raise ArgumentError, "too many parts" if parts.length > 3
+      raise ArgumentError, "can't parse negative numbers" if parts.any? { |x| x < 0 }
+
+      parts.unshift(0) until parts.length == 3
       hours, minutes, seconds = parts
       seconds = hours * 3600 + minutes * 60 + seconds
       milliseconds = seconds * 1000

data/lib/plllayer.rb

@@ -3,6 +3,7 @@ require "open4"
 require "plllayer/time_helpers.rb"
 require "plllayer/single_player"
 require "plllayer/single_players/mplayer"
+require "plllayer/single_players/nop"
 
 # Plllayer provides an interface to an external media player, such as mplayer. It
 # contains a playlist of tracks, which may be as simple as an Array of paths to
@@ -14,7 +15,8 @@ class Plllayer
   extend TimeHelpers
 
   SINGLE_PLAYERS = {
-    mplayer: Plllayer::SinglePlayers::MPlayer
+    mplayer: Plllayer::SinglePlayers::MPlayer,
+    nop: Plllayer::SinglePlayers::Nop
   }
 
   attr_reader :repeat_mode
@@ -47,9 +49,6 @@ class Plllayer
     @paused = false
     @playing = false
     @repeat_mode = nil
-
-    # Make sure the music stops playing once the Ruby script is exited.
-    at_exit { stop }
   end
 
   # Append tracks to the playlist. Can be done while the playlist is playing.

data/plllayer.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "plllayer"
-  s.version = "0.0.2"
-  s.date = "2013-01-31"
+  s.version = "0.0.3"
+  s.date = "2013-02-05"
   s.summary = "An audio playback library for Ruby."
   s.description = "plllayer is an audio playback library for Ruby. It is a Ruby interface to some external media player, such as mplayer."
   s.author = "Jeremy Ruten"
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency gem_name
   end
 
-  %w(rake).each do |gem_name|
+  %w(rake rspec).each do |gem_name|
     s.add_development_dependency gem_name
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plllayer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-31 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: plllayer is an audio playback library for Ruby. It is a Ruby interface
   to some external media player, such as mplayer.
 email: jeremy.ruten@gmail.com
@@ -72,6 +88,7 @@ files:
 - plllayer.gemspec
 - lib/plllayer/single_player.rb
 - lib/plllayer/single_players/mplayer.rb
+- lib/plllayer/single_players/nop.rb
 - lib/plllayer/time_helpers.rb
 - lib/plllayer.rb
 homepage: http://github.com/yjerem/plllayer