midi-topaz 0.0.4 → 0.0.5

data/lib/topaz/external_midi_tempo.rb

@@ -3,12 +3,13 @@ module Topaz
   
   # trigger an event based on received midi clock messages
   class ExternalMIDITempo
+    
+    include TempoSource
    
-    attr_accessor :action
     attr_reader :clock
   
-    def initialize(input, options = {})
-      @action = options[:action]
+    def initialize(actions, input, options = {})
+      @actions = actions
       self.interval = options[:interval] || 4
       @tempo_calculator = TempoCalculator.new
       @clock = MIDIEye::Listener.new(input)
@@ -21,14 +22,12 @@ module Topaz
       @tempo_calculator.find_tempo
     end
     
-    def start(*a)
-      @action[:on_start].call unless @action[:on_start].nil?
+    def start(*a)      
       @clock.start(*a)
       self
     end
     
     def stop(*a)
-      @action[:on_stop].call unless @action[:on_stop].nil?
       @clock.start(*a)
       self
     end
@@ -61,17 +60,12 @@ module Topaz
     
     def initialize_clock
       @counter = 0
-      @clock.listen_for(:name => "Clock") do |msg|
-        if !@action[:stop_when].nil? && @action[:stop_when].call
-          stop
-          return
-        end 
-        @action[:destinations].each do |output|
-          output.on_tick
-        end        
+      @clock.listen_for(:name => "Clock") do |msg|        
+        (stop and return) if stop?
+        do_midi_clock
         @tempo_calculator.timestamps << msg[:timestamp]
         if @counter.eql?(@per_tick)
-          @action[:on_tick].call
+          do_tick
           @counter = 0 
         else
           @counter += 1

data/lib/topaz/internal_tempo.rb

@@ -3,12 +3,13 @@ module Topaz
 
   class InternalTempo < Gamelan::Timer
     
+    include TempoSource
+    
     attr_accessor :action
     
-    def initialize(tempo, options = {})
-      @action = options[:action]
+    def initialize(actions, tempo, options = {})
+      @actions = actions
       self.interval = options[:interval] || 4 
-      @destinations = options[:destinations]
       @last = 0
       @last_sync = 0
       super({:tempo => tempo})
@@ -17,7 +18,6 @@ module Topaz
     # start the internal timer
     # pass :background => true to keep the timer in a background thread
     def start(options = {})
-      @action[:on_start].call unless @action[:on_start].nil?
       run
       join unless options[:background]
       self
@@ -34,7 +34,6 @@ module Topaz
     
     # stop the timer
     def stop(*a)
-      @action[:on_stop].call unless @action[:on_stop].nil?
       super()
       self
     end
@@ -49,21 +48,28 @@ module Topaz
     # Run all ready tasks.
     def dispatch
       # stuff to do on every tick      
-      unless @last_sync.eql?((@phase * 24).to_i)
+      if time_for_midi_clock?
         # look for stop
-        if !@action[:stop_when].nil? && @action[:stop_when].call
-          stop
-          return
-        end 
-        @action[:destinations].each { |dest| dest.on_tick }        
+        (stop and return) if stop?
+        do_midi_clock        
         @last_sync = (@phase * 24).to_i
       end
       # stuff to do on @interval
-      unless @last.eql?((@phase * @interval).to_i)
-        @action[:on_tick].call
+      if time_for_tick?
+        do_tick
         @last = (@phase * @interval).to_i
       end      
     end
+    
+    private
+    
+    def time_for_midi_clock?
+      !@last_sync.eql?((@phase * 24).to_i)
+    end
+    
+    def time_for_tick?
+      !@last.eql?((@phase * @interval).to_i)
+    end
      
   end
   

data/lib/topaz/midi_sync_output.rb

@@ -9,17 +9,17 @@ module Topaz
     end
     
     # send a start message
-    def on_start
+    def start(*a)
       @output.puts(MIDIMessage::SystemRealtime["Start"].new.to_a)
     end
 
     # send a stop message
-    def on_stop
+    def stop(*a)
       @output.puts(MIDIMessage::SystemRealtime["Stop"].new.to_a)
     end
         
     # send a clock message
-    def on_tick
+    def midi_clock(*a)
       @output.puts(MIDIMessage::SystemRealtime["Clock"].new.to_a)
     end
     

data/lib/topaz/tempo.rb

@@ -6,27 +6,30 @@ module Topaz
     
     extend Forwardable
     
-    attr_reader :source
+    attr_reader :source, :destinations
     
     def_delegators :source, :tempo, :interval, :interval=, :join
   
     def initialize(*args, &event)
-      @destinations = []
+      @destinations = []      
+      @actions = { 
+        :start => nil,
+        :stop => nil,
+        :tick => nil,        
+        :midi_clock => Proc.new { @destinations.each { |d| d.send(:midi_clock) if d.respond_to?(:midi_clock) } },
+        :stop_when => nil
+      }
+      
+      on_tick(&event)
 
       if args.first.kind_of?(Numeric)
-        @source = InternalTempo.new(args.shift)
+        @source = InternalTempo.new(@actions, args.shift)
       end
       options = args.first
       
       initialize_midi_io(options)
       raise "You must specify an internal tempo rate or an external tempo source" if @source.nil?
-      @source.action = { 
-        :on_start => nil,
-        :on_stop => nil,
-        :on_tick => event,        
-        :destinations => @destinations,
-        :stop_when => nil
-      }
+      
       @source.interval = options[:interval] unless options.nil? || options[:interval].nil? 
     end
     
@@ -45,22 +48,26 @@ module Topaz
     
     # pass in a callback that is called when start is called
     def on_start(&block)
-      @source.action[:on_start] = block
+      @actions[:start] = block
     end
 
     # pass in a callback that is called when stop is called
     def on_stop(&block)
-      @source.action[:on_stop] = block
+      @actions[:stop] = block
     end
     
     # pass in a callback which will 
     def stop_when(&block)
-      @source.action[:stop_when] = block
+      @actions[:stop_when] = block
     end
     
     # pass in a callback which will be fired on each tick
     def on_tick(&block)
-      @source.action[:on_tick] = block
+      proc = Proc.new do |dests|
+        @destinations.each { |d| d.send(:tick) if d.respond_to?(:tick) }
+        yield
+      end
+      @actions[:tick] = proc
     end
         
     # this will start the generator
@@ -70,14 +77,16 @@ module Topaz
     #
     def start(options = {})
       @start_time = Time.now
-      @destinations.each { |dest| dest.on_start }
-      @source.start(options)
+      @destinations.each { |dest| dest.start(:parent => self) }
+      @source.start(options) if options[:parent].nil?
+      @actions[:start].call unless @actions[:start].nil?
     end
     
     # this will stop tempo
     def stop(options = {})
-      @destinations.each { |dest| dest.on_stop }
-      @source.stop(options)
+      @destinations.each { |dest| dest.stop(:parent => self) }
+      @source.stop(options) if options[:parent].nil?
+      @actions[:stop].call unless @actions[:stop].nil?
       @start_time = nil
     end
     
@@ -87,6 +96,19 @@ module Topaz
     end
     alias_method :time_since_start, :time
     
+    # add a destination
+    # accepts MIDISyncOutput or another Tempo object
+    def add_destination(tempo)
+      @destinations << tempo
+    end
+    alias_method :<<, :add_destination
+    
+    protected
+    
+    def tick
+      @actions[:tick].call
+    end
+    
     private
         
     def initialize_midi_io(args)
@@ -95,7 +117,7 @@ module Topaz
         if ports.kind_of?(Array) 
           ports.each { |port| initialize_midi_io(port) }
         elsif ports.type.eql?(:input) && @source.nil?
-          @source = ExternalMIDITempo.new(ports) 
+          @source = ExternalMIDITempo.new(@actions, ports) 
         elsif ports.type.eql?(:output)
           @destinations << MIDISyncOutput.new(ports)
         end

data/lib/topaz/tempo_source.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+module Topaz
+  
+  module TempoSource
+    
+    def do_midi_clock
+      @actions[:midi_clock].call
+    end
+    
+    def do_tick
+      @actions[:tick].call
+    end
+    
+    def stop?
+      !@actions[:stop_when].nil? && @actions[:stop_when].call
+    end
+   
+  end
+  
+end

data/lib/topaz.rb

@@ -9,6 +9,7 @@ require 'gamelan'
 require 'midi-eye'
 require 'midi-message'
 
+require 'topaz/tempo_source'
 require 'topaz/external_midi_tempo'
 require 'topaz/internal_tempo'
 require 'topaz/midi_sync_output'
@@ -17,6 +18,6 @@ require 'topaz/tempo'
 
 module Topaz
   
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
   
 end

metadata

@@ -2,7 +2,7 @@
 name: midi-topaz
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ari Russo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -04:00
+date: 2011-06-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - lib/topaz/midi_sync_output.rb
 - lib/topaz/internal_tempo.rb
 - lib/topaz/tempo_calculator.rb
+- lib/topaz/tempo_source.rb
 - lib/topaz/external_midi_tempo.rb
 - lib/topaz/tempo.rb
 - test/helper.rb