mmplayer 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f79ab624c5547f520491380f1fd012f649daad
-  data.tar.gz: a2387b2bdd5e1787dbb3a5913cd9518633a69b58
+  metadata.gz: 3f14f476af4864cb82c33c1b2096380155d7cc66
+  data.tar.gz: 72cadd99a43d83aa6d326b95e3f07ad40ac26066
 SHA512:
-  metadata.gz: 10967965c48de9cb4053ce32b41b907b18e1ecc54b33e23f4c9cd63f8d1ca6c7f991ed02fc2694fd5bbd42774874f6eb9a8cafdfcf77b8196a3e9e92f345d57f
-  data.tar.gz: 1c21b76e1044de417220d6706bba6b1300f11d90da9e437ef0a14ecaa1cae550738298b3f679414acfd32946fda2444be6bfb597ca2d897ed717c0e7b5d8deb9
+  metadata.gz: d07078cd8a53754fdbc07b82e0ee29966e86adfc14beadd2338e6a53470b770db656202111d320127a18c7003435fa4d4effba4f8da7542e6615e7a739b31de7
+  data.tar.gz: 9ba11777b930ccfc08c0c189e6cf5dee7081f8cdfc7ac86bb4113a56b1c2a5961b154a636f7ad2fefcf75a844c1e71b275d27af3d5f35e1fa1968567705c3270

data/lib/mmplayer.rb

@@ -9,6 +9,7 @@ require "forwardable"
 require "midi-eye"
 require "mplayer-ruby"
 require "scale"
+require "timeout"
 require "unimidi"
 
 # modules
@@ -16,13 +17,14 @@ require "mmplayer/helper/numbers"
 require "mmplayer/instructions"
 require "mmplayer/midi"
 require "mmplayer/player"
+require "mmplayer/thread"
 
 # classes
 require "mmplayer/context"
 
 module MMPlayer
 
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 
   # Shortcut to Context constructor
   def self.new(*args, &block)

data/lib/mmplayer/context.rb

@@ -9,14 +9,14 @@ module MMPlayer
 
     attr_reader :midi, :player
 
-    # @param [UniMIDI::Input] midi_input
+    # @param [UniMIDI::Input, Array<UniMIDI::Input>] midi_input
     # @param [Hash] options
     # @option options [String] :mplayer_flags The command-line flags to invoke MPlayer with
     # @option options [Fixnum] :receive_channel (also: :rx_channel) A MIDI channel to subscribe to. By default, responds to all
     # @yield
     def initialize(midi_input, options = {}, &block)
-      @midi = MIDI::Wrapper.new(midi_input, :receive_channel => options[:receive_channel] || options[:rx_channel])
-      @player = Player::Wrapper.new(:flags => options[:mplayer_flags])
+      @midi = MIDI.new(midi_input, :receive_channel => options[:receive_channel] || options[:rx_channel])
+      @player = Player.new(:flags => options[:mplayer_flags])
       instance_eval(&block) if block_given?
     end
 
@@ -37,6 +37,7 @@ module MMPlayer
     def stop
       @midi.stop
       @player.quit
+      @playback_thread.kill
       true
     end
 
@@ -44,18 +45,12 @@ module MMPlayer
 
     # 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)
+      ::MMPlayer::Thread.new(:timeout => false) do
+        until @player.active?
+          sleep(0.1)
         end
+        @player.playback_loop
       end
-      thread.abort_on_exception = true
-      thread
     end
 
   end

data/lib/mmplayer/midi.rb

@@ -4,6 +4,11 @@ require "mmplayer/midi/wrapper"
 module MMPlayer
 
   module MIDI
+
+    def self.new(*args)
+      ::MMPlayer::MIDI::Wrapper.new(*args)
+    end
+
   end
 
 end

data/lib/mmplayer/midi/wrapper.rb

@@ -1,12 +1,13 @@
 module MMPlayer
 
   module MIDI
+    
     # Wrapper for MIDI functionality
     class Wrapper
 
-      attr_reader :channel, :config, :listener, :message_handler
+      attr_reader :channel, :listener, :message_handler
 
-      # @param [UniMIDI::Input] input
+      # @param [UniMIDI::Input, Array<UniMIDI::Input>] input
       # @param [Hash] options
       # @option options [Fixnum] :receive_channel A MIDI channel to subscribe to. By default, responds to all
       def initialize(input, options = {})

data/lib/mmplayer/player.rb

@@ -6,6 +6,11 @@ require "mmplayer/player/wrapper"
 module MMPlayer
 
   module Player
+
+    def self.new(*args)
+      ::MMPlayer::Player::Wrapper.new(*args)
+    end
+
   end
 
 end

data/lib/mmplayer/player/invoker.rb

@@ -26,15 +26,10 @@ module MMPlayer
       # @return [MPlayer::Slave]
       def ensure_invoked(file, state)
         if @player.nil? && @thread.nil?
-          @thread = Thread.new do
-            begin
-              @player = MPlayer::Slave.new(file, :options => @flags)
-              state.handle_start
-            rescue Exception => exception
-              Thread.main.raise(exception)
-            end
+          @thread = ::MMPlayer::Thread.new(:timeout => false) do
+            @player = MPlayer::Slave.new(file, :options => @flags)
+            state.handle_start
           end
-          @thread.abort_on_exception
         end
         @player
       end

data/lib/mmplayer/player/messenger.rb

@@ -17,14 +17,7 @@ module MMPlayer
         timestamp = Time.now.to_f
         # Throttled messages are disregarded
         if @messages.empty? || !throttle?(timestamp, @messages.last[:timestamp])
-          thread = Thread.new do
-            begin
-              yield
-            rescue Exception => exception
-              Thread.main.raise(exception)
-            end
-          end
-          thread.abort_on_exception = true
+          thread = ::MMPlayer::Thread.new(&block)
           record_message(thread, timestamp)
         end
       end

data/lib/mmplayer/player/wrapper.rb

@@ -25,7 +25,7 @@ module MMPlayer
         if @player.nil?
           false
         else
-          @threads << with_thread do
+          @threads << ::MMPlayer::Thread.new(:timeout => 2) do
             @player.load_file(file)
             handle_start
           end
@@ -52,7 +52,7 @@ module MMPlayer
       def playback_loop
         loop do
           if handle_progress?
-            @threads << with_thread { handle_progress }
+            @threads << ::MMPlayer::Thread.new { handle_progress }
           end
           handle_eof if handle_eof?
           sleep(0.05)
@@ -190,19 +190,6 @@ module MMPlayer
         result.strip.to_f
       end
 
-      # Call the given block within a new thread
-      def with_thread(&block)
-        thread = Thread.new do
-          begin
-            yield
-          rescue Exception => exception
-            Thread.main.raise(exception)
-          end
-        end
-        thread.abort_on_exception = true
-        thread
-      end
-
     end
 
   end

data/lib/mmplayer/thread.rb

@@ -0,0 +1,28 @@
+module MMPlayer
+
+  module Thread
+
+    extend self
+
+    def new(options = {}, &block)
+      thread = ::Thread.new do
+        begin
+          if options[:timeout] === false
+            yield
+          else
+            duration = options[:timeout] || 1
+            Timeout::timeout(duration) { yield }
+          end
+        rescue Timeout::Error
+          ::Thread.current.kill
+        rescue Exception => exception
+          ::Thread.main.raise(exception)
+        end
+      end
+      thread.abort_on_exception = true
+      thread
+    end
+
+  end
+
+end

data/test/{midi_test.rb → midi/wrapper_test.rb}

@@ -1,8 +1,8 @@
 require "helper"
 
-class MMPlayer::MIDITest < Minitest::Test
+class MMPlayer::MIDI::WrapperTest < Minitest::Test
 
-  context "MIDI" do
+  context "Wrapper" do
 
     setup do
       @input = Object.new

data/test/{player_test.rb → player/wrapper_test.rb}

@@ -1,8 +1,8 @@
 require "helper"
 
-class MMPlayer::PlayerTest < Minitest::Test
+class MMPlayer::Player::WrapperTest < Minitest::Test
 
-  context "Player" do
+  context "Wrapper" do
 
     setup do
       @player = MMPlayer::Player::Wrapper.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmplayer
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -213,14 +213,15 @@ files:
 - lib/mmplayer/player/messenger.rb
 - lib/mmplayer/player/state.rb
 - lib/mmplayer/player/wrapper.rb
+- lib/mmplayer/thread.rb
 - test/context_test.rb
 - test/helper.rb
 - test/helper/numbers_test.rb
 - test/instructions/midi_test.rb
 - test/instructions/player_test.rb
 - test/midi/message_handler_test.rb
-- test/midi_test.rb
-- test/player_test.rb
+- test/midi/wrapper_test.rb
+- test/player/wrapper_test.rb
 homepage: http://github.com/arirusso/mmplayer
 licenses:
 - Apache 2.0