midi-instrument 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 978dc80ea49edc2731e8f13901b836b097f0d2c8
-  data.tar.gz: b994a8bc8087ed8e7137bbd4104eb1cbb2a9b6b5
+  metadata.gz: fe1e9e3af1c7a886eaa6cca36351d14beef013c1
+  data.tar.gz: ec1cbde73021ea8ec6f9340613f9a1cd00002dec
 SHA512:
-  metadata.gz: fb094c3701f256fbebfbca1f8123757c67a16bcbcba813848ab13e1258dd30c8d73af8ce4fb76a0a463d36ebe9d265996dce9654caf9526e39fa30a455d157df
-  data.tar.gz: 7d9f7a393fb61e3001f340f5a0d99ea428792a50f9c990c6cdf0e57d2f6417fef25fc97f6ac9c86520f15516cc8d448907b0aaaa26fd48b3f88cc83127ea40c2
+  metadata.gz: d1d8676a627a98500691565041f76ede6e266f5127797b394ec324d11aee7ec7d5154fd269f430f4af5421e648d3746a6c03661b7b368840ac63748b75cb7a37
+  data.tar.gz: fdab9dcfe956de274cbf58b42a64382d480c94dae79d803f6db9b8f09fd65a2131a8fdd6427ade397a6b8fcbd49b243f231b0d6af206e1e68c9060669debe0bd

data/lib/midi-instrument.rb

@@ -27,6 +27,6 @@ require "midi-instrument/output"
 
 module MIDIInstrument
   
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
   
 end

data/lib/midi-instrument/input.rb

@@ -15,7 +15,6 @@ module MIDIInstrument
       @listener = Listener.new(options[:sources])
       @devices = InputContainer.new(@listener)
       @channel = nil
-      @channel_filter = nil
     end
 
     # Add a MIDI input callback
@@ -24,10 +23,7 @@ module MIDIInstrument
     # @return [Listen]
     def receive(match = {}, &block)
       if block_given?
-        @listener.receive(match) do |event|
-          event = filter_event(event)
-          yield(event)
-        end
+        @listener.receive(match) { |event| yield(event) }
       end
       self
     end
@@ -36,8 +32,7 @@ module MIDIInstrument
     # @param [Array<MIDIMessage>, MIDIMessage, *MIDIMessage] messages
     # @return [Array<MIDIMessage>]
     def add(*messages)
-      messages = Message.to_messages([messages].flatten)
-      messages = messages.map { |message| filter_message(message) }.compact
+      messages = Message.to_messages([messages].flatten).compact
       @listener.add(*messages) unless messages.empty?
       messages
     end
@@ -46,16 +41,14 @@ module MIDIInstrument
     # Set the listener to acknowledge notes on all channels
     # @return [Boolean]
     def omni
-      @channel_filter = nil
       @channel = nil
       true
     end
     alias_method :omni_on, :omni
 
-    # Set the listener to only acknowledge notes from a specific channel
+    # Specify an input channel
     # @return [Boolean]
     def channel=(channel)
-      @channel_filter = channel.nil? ? nil : MIDIFX::Filter.new(:channel, channel, :name => :input_channel)
       @channel = channel
       true
     end
@@ -71,28 +64,6 @@ module MIDIInstrument
 
     private
 
-    # Filter an event based on the message contained in it
-    # @param [Hash] event
-    # @return [Hash, nil]
-    def filter_event(event)
-      if !@channel_filter.nil?
-        if !(message = filter_message(event[:message])).nil?
-          event[:message] = message
-          event
-        end
-      else
-        event
-      end
-    end
-
-    # If there's a channel filter, use it to filter the given message.
-    # @param [MIDIMessage] message
-    # @return [MIDIMessage]
-    def filter_message(message)
-      message = @channel_filter.process(message) unless @channel_filter.nil?
-      message
-    end
-
     # Container class that handles updating the listener when changes are made
     class InputContainer < Array
 

data/test/input_test.rb

@@ -44,31 +44,25 @@ class MIDIInstrument::InputTest < Test::Unit::TestCase
     context "#omni" do
       
       should "not have a receive channel" do
-        assert_nil @input.instance_variable_get("@channel_filter")
         @input.channel = 4
         assert_equal 4, @input.channel
         @input.omni
         assert_nil @input.channel
-        assert_nil @input.instance_variable_get("@channel_filter")
       end
 
     end
 
     context "#channel=" do
 
-      should "have filter when channel is specified" do
-        assert_nil @input.instance_variable_get("@channel_filter")
+      should "set channel" do
         @input.channel = 3
-        assert_not_nil @input.instance_variable_get("@channel_filter")
         assert_equal 3, @input.channel
       end
 
-      should "not have filter when channel is nil" do
+      should "unset channel" do
         @input.channel = 3
-        assert_not_nil @input.instance_variable_get("@channel_filter")
         assert_equal 3, @input.channel
         @input.channel = nil
-        assert_nil @input.instance_variable_get("@channel_filter")
         assert_nil @input.channel
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midi-instrument
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-eye