easy_mplayer 1.0.0 → 1.1.0

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "easy_mplayer"
     gem.summary = "Wrapper to launch and control MPlayer"
-    gem.description = "A wrapper to manage mplayer, that supports callbacks to easyily support event-driven GUIs"
+    gem.description = "A wrapper to manage mplayer, that supports callbacks to easily support event-driven GUIs"
     gem.email = "gem-mplayer@thoughtnoise.net"
     gem.homepage = "http://github.com/pdkl95/easy_mplayer"
     gem.authors = ["Brent Sanders"]

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/easy_mplayer.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy_mplayer}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brent Sanders"]
-  s.date = %q{2010-01-05}
-  s.description = %q{A wrapper to manage mplayer, that supports callbacks to easyily support event-driven GUIs}
+  s.date = %q{2010-01-09}
+  s.description = %q{A wrapper to manage mplayer, that supports callbacks to easily support event-driven GUIs}
   s.email = %q{gem-mplayer@thoughtnoise.net}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/easy_mplayer/helpers.rb

@@ -9,6 +9,7 @@ class MPlayer
   # spawn the mplayer process, which also starts the media playing. It
   # is requires that #opts[:path] point to a valid media file
   def play
+    must_be_ready!
     stop if running?
     
     info "PLAY: #{opts[:path]}"
@@ -24,6 +25,7 @@ class MPlayer
   
   # pause playback if we are running
   def pause
+    return unless running?
     return if paused?
     info "PAUSE!"
     send_command :pause
@@ -33,6 +35,7 @@ class MPlayer
   
   # opposite of #pause
   def unpause
+    return unless running?
     return unless paused?
     info "UNPAUSE!"
     send_command :pause
@@ -60,6 +63,7 @@ class MPlayer
   # seek to an absolute position in a file, by seconds. requires a
   # float between 0.0 and the length (in seconds) of the file being played.
   def seek_to_time(seconds)
+    return unless running?
     info "SEEK TO: #{seconds} seconds"
     send_command :seek, seconds, 1
   end
@@ -67,6 +71,7 @@ class MPlayer
   # seek by a relative amount, in seconds. requires a float. Negative
   # values rewind to a previous point.
   def seek_by(amount)
+    return unless running?
     info "SEEK BY: #{amount}"
     send_command :seek, amount, 0
   end

data/lib/easy_mplayer/main.rb

@@ -49,9 +49,21 @@ class MPlayer
     end
   end
   
-  # create a new object. The option hash must have, at a minimum, a
-  # :path reference to the file we want to play, or an exception will
-  # be raised.
+  # create a new object, with the named options
+  # valid options:
+  #     :program               Path to the mplayer binary itself
+  #                            (default: /usr/bin/mplayer)
+  #     :path                  Path to the media file to be played
+  #     :message_style         How verbose our debug messages should
+  #                            be (see #set_message_style)
+  #     :seek_size             Time, in seconds, to seek
+  #                            forwards/reverse by default (default:
+  #                            10 seconds)
+  #     :select_wait_time      Time, in seconds, for blocking on
+  #                            IO.select in the worker threads (default: 1)
+  #     :thread_safe_callbacks If we should buffer callbacks back to
+  #                            the main thread, so they are called off
+  #                            the #playing? polling-loop (default: true)
   def initialize(new_opts=Hash.new)
     @opts = DEFAULT_OPTS.merge(new_opts)
     set_message_style opts[:message_style]
@@ -59,9 +71,6 @@ class MPlayer
     unless File.executable?(@opts[:program])
       raise NoPlayerFound.new(@opts[:program]) 
     end
-    unless @opts[:path] and File.readable?(new_opts[:path])
-      raise NoTargetPath.new(@opts[:path]) 
-    end
     
     @stats     = Hash.new
     @callbacks = Hash.new
@@ -100,6 +109,26 @@ class MPlayer
     @worker = nil
     callback! :stop
   end
+  
+  # true if we can call #play without an exception
+  def ready?
+    @opts[:path] and File.readable?(@opts[:path])
+  end
+  
+  def must_be_ready! # :nodoc:
+    ready? or raise NoTargetPath.new(@opts[:path])
+  end
+  
+  # returns the path we are currently playing
+  def path
+    @opts[:path]
+  end
+  
+  # sets the path to #play - this does not interrupt a currently
+  # playing file. #stop and #play should be called again.
+  def path=(val)
+    @opts[:path] = val
+  end
 
   # can be any of:
   #   :quiet      Supperss all output!
@@ -172,7 +201,7 @@ class MPlayer
   def update_stat(name, newval) # :nodoc:
     name = name.to_sym
     if @stats[name] != newval
-      debug "STATS[:#{name}] -> #{newval.inspect}"
+      debug "STATS[:#{name}] #{@stats[name].inspect} -> #{newval.inspect}"
       @stats[name] = newval
       callback! name, newval
     end

data/lib/easy_mplayer/worker.rb

@@ -132,7 +132,7 @@ class MPlayer
       end
 
       def process_line
-        debug "LINE> \"#{@line}\""
+        # debug "LINE> \"#{@line}\""
         send "process_#{@type}", @line
         # callback! @type, @line
         @line = ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: easy_mplayer
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Brent Sanders
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -08:00
+date: 2010-01-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.8.0
     version: 
-description: A wrapper to manage mplayer, that supports callbacks to easyily support event-driven GUIs
+description: A wrapper to manage mplayer, that supports callbacks to easily support event-driven GUIs
 email: gem-mplayer@thoughtnoise.net
 executables: []