ffi-coremidi 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4191e1b978dd6f7b928a1c1822850ded9034c0ae
-  data.tar.gz: 780525a088dde5901dd1c9326d483ebe356e9c59
+  metadata.gz: 783d35848d8b43aad819797077531c839855b609
+  data.tar.gz: 3d5ddc1fdd6c4ba3334a3239230c70a30437b093
 SHA512:
-  metadata.gz: 87ca289e7f5edb44619c6503c611828ad60c937e48952c0c99eb65665c75f869079cb1313cf25794fe47db0c944cd8849b764dada1e5c3df1ee82ff448ac9299
-  data.tar.gz: 9c48b781b0b7ab4df324ec15c8f3d18c2131d4776849fcd98c75233d5f59297074a7485b2ef47c3d3d551d3886aa706a18586c87822f5b0556f38864e72270cf
+  metadata.gz: 930ba168f35d3a27c4f29a9ebea265d431c9183ea207232aea9665da7a98a90b09c4961707dae42a81a80384d85199d41224648a1c0c60f19da4f00419b3e50c
+  data.tar.gz: 37317428e46af018b23da9af3df7a5767d61ddcd87cf060c7261b3df526ce8389baaf7c14faff6e9f772c3ed088e63e8a1797e0f66eaca9cb63b089a5394c917

data/lib/coremidi.rb

@@ -19,5 +19,5 @@ require "coremidi/source"
 require "coremidi/destination"
 
 module CoreMIDI
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/coremidi/source.rb

@@ -4,7 +4,7 @@ module CoreMIDI
   class Source
 
     include Endpoint
-    
+
     attr_reader :buffer
 
     #
@@ -102,9 +102,9 @@ module CoreMIDI
     def self.all
       Endpoint.all_by_type[:source]
     end
-    
+
     protected
-    
+
     # Base initialization for this endpoint -- done whether or not the endpoint is enabled to check whether 
     # it is truly available for use
     def connect   
@@ -122,6 +122,17 @@ module CoreMIDI
 
     private
 
+    def enqueue_message(bytes, time)
+      if bytes.first.eql?(0xF0) || !@sysex_buffer.empty?
+        @sysex_buffer += bytes
+        if bytes.last.eql?(0xF7)
+          bytes = @sysex_buffer.dup
+          @sysex_buffer.clear
+        end
+      end
+      @buffer << get_message_formatted(bytes, time) if @sysex_buffer.empty? 
+    end
+
     # New MIDI messages from the queue
     def queued_messages
       @buffer.slice(@pointer, @buffer.length - @pointer)
@@ -134,26 +145,35 @@ module CoreMIDI
 
     # The callback fired by coremidi when new MIDI messages are in the buffer
     def get_event_callback
-      Proc.new do | new_packets, refCon_ptr, connRefCon_ptr |
-        time = Time.now.to_f
-        packet = new_packets[:packet][0]
-        len = packet[:length]
-        #p "packets received: #{new_packets[:numPackets]}"
-        #p "first packet length: #{len} data: #{packet[:data].to_a.to_s}"
-        if len > 0
-          bytes = packet[:data].to_a[0, len]
-          if bytes.first.eql?(0xF0) || !@sysex_buffer.empty?
-            @sysex_buffer += bytes
-            if bytes.last.eql?(0xF7)
-              bytes = @sysex_buffer.dup
-              @sysex_buffer.clear
-            end
-          end
-          @buffer << get_message_formatted(bytes, time) if @sysex_buffer.empty?             
+      Proc.new do |new_packets, refCon_ptr, connRefCon_ptr|
+        begin
+          # p "packets received: #{new_packets[:numPackets]}"
+          timestamp = Time.now.to_f
+          messages = get_messages(new_packets)
+          messages.each { |message| enqueue_message(message, timestamp) }
+        rescue Exception => exception
+          Thread.main.raise(exception)
         end
       end
     end
 
+    def get_messages(new_packets)
+      count = new_packets[:numPackets]
+      first = new_packets[:packet][0]
+      data = first[:data].to_a
+      messages = []
+      messages << data.slice!(0, first[:length])
+      (count - 1).times do |i|
+        length_index = 8
+        message_length = data[length_index]
+        message_start_index = length_index + 2
+        packet_end_index = message_start_index + message_length
+        packet = data.slice!(0..packet_end_index)
+        messages << packet.slice(message_start_index, message_length)
+      end
+      messages
+    end
+
     # Timestamp for a received MIDI message
     def timestamp(now)
       (now - @start_time) * 1000
@@ -175,7 +195,7 @@ module CoreMIDI
       raise "MIDIInputPortCreate returned error code #{port[:error]}" unless port[:error].zero?
       true
     end
-    
+
     # Initialize the MIDI message buffer
     def initialize_buffer
       @pointer = 0
@@ -186,7 +206,7 @@ module CoreMIDI
       end
       true
     end
-    
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-coremidi
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi