ffi-coremidi 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 783d35848d8b43aad819797077531c839855b609
-  data.tar.gz: 3d5ddc1fdd6c4ba3334a3239230c70a30437b093
+  metadata.gz: 139d11b8026aa7260adbd6388fb4872b7773409e
+  data.tar.gz: 1254869a8df40213da841a526d06fb30a8e55c3f
 SHA512:
-  metadata.gz: 930ba168f35d3a27c4f29a9ebea265d431c9183ea207232aea9665da7a98a90b09c4961707dae42a81a80384d85199d41224648a1c0c60f19da4f00419b3e50c
-  data.tar.gz: 37317428e46af018b23da9af3df7a5767d61ddcd87cf060c7261b3df526ce8389baaf7c14faff6e9f772c3ed088e63e8a1797e0f66eaca9cb63b089a5394c917
+  metadata.gz: 93cd4cc3d7c7415c6e5d90aa1b6794598639701cb528adf07c6ee5cd7051a65c250858b62c86ae36062a8cbf281e230452f8876868dd420286d5cfb24122c3a6
+  data.tar.gz: a71bcd64f2c44eb5e80e2bdd1912a3459ab82f0e9e94f0532e98c5ac7b214c0337636db2e76fbf2fc5a12248721cedef96878c9258421773692641110cb88e6c

data/lib/coremidi.rb

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

data/lib/coremidi/source.rb

@@ -122,7 +122,11 @@ module CoreMIDI
 
     private
 
-    def enqueue_message(bytes, time)
+    # Add a single message to the buffer
+    # @param [Array<Fixnum>] bytes Message data
+    # @param [Float] timestamp The system float timestamp
+    # @return [Array<Hash>] The resulting buffer
+    def enqueue_message(bytes, timestamp)
       if bytes.first.eql?(0xF0) || !@sysex_buffer.empty?
         @sysex_buffer += bytes
         if bytes.last.eql?(0xF7)
@@ -130,7 +134,8 @@ module CoreMIDI
           @sysex_buffer.clear
         end
       end
-      @buffer << get_message_formatted(bytes, time) if @sysex_buffer.empty? 
+      @buffer << get_message_formatted(bytes, timestamp) if @sysex_buffer.empty? 
+      @buffer
     end
 
     # New MIDI messages from the queue
@@ -157,29 +162,36 @@ module CoreMIDI
       end
     end
 
-    def get_messages(new_packets)
-      count = new_packets[:numPackets]
-      first = new_packets[:packet][0]
+    # Get MIDI messages from the given CoreMIDI packet list
+    # @param [API::MIDIPacketList] new_packets The packet list
+    # @return [Array<Array<Fixnum>>] A collection of MIDI messages
+    def get_messages(packet_list)
+      count = packet_list[:numPackets]
+      first = packet_list[: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)
+        message_length = data[8]
+        unless message_length.nil?
+          packet_end_index = 10 + message_length
+          if data.length >= packet_end_index + 1
+            packet = data.slice!(0..packet_end_index)
+            messages << packet.slice(10, message_length)
+          end
+        end
       end
       messages
     end
 
     # Timestamp for a received MIDI message
+    # @return [Fixnum]
     def timestamp(now)
       (now - @start_time) * 1000
     end
 
     # Give a message its timestamp and package it in a Hash
+    # @return [Hash]
     def get_message_formatted(raw, time)
       { 
         :data => raw, 
@@ -188,6 +200,7 @@ module CoreMIDI
     end
 
     # Initialize a coremidi port for this endpoint
+    # @return [Boolean]
     def initialize_port
       @callback = get_event_callback
       port = API.create_midi_input_port(@client, @resource_id, @name, @callback)
@@ -197,6 +210,7 @@ module CoreMIDI
     end
 
     # Initialize the MIDI message buffer
+    # @return [Boolean]
     def initialize_buffer
       @pointer = 0
       @buffer = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-coremidi
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ari Russo