mmplayer 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60391f734494cf22b9e343379660079567721e8
-  data.tar.gz: 4d75bfe1d744172b82fc9866ef9e4af6735d68e4
+  metadata.gz: a7696f764235df86a1aa44baa06e9aac9f3d2aa3
+  data.tar.gz: 79bb9a6de61e332396a1ca14fba2f7bcf5e7c153
 SHA512:
-  metadata.gz: 64d867081ec9fb0b087076da7981aa978b7cc7ca704f01f7c6c8b4d0fa440c40383ecdc93171370e87ba91d0282d4bb6325aa7669c69118d60124c0bc1013054
-  data.tar.gz: 18ca9e448f75dc6d2d97cb071060ea5e49af680a991bb184cb55b9e752454f2a1a45d0073986b97e60182f9afc1d2688b20e87648a8d447a6589e26cbb563943
+  metadata.gz: 83026c50689a282c33c8463ec018159cc4f984d6e6cc51308dbe7440210e7452f3096e76f5a361b601666458c22885740b290a35d729f84ca8478bfb445dc66d
+  data.tar.gz: 2b84b86a16ee4a02ac0290575697967c5f1cb7e387ef6998d4478cd9e708f80c25822dbcf9f62907a07c2b5f5cc69a72c67fc86938fe46cf4381a34f1bebeb81

data/README.md

@@ -4,7 +4,7 @@
 
 Control [MPlayer](http://en.wikipedia.org/wiki/MPlayer) with MIDI
 
-MPlayer is a free, cross-platform, command-line driven, highly configurable, (often) GUI-less open-source media player. 
+MPlayer is a free, cross-platform, command-line driven, highly configurable, (often) GUI-less open-source media player.
 
 Enabling MPlayer to be controlled by MIDI opens up a host of possibilities for live video performance, media automation and more
 
@@ -14,9 +14,9 @@ This project provides a Ruby DSL to define realtime interactions between MIDI in
 
 You'll need to install MPlayer before using this.  That can usually be accomplished with a package manager eg `brew install mplayer` depending on what OS you're using.
 
-This project itself can be installed as a Ruby Gem using 
+This project itself can be installed as a Ruby Gem using
 
-`gem install mmplayer` 
+`gem install mmplayer`
 
 Or if you're using Bundler, add this to your Gemfile
 
@@ -34,13 +34,15 @@ require "mmplayer"
   rx_channel 0
 
   system(:start) { play("1.mov") }
-  
+
   note(1) { play("2.mov") }
   note("C2") { play("3.mov") }
 
   cc(1) { |value| volume(:set, value) }
   cc(20) { |value| seek(to_percent(value), :percent) }
 
+  eof { puts "finished" }
+
 end
 
 @player.start

data/lib/mmplayer.rb

@@ -24,7 +24,7 @@ require "mmplayer/player"
 
 module MMPlayer
 
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 
   # Shortcut to Context constructor
   def self.new(*args, &block)

data/lib/mmplayer/context.rb

@@ -27,10 +27,8 @@ module MMPlayer
     # @return [Boolean]
     def start(options = {})
       @midi.start
-      unless !!options[:background]
-        loop { sleep(0.1) } until @player.active?
-        loop { sleep(0.1) } while @player.active?
-      end
+      @playback_thread = playback_loop
+      @playback_thread.join unless !!options[:background]
       true
     end
 
@@ -42,6 +40,24 @@ module MMPlayer
       true
     end
 
+    private
+
+    # Main playback loop
+    def playback_loop
+      thread = Thread.new do
+        begin
+          until @player.active?
+            sleep(0.1)
+          end
+          @player.playback_loop
+        rescue Exception => exception
+          Thread.main.raise(exception)
+        end
+      end
+      thread.abort_on_exception = true
+      thread
+    end
+
   end
 
 end

data/lib/mmplayer/instructions/player.rb

@@ -5,6 +5,17 @@ module MMPlayer
     # Instructions dealing with the MPlayer
     module Player
 
+      # Assign a callback for when a file finishes playback
+      # @param [Proc] callback The callback to execute when a file finishes playback
+      # @return [Hash]
+      def on_end_of_file(&callback)
+        @player.add_end_of_file_callback(&callback)
+      end
+      alias_method :end_of_file, :on_end_of_file
+      alias_method :eof, :on_end_of_file
+
+      private
+
       # Add delegators to local player methods
       def self.included(base)
         base.send(:extend, Forwardable)

data/lib/mmplayer/player.rb

@@ -9,6 +9,10 @@ module MMPlayer
       @flags = "-fixed-vo -idle"
       @flags += " #{options[:flags]}" unless options[:flags].nil?
       @messenger = Messenger.new
+      @callback = {}
+      @is_playing = false
+      @is_eof_handled = true
+      @player_threads = []
     end
 
     # Play a media file
@@ -19,7 +23,10 @@ module MMPlayer
       if @player.nil?
         false
       else
-        @player.load_file(file)
+        with_player_thread do
+          @player.load_file(file)
+          handle_start
+        end
         true
       end
     end
@@ -27,7 +34,28 @@ module MMPlayer
     # Is MPlayer active?
     # @return [Boolean]
     def active?
-      !@player.nil? && !@player.stdout.gets.nil?
+      !@player.nil?
+    end
+
+    # Handle events while the player is running
+    # @return [Boolean]
+    def playback_loop
+      loop do
+        if @is_playing && !@is_eof_handled && get_player_output.size < 1
+          handle_eof
+        else
+          sleep(0.05)
+        end
+      end
+      true
+    end
+
+    # Add a callback to be called at the end of playback of a media file
+    # @param [Proc] block
+    # @return [Boolean]
+    def add_end_of_file_callback(&block)
+      @callback[:end_of_file] = block
+      true
     end
 
     # Media progress information
@@ -66,12 +94,33 @@ module MMPlayer
     # @return [Boolean]
     def quit
       @player.quit
-      @player_thread.kill
+      @player_threads.each(&:kill)
       true
     end
 
     private
 
+    # Get player output from stdout
+    def get_player_output
+      @player.stdout.gets.inspect.strip.gsub(/(\\n|[\\"])/, '').strip
+    end
+
+    # Handle the end of playback for a single media file
+    def handle_eof
+      @is_eof_handled = true
+      @is_playing = false
+      STDOUT.flush
+      @callback[:end_of_file].call unless @callback[:end_of_file].nil?
+      true
+    end
+
+    # Handle the beginning of playback for a single media file
+    def handle_start
+      loop until get_player_output.size > 1
+      @is_playing = true
+      @is_eof_handled = false
+    end
+
     # Get progress percentage from the MPlayer report
     def get_percentage(report)
       percent = (report[:position] / report[:length]) * 100
@@ -95,19 +144,29 @@ module MMPlayer
       @player.get(key).strip.to_f
     end
 
+    # Call the given block within a new thread
+    def with_player_thread(&block)
+      thread = Thread.new do
+        begin
+          yield
+        rescue Exception => exception
+          Thread.main.raise(exception)
+        end
+      end
+      thread.abort_on_exception = true
+      @player_threads << thread
+      thread
+    end
+
     # Ensure that the MPlayer process is invoked
     # @param [String] file The media file to invoke MPlayer with
     # @return [MPlayer::Slave]
     def ensure_player(file)
-      if @player.nil? && @player_thread.nil?
-        @player_thread = Thread.new do
-          begin
-            @player = MPlayer::Slave.new(file, :options => @flags)
-          rescue Exception => exception
-            Thread.main.raise(exception)
-          end
+      if @player.nil? && @player_threads.empty?
+        with_player_thread do
+          @player = MPlayer::Slave.new(file, :options => @flags)
+          handle_start
         end
-        @player_thread.abort_on_exception = true
       end
     end
 

data/test/player_test.rb

@@ -10,12 +10,15 @@ class MMPlayer::PlayerTest < Minitest::Test
         def get(*args)
           "0.1\n"
         end
+
+        def load_file(something)
+        end
       end
       @player = MMPlayer::Player.new
       @mplayer = MPlayer.new
       @player.stubs(:ensure_player).returns(@mplayer)
       @player.instance_variable_set("@player", @mplayer)
-      @player.instance_variable_set("@player_thread", Thread.new {})
+      @player.instance_variable_set("@player_threads", [Thread.new {}])
       @player.send(:ensure_player, "")
     end
 
@@ -68,12 +71,12 @@ class MMPlayer::PlayerTest < Minitest::Test
 
       setup do
         @mplayer.expects(:quit).once
-        @player.instance_variable_get("@player_thread").expects(:kill).once
+        @player.instance_variable_get("@player_threads").first.expects(:kill).once
       end
 
       teardown do
         @mplayer.unstub(:quit)
-        @player.instance_variable_get("@player_thread").unstub(:kill)
+        @player.instance_variable_get("@player_threads").first.unstub(:kill)
       end
 
       should "exit MPlayer and kill the player thread" do
@@ -105,12 +108,10 @@ class MMPlayer::PlayerTest < Minitest::Test
 
       setup do
         @player.expects(:ensure_player).once.returns(@mplayer)
-        @mplayer.expects(:load_file).once
       end
 
       teardown do
         @player.unstub(:ensure_player)
-        @mplayer.unstub(:load_file)
       end
 
       should "lazily invoke mplayer and play" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmplayer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest