unimidi 0.0.7-java → 0.0.8-java

data/README.rdoc

@@ -6,7 +6,7 @@ Platform independent realtime MIDI input and output for Ruby.
 
 == Features
 
-* Platform independent.  Currently Linux, JRuby, Windows and Cygwin are supported. More platforms will follow (see "to-do")
+* Currently Linux, JRuby, Windows and Cygwin are supported. More platforms will follow (see "to-do")
 * Both input and output to and from multiple devices concurrently
 * Agnostically handle different MIDI Message types (including SysEx)
 
@@ -18,7 +18,10 @@ Platform
 * Linux: {alsa-rawmidi}[http://github.com/arirusso/alsa-rawmidi]
 * Windows/Cygwin: {midi-winmm}[http://github.com/arirusso/midi-winmm] 
 
-Note that if you are using JRuby you must be in 1.9 mode.  This is normally accomplished by passing --1.9 to JRuby at the command line.
+A couple of notes about JRuby only:
+
+* You must be in 1.9 mode.  This is normally accomplished by passing --1.9 to JRuby at the command line.
+* javax.sound has some documented issues with SysEx messages in some versions OSX Snow Leopard which do affect this library. 
 	
 == Install
 
@@ -39,7 +42,7 @@ Note that if you are using JRuby you must be in 1.9 mode.  This is normally acco
 
 == To-do
 
-* OSX (coremidirb?) implementation
+* OSX {coremidi}[http://github.com/arirusso/coremidi] implementation once that lib is done
 	
 == Author 
 
@@ -49,4 +52,4 @@ Note that if you are using JRuby you must be in 1.9 mode.  This is normally acco
 
 Apache 2.0, See the file LICENSE
 
-Copyright (c) 2010-2011 Ari Russo  
+Copyright (c) 2010-2011 Ari Russo  

data/lib/unimidi.rb

@@ -4,7 +4,7 @@
 #
 module UniMIDI
   
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
  
 end
 

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

@@ -4,11 +4,6 @@ module UniMIDI
 
   module AlsaRawMIDIAdapter
     
-    class Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      defer_to AlsaRawMIDI::Device
-    end
-    
     class Input
       include CongruousApiAdapter::Device
       include CongruousApiAdapter::Input
@@ -20,7 +15,14 @@ module UniMIDI
       include CongruousApiAdapter::Output
       defer_to AlsaRawMIDI::Output
     end
-
+    
+    class Device
+      extend CongruousApiAdapter::Device::ClassMethods
+      defer_to AlsaRawMIDI::Device
+      input_class Input
+      output_class Output
+    end
+    
   end
 
 end

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

@@ -2,12 +2,7 @@ require 'midi-jruby'
 
 module UniMIDI
 
-  module AlsaRawMIDIAdapter
-    
-    class Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      defer_to MIDIJRuby::Device
-    end
+  module MIDIJRubyAdapter
     
     class Input
       include CongruousApiAdapter::Device
@@ -20,6 +15,13 @@ module UniMIDI
       include CongruousApiAdapter::Output
       defer_to MIDIJRuby::Output
     end
+    
+    class Device
+      extend CongruousApiAdapter::Device::ClassMethods
+      defer_to MIDIJRuby::Device
+      input_class Input
+      output_class Output
+    end
 
   end
 

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

@@ -4,11 +4,6 @@ module UniMIDI
 
   module MIDIWinMMAdapter
     
-    class Device
-      extend CongruousApiAdapter::Device::ClassMethods
-      defer_to MIDIWinMM::Device
-    end
-    
     class Input
       include CongruousApiAdapter::Device
       include CongruousApiAdapter::Input
@@ -20,6 +15,13 @@ module UniMIDI
       include CongruousApiAdapter::Output
       defer_to MIDIWinMM::Output
     end
+    
+    class Device
+      extend CongruousApiAdapter::Device::ClassMethods
+      defer_to MIDIWinMM::Device
+      input_class Input
+      output_class Output
+    end
 
   end
 

data/lib/unimidi/congruous_api_adapter.rb

@@ -6,10 +6,12 @@ module UniMIDI
       
       def initialize(device_obj)
         @device = device_obj
+        @id = @device.id
+        @name = @device.name
       end
       
       def open(*a, &block)
-        begin 
+        begin
           @device.open(*a)
           block.call(self)
         ensure
@@ -22,7 +24,9 @@ module UniMIDI
       end
 
       def self.included(base)
-        base.send(:attr_reader, :device)
+        #base.send(:attr_reader, :device)
+        base.send(:attr_reader, :name)
+        base.send(:attr_reader, :id)
       end
 
       module ClassMethods
@@ -36,20 +40,36 @@ module UniMIDI
         end
         
         def all
-          device_class.all.map { |d| new(d) }
+          all_by_type.values.flatten
         end
         
         def all_by_type
           { 
-            :input => device_class.all_by_type[:input].map { |d| new(d) },
-            :output => device_class.all_by_type[:output].map { |d| new(d) }
+            :input => device_class.all_by_type[:input].map { |d| get_input_class.new(d) },
+            :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")
+        end
+        
+        def get_output_class
+          const_get("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")
         end
@@ -65,18 +85,53 @@ module UniMIDI
         base.extend(ClassMethods)
       end
 
+      #
+      # returns an array of MIDI event hashes as such:
+      # [
+      #   { :data => [144, 60, 100], :timestamp => 1024 },
+      #   { :data => [128, 60, 100], :timestamp => 1100 },
+      #   { :data => [144, 40, 120], :timestamp => 1200 }
+      # ]
+      #
+      # the data is an array of Numeric bytes
+      # the timestamp is the number of millis since this input was enabled
+      #
       def gets(*a)
         @device.gets(*a)
       end
       
+      #
+      # same as gets but returns message data as string of hex digits as such:
+      # [ 
+      #   { :data => "904060", :timestamp => 904 },
+      #   { :data => "804060", :timestamp => 1150 },
+      #   { :data => "90447F", :timestamp => 1300 }
+      # ]
+      #
       def gets_bytestr(*a)
         @device.gets_bytestr(*a)
       end
+
+      #
+      # returns an array of data bytes such as [144, 60, 100, 128, 60, 100, 144, 40, 120]
+      #       
+      def gets_data(*a)
+        arr = gets
+        arr.map { |msg| msg[:data] }.inject { |a,b| a + b }
+      end
+
+      #
+      # returns a string of data such as "90406080406090447F"
+      #             
+      def gets_data_bytestr(*a)
+        arr = gets_bytestr
+        arr.map { |msg| msg[:data] }.join
+      end
       
       module ClassMethods
-        
-        def self.all
-          device_class.all_by_type[:input].map { |d| new(d) }
+             
+        def all
+          device_class.all.map { |d| new(d) }
         end
         
       end
@@ -100,8 +155,8 @@ module UniMIDI
       
       module ClassMethods
         
-        def self.all
-          device_class.all_by_type[:output].map { |d| new(d) }
+        def all
+          device_class.all.map { |d| new(d) }
         end
         
       end

data/lib/unimidi/platform.rb

@@ -17,7 +17,7 @@ module UniMIDI
         end
         require("unimidi/adapter/#{lib}")
         @interface = case RUBY_PLATFORM
-          when /java/ then MIDIJRuby
+          when /java/ then MIDIJRubyAdapter
           when /linux/ then AlsaRawMIDIAdapter
           when /mingw/ then MIDIWinMMAdapter #cygwin
           when /win/ then MIDIWinMMAdapter 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 7
-  version: 0.0.7
+    - 8
+  version: 0.0.8
 platform: java
 authors: 
   - Ari Russo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 -04:00
+date: 2011-04-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency