collavoce 0.0.1 → 0.0.2

data/lib/collavoce.rb

@@ -1,2 +1,3 @@
 require 'collavoce/note'
 require 'collavoce/voice'
+require 'collavoce/tracker'

data/lib/collavoce/tracker.rb

@@ -0,0 +1,19 @@
+module Collavoce
+  class Tracker
+    def initialize(*tracks)
+      @tracks = tracks
+    end
+
+    def run(bpm = 120)
+      @threads = []
+      @tracks.each do |track|
+        @threads << Thread.new do
+          track.each do |voice|
+            voice.new(:bpm => bpm).run
+          end
+        end
+      end
+      @threads.map(&:join)
+    end
+  end
+end

data/lib/collavoce/voice.rb

@@ -5,14 +5,25 @@ module Collavoce
     MidiSystem = javax.sound.midi.MidiSystem
     ShortMessage = javax.sound.midi.ShortMessage
   
-    BPM = 160
-    BarDuration = (60.to_f / BPM) * 4
-
     attr_accessor :notes
+
+    def self.notes(notes)
+      @notes = notes
+    end
+
+    def self.channel(channel)
+      @channel = channel
+    end
+
+    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) }
+      @channel      = (options.delete(:channel) || 1) - 1
+      @notes        = options.delete(:notes).map { |n| Note.new(n) }
+      @bpm          = options.delete(:bpm) || 120
+      @bar_duration = (60.to_f / @bpm) * 4
     end
 
     def device
@@ -35,7 +46,7 @@ module Collavoce
       noteoff = ShortMessage.new
       noteoff.set_message(ShortMessage::NOTE_OFF, channel, note.value, 127);
       receiver.send(noteon, 0)
-      sleep BarDuration * note.duration
+      sleep @bar_duration * note.duration
       receiver.send(noteoff, 0)
     end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 1
-  version: 0.0.1
+    - 2
+  version: 0.0.2
 platform: ruby
 authors: 
   - Mat Schaffer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 -05:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -29,6 +29,18 @@ dependencies:
             version: "0"
     type: :development
     version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :development
+    version_requirements: *id002
 description: 
 email: mat@schaffer.me
 executables: []
@@ -41,6 +53,7 @@ files:
   - README.rdoc
   - lib/collavoce.rb
   - lib/collavoce/note.rb
+  - lib/collavoce/tracker.rb
   - lib/collavoce/voice.rb
 has_rdoc: true
 homepage: https://github.com/matschaffer/collavoce