unimidi 0.1.3-i686-linux → 0.1.4-i686-linux

data/README.rdoc

@@ -6,7 +6,7 @@ Platform independent realtime MIDI input and output for Ruby.
 
 == Features
 
-* Currently Linux, JRuby, Windows and Cygwin are supported. OSX is {in progress}[http://github.com/arirusso/ffi-coremidi]
+* Supports Linux, JRuby, OSX, Windows and Cygwin
 * Both input and output to and from multiple devices concurrently
 * Agnostically handle different MIDI and SysEx Message types
 
@@ -16,7 +16,8 @@ Platform
 
 * JRuby: {midi-jruby}[http://github.com/arirusso/midi-jruby]
 * Linux: {alsa-rawmidi}[http://github.com/arirusso/alsa-rawmidi]
-* Windows/Cygwin: {midi-winmm}[http://github.com/arirusso/midi-winmm] 
+* OSX: {ffi-coremidi}[http://github.com/arirusso/ffi-coremidi]
+* Windows/Cygwin: {midi-winmm}[http://github.com/arirusso/midi-winmm]
 
 A couple of notes about JRuby only:
 

data/lib/unimidi.rb

@@ -6,7 +6,7 @@
 
 module UniMIDI
   
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
  
 end
 

data/lib/unimidi/adapter/alsa-rawmidi.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 #
-# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
-#
 
 require 'alsa-rawmidi'
 
@@ -12,20 +10,20 @@ module UniMIDI
     class Input
       include CongruousApiAdapter::Device
       include CongruousApiAdapter::Input
-      defer_to AlsaRawMIDI::Input
+      DeferToClass = AlsaRawMIDI::Input
     end
 
     class Output
       include CongruousApiAdapter::Device
       include CongruousApiAdapter::Output
-      defer_to AlsaRawMIDI::Output
+      DeferToClass = AlsaRawMIDI::Output
     end
     
     class Device
       extend CongruousApiAdapter::Device::ClassMethods
-      defer_to AlsaRawMIDI::Device
-      input_class Input
-      output_class Output
+      DeferToClass = AlsaRawMIDI::Device
+      InputClass = Input
+      OutputClass = Output
     end
     
   end

data/lib/unimidi/adapter/ffi-coremidi.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+#
+
+require 'coremidi'
+
+module UniMIDI
+
+  module CoreMIDIAdapter
+    
+    class Input
+      include CongruousApiAdapter::Device
+      include CongruousApiAdapter::Input
+      DeferToClass = CoreMIDI::Input
+    end
+
+    class Output
+      include CongruousApiAdapter::Device
+      include CongruousApiAdapter::Output
+      DeferToClass = CoreMIDI::Output
+    end
+    
+    class Device
+      extend CongruousApiAdapter::Device::ClassMethods
+      DeferToClass = CoreMIDI::Device
+      InputClass = Input
+      OutputClass = Output
+    end
+    
+  end
+
+end

data/lib/unimidi/adapter/midi-jruby.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 #
-# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
-#
 
 require 'midi-jruby'
 
@@ -12,20 +10,20 @@ module UniMIDI
     class Input
       include CongruousApiAdapter::Device
       include CongruousApiAdapter::Input
-      defer_to MIDIJRuby::Input
+      DeferToClass = MIDIJRuby::Input
     end
 
     class Output
       include CongruousApiAdapter::Device
       include CongruousApiAdapter::Output
-      defer_to MIDIJRuby::Output
+      DeferToClass = MIDIJRuby::Output
     end
     
     class Device
       extend CongruousApiAdapter::Device::ClassMethods
-      defer_to MIDIJRuby::Device
-      input_class Input
-      output_class Output
+      DeferToClass = MIDIJRuby::Device
+      InputClass = Input
+      OutputClass = Output
     end
 
   end

data/lib/unimidi/adapter/midi-winmm.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 #
-# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
-#
 
 require 'midi-winmm'
 
@@ -12,20 +10,20 @@ module UniMIDI
     class Input
       include CongruousApiAdapter::Device
       include CongruousApiAdapter::Input
-      defer_to MIDIWinMM::Input
+      DeferToClass = MIDIWinMM::Input
     end
 
     class Output
       include CongruousApiAdapter::Device
       include CongruousApiAdapter::Output
-      defer_to MIDIWinMM::Output
+      DeferToClass = MIDIWinMM::Output
     end
     
     class Device
       extend CongruousApiAdapter::Device::ClassMethods
-      defer_to MIDIWinMM::Device
-      input_class Input
-      output_class Output
+      DeferToClass = MIDIWinMM::Device
+      InputClass = Input
+      OutputClass = Output
     end
 
   end

data/lib/unimidi/congruous_api_adapter.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 #
-# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
-#
 
 module UniMIDI
 
@@ -42,7 +40,7 @@ module UniMIDI
 
       module ClassMethods
         
-        def first         
+        def first
           new(device_class.first)
         end
         
@@ -60,29 +58,17 @@ module UniMIDI
             :output => device_class.all_by_type[:output].map { |d| get_output_class.new(d) }
           }
         end
-        
-        def defer_to(klass)
-          const_set("DeferToClass", klass)
-        end
-        
+
         def get_input_class
-          const_get("InputClass")
+          self::InputClass
         end
-        
+
         def get_output_class
-          const_get("OutputClass")
+          self::OutputClass
         end
 
-        def input_class(klass)
-          const_set("InputClass", klass)
-        end
-        
-        def output_class(klass)
-          const_set("OutputClass", klass)
-        end
-        
         def device_class
-          const_get("DeferToClass")
+          self::DeferToClass
         end
 
       end
@@ -122,6 +108,8 @@ module UniMIDI
       def gets_bytestr(*a)
         @device.gets_bytestr(*a)
       end
+      alias_method :gets_s, :gets_bytestr
+      alias_method :gets_hex, :gets_bytestr
 
       #
       # returns an array of data bytes such as 
@@ -140,6 +128,8 @@ module UniMIDI
         arr = gets_bytestr
         arr.map { |msg| msg[:data] }.join
       end
+      alias_method :gets_data_s, :gets_data_bytestr
+      alias_method :gets_data_hex, :gets_data_bytestr
       
       module ClassMethods
              

data/lib/unimidi/platform.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 #
-# (c)2010-2011 Ari Russo and licensed under the Apache 2.0 License
-#
 
 require 'singleton'
 
@@ -15,16 +13,18 @@ module UniMIDI
       
       def initialize
         lib = case RUBY_PLATFORM
-          when /java/ then 'midi-jruby'
-          when /linux/ then 'alsa-rawmidi'
-          when /mingw/ then 'midi-winmm' #cygwin
-          when /win/ then 'midi-winmm'
+          when /darwin/ then "ffi-coremidi"
+          when /java/ then "midi-jruby"
+          when /linux/ then "alsa-rawmidi"
+          when /mingw/ then "midi-winmm"
+          when /win/ then "midi-winmm"
         end
         require("unimidi/adapter/#{lib}")
         @interface = case RUBY_PLATFORM
+          when /darwin/ then CoreMIDIAdapter
           when /java/ then MIDIJRubyAdapter
           when /linux/ then AlsaRawMIDIAdapter
-          when /mingw/ then MIDIWinMMAdapter #cygwin
+          when /mingw/ then MIDIWinMMAdapter
           when /win/ then MIDIWinMMAdapter 
         end
       end

metadata

@@ -2,7 +2,7 @@
 name: unimidi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: i686-linux
 authors: 
 - Ari Russo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -04:00
+date: 2011-05-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/unimidi.rb
+- lib/unimidi/adapter/ffi-coremidi.rb
 - lib/unimidi/adapter/midi-winmm.rb
 - lib/unimidi/adapter/alsa-rawmidi.rb
 - lib/unimidi/adapter/midi-jruby.rb