basic-sequencer 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fee1fb5787628ee5fd6fe422239e040e37d7309
-  data.tar.gz: 24ca6dca2aad4d6dad6cb9221f2d0b61f7870adb
+  metadata.gz: 722856e8bef08a89038e702c392acc46669073da
+  data.tar.gz: 2b46f59d3783cce98365db2f86bf6dddfa555fdf
 SHA512:
-  metadata.gz: cb36e4d709eb8b179f84a91c132c85cc0efa6c2c94449ab90387ec05c7807dd273278afd1404944b878d8fb6e76c7444c97c44edfdf60cb42de241404c5dddfe
-  data.tar.gz: ad16382fa3c2a3922277e964ef849b304dedc92910e38a1856f063378cd8f660be720734dd3b2ab516c3589e2e4ddd6835467a964d29b29ba3ff6ead9962f2af
+  metadata.gz: c3cc680925ca28a6271df0e2940d386ac8e373ff7680ada22a703b298512cc16cdeda0011116b426e41686769e10960b543faa3bea9d35b486407000de22c6bd
+  data.tar.gz: 15461e615f8c311657104dd77d504db9f277443c0a2ee6132bc48078ea2d7dc5e249f826fb3b288e991b7eab2181cb063a8a240f92c6478853a27d7c435f30d3

data/lib/sequencer.rb

@@ -19,6 +19,6 @@ require "sequencer/loop"
 
 module Sequencer
   
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
   
 end

data/lib/sequencer/clock.rb

@@ -1,103 +1,6 @@
 module Sequencer 
 
-  # A light wrapper for Topaz::Tempo that adds some event handling
-  class Clock
+  # Alias
+  Clock = Topaz::Clock
 
-    extend Forwardable
-
-    attr_reader :event
-    def_delegators :@clock, :pause, :stop, :tempo, :tempo=, :unpause
-
-    # @param [Fixnum, UniMIDI::Input] tempo_or_input
-    # @param [Hash] options
-    # @option options [Array<UniMIDI::Output>, UniMIDI::Output] :output (also: :outputs) MIDI output device(s)     
-    def initialize(tempo_or_input, options = {})
-      @event = Event.new
-      outputs = options[:output] || options[:outputs] 
-      resolution = options.fetch(:resolution, 128)
-      initialize_clock(tempo_or_input, resolution, :output => outputs)
-    end
-
-    # Start the clock
-    # @param [Hash] options
-    # @option options [Boolean] :background Whether to run in the background
-    # @option options [Boolean] :blocking Whether to run in the foreground (also :focus, :foreground)
-    # @option options [Boolean] :suppress_clock Whether this clock is a sync-slave
-    # @return [Boolean]
-    def start(options = {})
-      clock_options = {}
-      clock_options[:background] = !!options[:background]
-      clock_options[:background] ||= ![:blocking, :focus, :foreground].any? { |key| !!options[key] }
-      @clock.start(clock_options) unless !!options[:suppress_clock]
-      Thread.abort_on_exception = true
-    end
-
-    # Add a MIDI clock output
-    # @param [Array<UniMIDI::Output>, UniMIDI::Output] output
-    # @return [Array<UniMIDI::Output>]
-    def add_midi_output(output)
-      outputs = [output].flatten
-      @clock.add_destination(outputs)
-      midi_outputs
-    end
-
-    # Remove a MIDI clock output
-    # @param [Array<UniMIDI::Output>, UniMIDI::Output] output
-    # @return [Array<UniMIDI::Output>]
-    def remove_midi_output(output)
-      outputs = [output].flatten
-      @clock.remove_destination(outputs)
-      midi_outputs
-    end
-
-    # The MIDI outputs
-    # @return [Array<UniMIDI::Output>]
-    def midi_outputs
-      @clock.destinations.map(&:output)
-    end
-
-    private
-
-    # Action taken by the clock on a tick.  Fires the tick event
-    def on_tick
-      @event.do_tick
-    end
-
-    # Instantiate the underlying clock object
-    # @param [Fixnum, UniMIDI::Input] tempo_or_input
-    # @param [Fixnum] resolution
-    # @param [Hash] options
-    # @option options [Array<UniMIDI::Output>, UniMIDI::Output] :output MIDI output device(s) 
-    def initialize_clock(tempo_or_input, resolution, options = {})
-      @clock = Topaz::Tempo.new(tempo_or_input, :midi => options[:output]) 
-      @clock.interval = @clock.interval * (resolution / @clock.interval)
-      @clock.on_tick { on_tick }
-    end
-
-    # Clock event callbacks
-    class Event
-
-      def initialize
-        @tick = []
-      end
-
-      # Access the tick event callback
-      # @param [Proc] block
-      # @return [Proc]
-      def tick(&block)
-        if block_given?
-          @tick.clear
-          @tick << block
-        end
-        @tick
-      end
-
-      # Fire the tick event callback
-      # @return [Boolean]
-      def do_tick
-        !@tick.empty? && @tick.map(&:call)
-      end
-
-    end
-  end
 end

data/test/clock_test.rb

@@ -8,42 +8,36 @@ class Sequencer::ClockTest < Test::Unit::TestCase
       @clock = Sequencer::Clock.new(120)
     end
 
-    context "Clock#initialize" do
+    context "Clock#midi_output" do
 
       should "get MIDI output" do
         output = Object.new
-        @clock = Sequencer::Clock.new(120, :output => output)
-        assert_not_nil @clock.midi_outputs
-        assert_not_empty @clock.midi_outputs
-        assert @clock.midi_outputs.include?(output)
+        @clock = Sequencer::Clock.new(120, :midi => output)
+        assert_not_nil @clock.midi_output.devices
+        assert_not_empty @clock.midi_output.devices
+        assert @clock.midi_output.devices.include?(output)
       end
 
-    end
-
-    context "Clock#add_midi_output" do
-
       should "add MIDI output" do
         output = Object.new
-        refute @clock.midi_outputs.include?(output)
-        @clock.add_midi_output(output)
-        assert_not_nil @clock.midi_outputs
-        assert_not_empty @clock.midi_outputs
-        assert @clock.midi_outputs.include?(output)
+        refute @clock.midi_output.devices.include?(output)
+        @clock.midi_output.devices << output
+        assert_not_nil @clock.midi_output.devices
+        assert_not_empty @clock.midi_output.devices
+        assert @clock.midi_output.devices.include?(output)
       end
 
-    end
-
-    context "Clock#remove_midi_output" do
-
       should "remove MIDI output" do
         output = Object.new
-        refute @clock.midi_outputs.include?(output)
-        @clock.add_midi_output(output)
-        assert_not_nil @clock.midi_outputs
-        assert_not_empty @clock.midi_outputs
-        assert @clock.midi_outputs.include?(output)
-        @clock.remove_midi_output(output)
-        refute @clock.midi_outputs.include?(output)
+        refute @clock.midi_output.devices.include?(output)
+        @clock.midi_output.devices << output
+        
+        assert_not_nil @clock.midi_output.devices
+        assert_not_empty @clock.midi_output.devices
+        assert @clock.midi_output.devices.include?(output)
+
+        @clock.midi_output.devices.delete(output)
+        refute @clock.midi_output.devices.include?(output)
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basic-sequencer
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-topaz