ffi-coremidi 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e8353d60b7cd257dd8f9af914af4aaa08ba8e7e
-  data.tar.gz: 1f696d9cf2061c8075672a717b0f5bbdd36fccca
+  metadata.gz: 24583f1bb64dea16e2988a4ed7f4c51411000413
+  data.tar.gz: 3d7804e408e78313e46095ca9fa879c1c427d9e0
 SHA512:
-  metadata.gz: 8518a427325f084f91d74c7bc99e2393b2e598318cf0d238f4ee04bf2a706569f5276b1f0f2ee03fc49677fc2aed16ce19fd3a9c4a28cc54bb1669ba05041a19
-  data.tar.gz: 4f9240367b6fc316b9270f1520a5e15ad3cf6d1e2038e6ea0cb67cc64b5199c248233a6454ad5719cb9d0f26961575a0cc6a799d4074d0d332b7fd61f1b5cae2
+  metadata.gz: c8d2c2fc9c502f21710213e46ecd03937a61f58f0f6bdbc74652ab3995c5615eb1ef23ebdf79a1fe0afaa8fecdd39898ae1ad29b257de5314b2a038f2ff6f688
+  data.tar.gz: adbb7aa16fe70b8306cd0dd8f9740a15b1b23fd3c4b04ec61616120b3fcc3ad0e1e132c4a526d0cc682d0eb94067940c86f023654e457e01cc7e414033df57aa

data/lib/coremidi.rb

@@ -22,5 +22,5 @@ require "coremidi/source"
 require "coremidi/destination"
 
 module CoreMIDI
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/coremidi/source.rb

@@ -5,7 +5,12 @@ module CoreMIDI
 
     include Endpoint
 
-    attr_reader :buffer
+    # The buffer of received messages since instantiation
+    # @return [Array<Hash>]
+    def buffer
+      fill_buffer
+      @buffer
+    end
 
     #
     # An array of MIDI event hashes as such:
@@ -20,13 +25,7 @@ module CoreMIDI
     #
     # @return [Array<Hash>]
     def gets
-      until queued_messages?
-        # per https://github.com/arirusso/unimidi/issues/20#issuecomment-44761318
-        sleep(0.0001) # patch to prevent 100% CPU issue with some midi controllers
-      end
-      messages = queued_messages
-      @pointer = @buffer.length
-      messages
+      fill_buffer
     end
     alias_method :read, :gets
 
@@ -103,6 +102,18 @@ module CoreMIDI
 
     protected
 
+    # Migrate new received messages from the callback queue to
+    # the buffer
+    def fill_buffer
+      messages = []
+      until @queue.empty?
+        messages << @queue.pop
+      end
+      @buffer += messages
+      @pointer = @buffer.length
+      messages
+    end
+
     # Base initialization for this endpoint -- done whether or not the endpoint is enabled to check whether
     # it is truly available for use
     def connect
@@ -111,8 +122,8 @@ module CoreMIDI
       @resource = API.MIDIEntityGetSource(@entity.resource, @resource_id)
       error = API.MIDIPortConnectSource(@handle, @resource, nil )
       initialize_buffer
+      @queue = Queue.new
       @sysex_buffer = []
-      @start_time = Time.now.to_f
 
       error.zero?
     end
@@ -120,8 +131,8 @@ module CoreMIDI
 
     private
 
-    # Add a single message to the buffer
-    # @param [Array<Integer>] bytes Message data
+    # Add a single message to the callback queue
+    # @param [Array<Fixnum>] bytes Message data
     # @param [Float] timestamp The system float timestamp
     # @return [Array<Hash>] The resulting buffer
     def enqueue_message(bytes, timestamp)
@@ -132,28 +143,32 @@ module CoreMIDI
           @sysex_buffer.clear
         end
       end
-      @buffer << get_message_formatted(bytes, timestamp) if @sysex_buffer.empty?
-      @buffer
+      message = get_message_formatted(bytes, timestamp)
+      @queue << message
+      message
     end
 
     # New MIDI messages from the queue
     def queued_messages
-      @buffer.slice(@pointer, @buffer.length - @pointer)
+      @queue.pop
     end
 
     # Are there new MIDI messages in the queue?
     def queued_messages?
-      @pointer < @buffer.length
+      !@queue.empty?
     end
 
-    # The callback fired by coremidi when new MIDI messages are in the buffer
+    # The callback fired by coremidi when new MIDI messages are received
     def get_event_callback
+      Thread.abort_on_exception = true
       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) }
+          messages.each do |message|
+            enqueue_message(message, timestamp)
+          end
         rescue Exception => exception
           Thread.main.raise(exception)
         end
@@ -162,7 +177,7 @@ module CoreMIDI
 
     # Get MIDI messages from the given CoreMIDI packet list
     # @param [API::MIDIPacketList] new_packets The packet list
-    # @return [Array<Array<Integer>>] A collection of MIDI messages
+    # @return [Array<Array<Fixnum>>] A collection of MIDI messages
     def get_messages(packet_list)
       count = packet_list[:numPackets]
       first = packet_list[:packet][0]
@@ -186,8 +201,8 @@ module CoreMIDI
     end
 
     # Get the next index for "length" from the blob of MIDI data
-    # @param [Array<Integer>] data
-    # @return [Integer]
+    # @param [Array<Fixnum>] data
+    # @return [Fixnum]
     def find_next_length_index(data)
       last_is_zero = false
       data.each_with_index do |num, i|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-coremidi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest