easy_mplayer 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/easy_mplayer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy_mplayer}
-  s.version = "1.1.0"
+  s.version = "1.2.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-09}
+  s.date = %q{2010-01-10}
   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 = [

data/lib/easy_mplayer/main.rb

@@ -4,7 +4,6 @@ class MPlayer
     :program               => '/usr/bin/mplayer',
     :message_style         => :info,
     :seek_size             => 10,
-    :select_wait_time      => 1,
     :thread_safe_callbacks => true
   }
   
@@ -59,8 +58,6 @@ class MPlayer
   #     :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)
@@ -91,16 +88,6 @@ class MPlayer
     stop!
   end
 
-  callback :played_time do |played_time|
-    update_stat :played_seconds, played_time.to_i
-    total = stats[:total_time]
-    if total and total != 0.0
-      pos = (100 * played_time / total)
-      update_stat :raw_position, pos
-      update_stat :position,     pos.to_i
-    end
-  end
-  
   callback :startup do
     callback! :play
   end

data/lib/easy_mplayer/worker.rb

@@ -1,3 +1,5 @@
+require 'fcntl'
+
 class MPlayer
   class Worker # :nodoc:all
     include ColorDebugMessages
@@ -18,9 +20,17 @@ class MPlayer
           :re   => /^ICY Info: StreamTitle='(.*?)';StreamUrl='(.*?)';/,
           :stat => [:stream_title, :stream_url]
         },
-        :update_position => {
-          :re   => /^A:\s+(\d+\.\d+)\s+\(\S+\)\s+of\s+(\d+\.\d+)/,
-          :stat => [:played_time, :total_time],
+        :position_percent => {
+          :re   => /^ANS_PERCENT_POSITION=(\d+[.0-9]*)/,
+          :stat => [:position]
+        },
+        :position_seconds => {
+          :re   => /^ANS_TIME_POSITION=(\d+[.0-9]*)/,
+          :stat => [:played_seconds]
+        },
+        :total_time => {
+          :re   => /^ANS_LENGTH=(\d+[.0-9]*)/,
+          :stat => [:total_time]
         },
         :audio_info => {
           :re   => /^AUDIO: (\d+) Hz, (\d+) ch, (\S+), ([0-9.]+) kbit/,
@@ -131,28 +141,24 @@ class MPlayer
         end
       end
 
-      def process_line
-        # debug "LINE> \"#{@line}\""
-        send "process_#{@type}", @line
-        # callback! @type, @line
-        @line = ''
+      def process_line(line)
+        # debug "LINE> \"#{line}\""
+        send "process_#{@type}", line
+        # callback! @type, line
       end
 
       def process_stream
-        result = IO.select([@io], nil, nil, @select_wait_time)
-        return if result.nil? or result.empty?
-
-        c = @io.read(1)
-        return stream_error(:eof) if c.nil?
-        
-        @line << c
-        process_line if c == "\n" or c == "\r"
+        lines = @io.gets("\r") or return stream_error(:eof)
+        lines.split(/\n/).each do |line|
+          process_line(line.chomp)
+        end
       end
-
+      
       def run
         @thread = Thread.new do
           @alive = true
           begin
+            # @io.fcntl(Fcntl::F_SETFL,Fcntl::O_NONBLOCK)
             debug "start"
             process_stream while @alive
             debug "clean end!"
@@ -216,6 +222,7 @@ class MPlayer
 
     def cmdline(target = parent.opts[:path])
       cmd = "#{parent.opts[:program]} -slave "
+      cmd += "-wid #{parent.opts[:embed]} " if parent.opts[:embed]
       cmd += "-playlist " if target=~ /\.m3u$/
       cmd += target.to_s
     end
@@ -298,6 +305,7 @@ class MPlayer
     end
 
     def ok?
+      get_position
       dispatch_callbacks
       err = nil
       lock! do
@@ -322,7 +330,13 @@ class MPlayer
       @io_stdin = nil
     end
 
+    def get_position
+      send_command :get_time_pos
+      send_command :get_percent_pos
+    end
+
     def startup!
+      send_command :get_time_length
       @parent.callback! :startup
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: easy_mplayer
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Brent Sanders
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 -08:00
+date: 2010-01-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency