collavoce 0.0.3 → 0.0.4

data/lib/collavoce.rb

@@ -1,3 +1,14 @@
+module Collavoce
+  def self.device_name
+    @device_name
+  end
+
+  def self.device_name=(device_name)
+    @device_name = device_name
+  end
+end
+
 require 'collavoce/note'
 require 'collavoce/voice'
 require 'collavoce/tracker'
+require 'collavoce/sigint'

data/lib/collavoce/note.rb

@@ -1,6 +1,7 @@
 module Collavoce
   class Note
     class UnparsableError < RuntimeError; end
+    ShortMessage = Java::javax.sound.midi.ShortMessage
 
     attr_accessor :value
     attr_accessor :duration
@@ -83,5 +84,31 @@ module Collavoce
     def ==(other)
       value == other.value && duration == other.duration
     end
+
+    def on(receiver, channel)
+      @receiver = receiver
+      @channel = channel
+
+      message = ShortMessage.new
+      message.set_message(ShortMessage::NOTE_ON, @channel, value, 127);
+      @receiver.send(message, 0)
+    end
+
+    def off
+      message = ShortMessage.new
+      message.set_message(ShortMessage::NOTE_OFF, @channel, value, 127);
+      @receiver.send(message, 0)
+    end
+
+    def play(receiver, channel, bar_duration)
+      sleep_duration = bar_duration * duration
+      if value
+        on(receiver, channel)
+        sleep sleep_duration
+        off
+      else
+        sleep sleep_duration
+      end
+    end
   end
 end

data/lib/collavoce/sigint.rb

@@ -0,0 +1,13 @@
+module Collavoce
+  def self.stop
+    @running = false
+  end
+
+  def self.running
+    @running.nil? || @running
+  end
+end
+
+trap("INT") do
+  Collavoce.stop
+end

data/lib/collavoce/voice.rb

@@ -1,10 +1,7 @@
 module Collavoce
   class Voice
-    include Java
-  
-    MidiSystem = javax.sound.midi.MidiSystem
-    ShortMessage = javax.sound.midi.ShortMessage
-  
+    MidiSystem = Java::javax.sound.midi.MidiSystem
+
     attr_accessor :notes
 
     def self.notes(notes)
@@ -18,7 +15,7 @@ module Collavoce
     def self.new(options = {})
       super({:notes => @notes, :channel => @channel}.merge(options))
     end
-  
+
     def initialize(options = {})
       @channel      = (options.delete(:channel) || 1) - 1
       @notes        = options.delete(:notes).map { |n| Note.new(n) }
@@ -26,38 +23,45 @@ module Collavoce
       @bar_duration = (60.to_f / @bpm) * 4
     end
 
+    def output_devices
+      devices = MidiSystem.get_midi_device_info.to_a.map do |info|
+        MidiSystem.get_midi_device(info)
+      end
+      devices.select do |device|
+        device.get_max_receivers != 0
+      end
+    end
+
     def device
-      all = MidiSystem.get_midi_device_info.to_a
-      possible = all.select { |i| i.get_name == "Bus 1" }
-      devices = possible.map { |i| MidiSystem.get_midi_device(i) }
-      device = devices.select { |d| d.get_max_receivers != 0 }.first
-      device.open
-      device
+      name = Collavoce.device_name
+      selected_device = output_devices.detect do |device|
+        device.get_device_info.get_name == name
+      end
+
+      if !selected_device
+        raise "Couldn't find device called #{name}" if name
+        raise "No output devices available" if output_devices.empty?
+        selected_device = output_devices.first
+        $stderr.puts "INFO: Sending notes to #{selected_device.get_device_info.get_name}"
+      end
+
+      selected_device.open
+      selected_device
     end
-  
+
     def receiver
       return @receiver if @receiver
       @receiver = device.get_receiver
     end
-  
+
     def send_note(note, channel)
-      duration = @bar_duration * note.duration
-      if note.value
-        noteon = ShortMessage.new
-        noteon.set_message(ShortMessage::NOTE_ON, channel, note.value, 127);
-        noteoff = ShortMessage.new
-        noteoff.set_message(ShortMessage::NOTE_OFF, channel, note.value, 127);
-        receiver.send(noteon, 0)
-        sleep duration
-        receiver.send(noteoff, 0)
-      else
-        sleep duration
-      end
+      note.play(receiver, channel, @bar_duration)
     end
-  
+
     def play(this_many = 1)
      this_many.times do
        @notes.each do |note|
+         break unless Collavoce.running
          send_note(note, @channel)
        end
      end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 3
-  version: 0.0.3
+    - 4
+  version: 0.0.4
 platform: ruby
 authors: 
   - Mat Schaffer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
   - README.rdoc
   - lib/collavoce.rb
   - lib/collavoce/note.rb
+  - lib/collavoce/sigint.rb
   - lib/collavoce/tracker.rb
   - lib/collavoce/voice.rb
 has_rdoc: true