mvlc 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 052f8904644cacbb9b81cc9c9e2e72eef3150cb8
-  data.tar.gz: 88428d64855c4252236e557dd4f68b3748f921a2
+  metadata.gz: c8fcc7d1463e23552cf7cdb42fed336baa2924da
+  data.tar.gz: ec3be17ea4995f47383f41d06288eb776652c484
 SHA512:
-  metadata.gz: e7e0ba57b4fb5f7e33435f6353187dd8ad57c0c282ea5a8fadc769bbfd03914154da75d0e704bc00318517fa3ca5ae970b1e3065a0faa534d9bee845d695cc5c
-  data.tar.gz: 7c36b2b70a1042f21dac9e9c1ee257a1249c104893b4b422908e564342fd7e10c061cd548bf81f7b08b531cd7a18faee0c0bad59a65addc83d2ad2857fa2cb33
+  metadata.gz: 5741c4c5d7bf0ba8f8fccb4738c3f1968328dd16a6f29b0e36e44e5c67fa4f29e7747dac9f23a0a5e7a54456f6b84d89df3878bf4c00544cc57fbdecc423ac5c
+  data.tar.gz: 81dfa6df1aaafe596d59cbdbfd15a177bf4879dd2152f942c04bd70f31b1ea2ae09444a6bc904665a886fa97e305656b2ba2809b32531e185d3256bfbd09772b

data/lib/mvlc.rb

@@ -24,7 +24,7 @@ require "mvlc/context"
 
 module MVLC
 
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   # Shortcut to Context constructor
   def self.new(*args, &block)

data/lib/mvlc/player/wrapper.rb

@@ -27,7 +27,7 @@ module MVLC
           length_in_seconds = @player.length
           seconds = length_in_seconds * (percent / 100.0)
           @player.seek(seconds)
-        rescue VLC::ReadTimeoutError
+        rescue VLC::ReadTimeoutError, VLC::BrokenConnectionError
         end
       end
 
@@ -87,8 +87,7 @@ module MVLC
       # Cause MPlayer to exit
       # @return [Boolean]
       def quit
-        @player.connection.write("quit")
-        @player.connection.write("logout")
+        @player.server.stop
         true
       end
 
@@ -136,10 +135,18 @@ module MVLC
         @state.handle_start
       end
 
+      def playing?
+        begin
+          @player.playing?
+        rescue VLC::ReadTimeoutError, VLC::BrokenConnectionError
+          false
+        end
+      end
+
       # Has the end of a media file been reached?
       # @return [Boolean]
       def eof?
-        @state.eof_reached? && !@player.playing?
+        @state.eof_reached? && !playing?
       end
 
     end

data/test/player/wrapper_test.rb

@@ -7,6 +7,9 @@ class MVLC::Player::WrapperTest < Minitest::Test
     setup do
       @player = Object.new
       @player.stubs(:quit)
+      conn = Object.new
+      conn.stubs(:write)
+      @player.stubs(:connection).returns(conn)
       VLC::System.stubs(:new).returns(@player)
       @player = MVLC::Player::Wrapper.new
     end
@@ -41,7 +44,6 @@ class MVLC::Player::WrapperTest < Minitest::Test
 
       should "lazily invoke mplayer and play" do
         assert @player.play("file.mov")
-        #refute_nil @player.instance_variable_get("@player")
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvlc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ari Russo