mmplayer 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f14f476af4864cb82c33c1b2096380155d7cc66
-  data.tar.gz: 72cadd99a43d83aa6d326b95e3f07ad40ac26066
+  metadata.gz: 7506ea91a4204c4c6a54de79d645e80315559b98
+  data.tar.gz: 531967ac3622fc501eab6162d1e63afae815cb69
 SHA512:
-  metadata.gz: d07078cd8a53754fdbc07b82e0ee29966e86adfc14beadd2338e6a53470b770db656202111d320127a18c7003435fa4d4effba4f8da7542e6615e7a739b31de7
-  data.tar.gz: 9ba11777b930ccfc08c0c189e6cf5dee7081f8cdfc7ac86bb4113a56b1c2a5961b154a636f7ad2fefcf75a844c1e71b275d27af3d5f35e1fa1968567705c3270
+  metadata.gz: 737adfeadb792fb1ea7643530635556dd12efe935a047701186c40b43bfdd608ad8b47124c742f1fc33dd4421117c3b506f13d69644499a770498452dad79569
+  data.tar.gz: b6d88d0809f7b443f136b07ba242f22368fdf14f37ed23ec4581f49d4b05c2c83124867201908c91161e7d003ec0a9f5adc99855f8f25849dbba8261c30df9ca

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015 Ari Russo
+Copyright 2015-2017 Ari Russo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -63,4 +63,4 @@ All MPlayer runtime commands enabled by the [mplayer-ruby](https://rubygems.org/
 
 Apache 2.0, See LICENSE file
 
-Copyright (c) 2015 [Ari Russo](http://arirusso.com)
+Copyright (c) 2015-2017 [Ari Russo](http://arirusso.com)

data/lib/mmplayer.rb

@@ -1,7 +1,7 @@
 # MMPlayer
 # Control MPlayer with MIDI
 #
-# (c)2015 Ari Russo
+# (c)2015-2017 Ari Russo
 # Apache 2.0 License
 
 # libs
@@ -24,7 +24,7 @@ require "mmplayer/context"
 
 module MMPlayer
 
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 
   # Shortcut to Context constructor
   def self.new(*args, &block)

data/lib/mmplayer/context.rb

@@ -11,11 +11,16 @@ module MMPlayer
 
     # @param [UniMIDI::Input, Array<UniMIDI::Input>] midi_input
     # @param [Hash] options
+    # @option options [Fixnum] :midi_buffer_length Length of MIDI message buffer in seconds
     # @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.new(midi_input, :receive_channel => options[:receive_channel] || options[:rx_channel])
+      midi_options = {
+        :buffer_length => options[:midi_buffer_length],
+        :receive_channel => options[:receive_channel] || options[:rx_channel]
+      }
+      @midi = MIDI.new(midi_input, midi_options)
       @player = Player.new(:flags => options[:mplayer_flags])
       instance_eval(&block) if block_given?
     end

data/lib/mmplayer/midi/wrapper.rb

@@ -1,7 +1,7 @@
 module MMPlayer
 
   module MIDI
-    
+
     # Wrapper for MIDI functionality
     class Wrapper
 
@@ -9,9 +9,12 @@ module MMPlayer
 
       # @param [UniMIDI::Input, Array<UniMIDI::Input>] input
       # @param [Hash] options
+      # @option options [Fixnum] :buffer_length Length of MIDI message buffer in seconds
       # @option options [Fixnum] :receive_channel A MIDI channel to subscribe to. By default, responds to all
       def initialize(input, options = {})
+        @buffer_length = options[:buffer_length]
         @channel = options[:receive_channel]
+
         @message_handler = MessageHandler.new
         @listener = MIDIEye::Listener.new(input)
       end
@@ -52,14 +55,14 @@ module MMPlayer
       def channel=(channel)
         @listener.event.clear
         @channel = channel
-        populate_listener if @listener.running?
+        initialize_listener if @listener.running?
         @channel
       end
 
       # Start the MIDI listener
       # @return [Boolean]
       def start
-        populate_listener
+        initialize_listener
         @listener.start(:background => true)
         true
       end
@@ -72,14 +75,24 @@ module MMPlayer
 
       private
 
-      # Populate the MIDI listener callback
-      def populate_listener
-        @listener.on_message do |event|
+      # Handle a new MIDI event received
+      # @param [Hash] event
+      # @return [Hash]
+      def handle_new_event(event)
+        if @buffer_length.nil? || event[:timestamp].nil? || event[:timestamp] >= Time.now.to_i - @buffer_length
           message = event[:message]
           @message_handler.process(@channel, message)
+          event
         end
       end
 
+      # Populate the MIDI listener callback
+      # @return [MIDIEye::Listener]
+      def initialize_listener
+        @listener.on_message { |event| handle_new_event(event) }
+        @listener
+      end
+
     end
 
   end

data/test/midi/wrapper_test.rb

@@ -9,6 +9,98 @@ class MMPlayer::MIDI::WrapperTest < Minitest::Test
       @midi = MMPlayer::MIDI::Wrapper.new(@input)
     end
 
+    context "#handle_new_event" do
+
+      context "with no buffer length" do
+
+        setup do
+          @midi.message_handler.expects(:process).once
+          @event = {
+            :message => MIDIMessage::NoteOn.new(0, 64, 120),
+            :timestamp=> 9266.395330429077
+          }
+          @result = @midi.send(:handle_new_event, @event)
+        end
+
+        teardown do
+          @midi.message_handler.unstub(:process)
+        end
+
+        should "return event" do
+          refute_nil @result
+          assert_equal @event, @result
+        end
+
+      end
+
+      context "with buffer length" do
+
+        context "recent message" do
+
+          setup do
+            @midi.message_handler.expects(:process).once
+            @event = {
+              :message => MIDIMessage::NoteOn.new(0, 64, 120),
+              :timestamp=> 9266.395330429077
+            }
+            @result = @midi.send(:handle_new_event, @event)
+          end
+
+          teardown do
+            @midi.message_handler.unstub(:process)
+          end
+
+          should "return event" do
+            refute_nil @result
+            assert_equal @event, @result
+          end
+
+        end
+
+        context "with too-old message" do
+
+          setup do
+            @midi.instance_variable_set("@buffer_length", 1)
+            @midi.message_handler.expects(:process).never
+            @event = {
+              :message => MIDIMessage::NoteOn.new(0, 64, 120),
+              :timestamp=> 4.395330429077
+            }
+            @result = @midi.send(:handle_new_event, @event)
+          end
+
+          teardown do
+            @midi.message_handler.unstub(:process)
+          end
+
+          should "not return event" do
+            assert_nil @result
+          end
+
+        end
+
+      end
+
+    end
+
+    context "#initialize_listener" do
+
+      setup do
+        @midi.listener.expects(:on_message).once
+        @result = @midi.send(:initialize_listener)
+      end
+
+      teardown do
+        @midi.listener.unstub(:on_message)
+      end
+
+      should "return listener" do
+        refute_nil @result
+        assert_equal MIDIEye::Listener, @result.class
+      end
+
+    end
+
     context "#start" do
 
       setup do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmplayer
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest