mmplayer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7696f764235df86a1aa44baa06e9aac9f3d2aa3
-  data.tar.gz: 79bb9a6de61e332396a1ca14fba2f7bcf5e7c153
+  metadata.gz: 3d59002ee9d5711a811c980108d0e29c41b19811
+  data.tar.gz: 66a9b65bfb2b421e4fdcba73a04eec30123610af
 SHA512:
-  metadata.gz: 83026c50689a282c33c8463ec018159cc4f984d6e6cc51308dbe7440210e7452f3096e76f5a361b601666458c22885740b290a35d729f84ca8478bfb445dc66d
-  data.tar.gz: 2b84b86a16ee4a02ac0290575697967c5f1cb7e387ef6998d4478cd9e708f80c25822dbcf9f62907a07c2b5f5cc69a72c67fc86938fe46cf4381a34f1bebeb81
+  metadata.gz: a6b900ed7f38488e1f8705a0f4facdf0cf0dc6d44b0fae68c4fb2d06cb5b55b262637890d0c737640b7ca345df1d882a01cbfe1f5b505b44a619db4a2e8461cd
+  data.tar.gz: 9d8b70983896579a071930a32dc9a4de903694383fb7d30cdb4efcf144125ec6dd2ef2d0bab7c78851e6310102f9f1e98333dd3d2bca22c1519b04bf66992014

data/lib/mmplayer.rb

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

data/lib/mmplayer/player.rb

@@ -10,8 +10,11 @@ module MMPlayer
       @flags += " #{options[:flags]}" unless options[:flags].nil?
       @messenger = Messenger.new
       @callback = {}
-      @is_playing = false
-      @is_eof_handled = true
+      @playback_state = {
+        :eof => false,
+        :play => false,
+        :pause => false
+      }
       @player_threads = []
     end
 
@@ -37,15 +40,27 @@ module MMPlayer
       !@player.nil?
     end
 
+    # Is the player paused?
+    # @return [Boolean]
+    def paused?
+      @playback_state[:pause]
+    end
+    alias_method :pause?, :paused?
+
+    # Toggles pause
+    # @return [Boolean]
+    def pause
+      @playback_state[:pause] = !@playback_state[:pause]
+      @player.pause
+      @playback_state[:pause]
+    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
+        handle_eof if eof?
+        sleep(0.05)
       end
       true
     end
@@ -100,6 +115,12 @@ module MMPlayer
 
     private
 
+    # Has the end of a media file been reached?
+    # @return [Boolean]
+    def eof?
+      @playback_state[:play] && !@playback_state[:eof] && !@playback_state[:pause] && get_player_output.size < 1
+    end
+
     # Get player output from stdout
     def get_player_output
       @player.stdout.gets.inspect.strip.gsub(/(\\n|[\\"])/, '').strip
@@ -107,8 +128,8 @@ module MMPlayer
 
     # Handle the end of playback for a single media file
     def handle_eof
-      @is_eof_handled = true
-      @is_playing = false
+      @playback_state[:eof] = true
+      @playback_state[:play] = false
       STDOUT.flush
       @callback[:end_of_file].call unless @callback[:end_of_file].nil?
       true
@@ -117,8 +138,8 @@ module MMPlayer
     # 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
+      @playback_state[:play] = true
+      @playback_state[:eof] = false
     end
 
     # Get progress percentage from the MPlayer report

data/test/player_test.rb

@@ -5,17 +5,13 @@ class MMPlayer::PlayerTest < Minitest::Test
   context "Player" do
 
     setup do
-      # Stub out MPlayer completely
-      class MPlayer
-        def get(*args)
-          "0.1\n"
-        end
-
-        def load_file(something)
-        end
-      end
       @player = MMPlayer::Player.new
-      @mplayer = MPlayer.new
+      @mplayer = Object.new
+      @mplayer.stubs(:load_file).returns(true)
+      out = Object.new
+      out.stubs(:gets).returns("")
+      @mplayer.stubs(:stdout).returns(out)
+      @mplayer.stubs(:get).returns("0.1\n")
       @player.stubs(:ensure_player).returns(@mplayer)
       @player.instance_variable_set("@player", @mplayer)
       @player.instance_variable_set("@player_threads", [Thread.new {}])

metadata

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