ffi-coremidi 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78f0f4a2f28a88dbd7e30dd04170431576b8a2d2
-  data.tar.gz: 3391e7c3b510ac72d803193c6d2c7985ab22beb1
+  metadata.gz: b89ec50ebb1e9fd6bca17f28dbfb065e85edb4ee
+  data.tar.gz: d213dd0c938562dab97afe5d262fec5fcb1b491d
 SHA512:
-  metadata.gz: e0bb791847a60cdfa3b1d1e6e63382b2bfb650bb2777423626c4a5e46ac6edeba34a5daae5c4824ff0e3f1d4d53ff75bc33541dd60f625cbf59ed2bf32ec8308
-  data.tar.gz: 951c94ece0cc49abec4170fb955a82977510a46a88980f1798acedb5757acbb9711b0784fe4350296919b39e1b0adf21f97a58dba0bd0c2275418ae636ee4f6a
+  metadata.gz: 810f3b9da5ec4e3bc9f85962fc82e56fa6e41fb022bae10364bdf57285b3a8d448a770eac869955f522f23fb6a6ded6c314eb6a924d5453eabad8cdbfd840323
+  data.tar.gz: e7f2022a340fe38364d409e4c26cf30a5721cd367e9174a8b3c57f38bd1441f5e9ece9337a505a0aa2a775ae247e45832e1e1abb643e3b224a7b3701ebfc0adc

data/lib/coremidi.rb

@@ -3,21 +3,21 @@
 # Realtime MIDI IO with Ruby for OSX
 # (c)2011-2015 Ari Russo
 
-# libs
+# Libs
 require "ffi"
 require "forwardable"
 
-# modules
+# Modules
 require "coremidi/api"
 require "coremidi/endpoint"
 require "coremidi/type_conversion"
 
-# classes
+# Classes
 require "coremidi/entity"
 require "coremidi/device"
 require "coremidi/source"
 require "coremidi/destination"
 
 module CoreMIDI
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/lib/coremidi/api.rb

@@ -77,7 +77,7 @@ module CoreMIDI
       handle_ptr = FFI::MemoryPointer.new(:pointer)
       error = API.MIDIInputPortCreate(client, port_name, callback, nil, handle_ptr)
       handle = handle_ptr.read_pointer
-      { 
+      {
         :error => error,
         :handle => handle
       }
@@ -98,11 +98,12 @@ module CoreMIDI
     def self.get_midi_packet_list(bytes, size)
       packet_list = FFI::MemoryPointer.new(256)
       packet_ptr = API.MIDIPacketListInit(packet_list)
+      time = HostTime.AudioGetCurrentHostTime
       packet_ptr = if X86_64
-        API.MIDIPacketListAdd(packet_list, 256, packet_ptr, 0, size, bytes)
+        API.MIDIPacketListAdd(packet_list, 256, packet_ptr, time, size, bytes)
       else
         # Pass in two 32-bit 0s for the 64 bit time
-        API.MIDIPacketListAdd(packet_list, 256, packet_ptr, 0, 0, size, bytes)
+        time1 = API.MIDIPacketListAdd(packet_list, 256, packet_ptr, time >> 32, time & 0xFFFFFFFF, size, bytes)
       end
       packet_list
     end
@@ -160,7 +161,7 @@ module CoreMIDI
 
     # MIDIEndpointRef MIDIEntityGetDestination(MIDIEntityRef entity, ItemCount destIndex0);
     attach_function :MIDIGetDestination, [:int], :pointer
-    
+
     #extern OSStatus MIDIEndpointDispose( MIDIEndpointRef endpt );
     attach_function :MIDIEndpointDispose, [:MIDIEndpointRef], :OSStatus
 
@@ -178,8 +179,8 @@ module CoreMIDI
 
     # MIDIDeviceRef MIDIGetDevice(ItemCount deviceIndex0);
     attach_function :MIDIGetDevice, [:ItemCount], :MIDIDeviceRef
-    
-    # extern OSStatus MIDIInputPortCreate( MIDIClientRef client, CFStringRef portName, 
+
+    # extern OSStatus MIDIInputPortCreate( MIDIClientRef client, CFStringRef portName,
     #                                      MIDIReadProc readProc, void * refCon, MIDIPortRef * outPort );
     attach_function :MIDIInputPortCreate, [:MIDIClientRef, :CFStringRef, :MIDIReadProc, :pointer, :MIDIPortRef], :OSStatus
 
@@ -188,7 +189,7 @@ module CoreMIDI
 
     # OSStatus MIDIObjectGetStringProperty (MIDIObjectRef  obj, CFStringRef propertyID, CFStringRef *str);
     attach_function :MIDIObjectGetStringProperty, [:MIDIObjectRef, :CFStringRef, :pointer], :OSStatus
-                                                                                                                    
+
     # extern OSStatus MIDIOutputPortCreate( MIDIClientRef client, CFStringRef portName, MIDIPortRef * outPort );
     attach_function :MIDIOutputPortCreate, [:MIDIClientRef, :CFStringRef, :pointer], :int
 
@@ -210,11 +211,11 @@ module CoreMIDI
     #OSStatus MIDISendSysex(MIDISysexSendRequest *request);
     attach_function :MIDISendSysex, [:pointer], :int
 
-    # extern MIDIPacket * MIDIPacketListAdd( MIDIPacketList * pktlist, ByteCount listSize, 
-    #                                        MIDIPacket * curPacket, MIDITimeStamp time, 
+    # extern MIDIPacket * MIDIPacketListAdd( MIDIPacketList * pktlist, ByteCount listSize,
+    #                                        MIDIPacket * curPacket, MIDITimeStamp time,
     #                                        ByteCount nData, const Byte * data)
     if X86_64
-      attach_function :MIDIPacketListAdd, [:pointer, :int, :pointer, :int, :int, :pointer], :pointer
+      attach_function :MIDIPacketListAdd, [:pointer, :int, :pointer, :uint64, :int, :pointer], :pointer
     else
       attach_function :MIDIPacketListAdd, [:pointer, :int, :pointer, :int, :int, :int, :pointer], :pointer
     end
@@ -253,6 +254,8 @@ module CoreMIDI
 
       # UInt64 AudioConvertHostTimeToNanos(UInt64 IO)
       attach_function :AudioConvertHostTimeToNanos, [:uint64], :uint64
+      # UInt64 AudioGetCurrentHostTime()
+      attach_function :AudioGetCurrentHostTime, [], :uint64
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-coremidi
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ffi-coremidi
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Realtime MIDI IO with Ruby for OSX