musa-dsl 0.14.18 → 0.14.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d4df51d6162aef04ab11bd89ad57d36542c6eb2ef5e9b3e0ad2e66b18c75f76
-  data.tar.gz: 31387f0b48ddb90cb3ed3ec628bcb6c60fea207a73350d3664c657bff5cc3ab9
+  metadata.gz: 9fda568f7b4eef0b94479ab3f9e5833a130d82ba2386687607a0a4193c292f0e
+  data.tar.gz: e7366f81def8b65c0977c004ef02a50ce01472a1c5a29b5b9ec0916ff1989538
 SHA512:
-  metadata.gz: d04c5711e673f5d26b17132506648915676fcee7994f6ecf770abdb810972a59a209e2ff21e8cbdd9c535de5e36c43944c29db2fa28d1ccd1725f1ec6a560aa9
-  data.tar.gz: 845cdd7371bc3db81090bf380ef38244ffd2debc0cfacbf07f8a13171f48bf850f318b99eb08d19cc2288395825ebe16877dd148de6eb6e8716c2be258f0d388
+  metadata.gz: 1d78176e99d1746d2eba617fac89602c56bc4aa8a165d7f0ee1e696b726f52c0b7a89347b313e47d2d5e6252cb3f2c5d0627af0a68a6ccb0deb10d3f1c3a4ceb
+  data.tar.gz: c16e547be13a8c6592722afbc6cb6a8b571a8930b0c0079b9067baee43c4c237b1123fff554674bd572c68a662d718f10c0402dd0fe5d01a779560d3f1b5bf76

data/lib/musa-dsl/sequencer/base-sequencer-public.rb

@@ -4,7 +4,7 @@ require 'musa-dsl/core-ext/key-parameters-procedure-binder'
 require 'musa-dsl/series'
 
 class Musa::BaseSequencer
-  attr_reader :ticks_per_bar, :tick_duration, :running_position
+  attr_reader :beats_per_bar, :ticks_per_beat, :ticks_per_bar, :tick_duration, :running_position
   attr_reader :everying, :playing, :moving
 
   @@tick_mutex = Mutex.new
@@ -13,9 +13,14 @@ class Musa::BaseSequencer
     do_log ||= false
 
     @on_debug_at = []
-    @on_fast_forward = []
     @on_block_error = []
 
+    @before_tick = []
+    @on_fast_forward = []
+
+    @beats_per_bar = Rational(beats_per_bar)
+    @ticks_per_beat = Rational(ticks_per_beat)
+
     @ticks_per_bar = Rational(beats_per_bar * ticks_per_beat)
     @tick_duration = Rational(1, @ticks_per_bar)
 
@@ -44,6 +49,8 @@ class Musa::BaseSequencer
   def tick
     position_to_run = (@position += 1)
 
+    @before_tick.each { |block| block.call Rational(position_to_run, @ticks_per_bar) }
+
     if @score[position_to_run]
       @score[position_to_run].each do |command|
 
@@ -92,15 +99,19 @@ class Musa::BaseSequencer
   end
 
   def on_debug_at(&block)
-    @on_debug_at << block
+    @on_debug_at << KeyParametersProcedureBinder.new(block)
   end
 
   def on_block_error(&block)
-    @on_block_error << block
+    @on_block_error << KeyParametersProcedureBinder.new(block)
   end
 
   def on_fast_forward(&block)
-    @on_fast_forward << block
+    @on_fast_forward << KeyParametersProcedureBinder.new(block)
+  end
+
+  def before_tick(&block)
+    @before_tick << KeyParametersProcedureBinder.new(block)
   end
 
   def position

data/lib/musa-dsl/sequencer/sequencer-dsl.rb

@@ -3,8 +3,8 @@ require 'forwardable'
 class Musa::Sequencer
   extend Forwardable
 
-  def_delegators :@sequencer, :raw_at, :tick, :on_debug_at, :on_block_error
-  def_delegators :@sequencer, :on_fast_forward, :ticks_per_bar, :round, :position=, :size, :event_handler, :empty?
+  def_delegators :@sequencer, :raw_at, :tick, :on_debug_at, :on_block_error, :on_fast_forward, :before_tick
+  def_delegators :@sequencer, :beats_per_bar, :ticks_per_beat, :ticks_per_bar, :tick_duration, :round, :position=, :size, :event_handler, :empty?
 
   def_delegators :@context, :position, :log
   def_delegators :@context, :with, :now, :at, :wait, :play, :every, :move

data/lib/musa-dsl/transport/clock.rb

@@ -6,7 +6,7 @@ module Musa
       @run = nil
       @on_start = []
       @on_stop = []
-      @on_song_position_pointer = []
+      @on_change_position = []
     end
 
     def running?
@@ -21,8 +21,8 @@ module Musa
       @on_stop << block
     end
 
-    def on_song_position_pointer(&block)
-      @on_song_position_pointer << block
+    def on_change_position(&block)
+      @on_change_position << block
     end
 
     def run

data/lib/musa-dsl/transport/input-midi-clock.rb

@@ -112,12 +112,12 @@ module Musa
         yield if block_given? && @started
 
       when 'Song Position Pointer'
-        midi_beat_position =
+        new_position_in_midi_beats =
           m.data[0] & 0x7F | ((m.data[1] & 0x7F) << 7)
 
-        warn "InputMidiClock: processing Song Position Pointer midi_beat_position #{midi_beat_position}..." if @do_log
-        @on_song_position_pointer.each { |block| block.call midi_beat_position }
-        warn "InputMidiClock: processing Song Position Pointer midi_beat_position #{midi_beat_position}... done" if @do_log
+        warn "InputMidiClock: processing Song Position Pointer new_position_in_midi_beats #{new_position_in_midi_beats}..." if @do_log
+        @on_change_position.each { |block| block.call midi_beats: new_position_in_midi_beats }
+        warn "InputMidiClock: processing Song Position Pointer new_position_in_beats #{new_position_in_midi_beats}... done" if @do_log
       end
     end
   end

data/lib/musa-dsl/transport/transport.rb

@@ -12,7 +12,6 @@ module Musa
                    before_begin: nil,
                    on_start: nil,
                    after_stop: nil,
-                   before_each_tick: nil,
                    on_position_change: nil,
                    do_log: nil)
 
@@ -28,11 +27,8 @@ module Musa
       @on_start = []
       @on_start << KeyParametersProcedureBinder.new(on_start) if on_start
 
-      @before_each_tick = []
-      @before_each_tick << KeyParametersProcedureBinder.new(before_each_tick) if before_each_tick
-
-      @on_position_change = []
-      @on_position_change << KeyParametersProcedureBinder.new(on_position_change) if on_position_change
+      @on_change_position = []
+      @on_change_position << KeyParametersProcedureBinder.new(on_position_change) if on_position_change
 
       @after_stop = []
       @after_stop << KeyParametersProcedureBinder.new(after_stop) if after_stop
@@ -49,27 +45,8 @@ module Musa
         do_stop
       end
 
-      @clock.on_song_position_pointer do |midi_beat_position|
-        position = Rational(midi_beat_position, 4 * beats_per_bar) + 1
-        tick_before_position = position - Rational(1, beats_per_bar * ticks_per_beat)
-
-        warn "Transport: received message position change to #{position}" if @do_log
-
-        start_again_later = false
-
-        if @sequencer.position > tick_before_position
-          do_stop
-          start_again_later = true
-        end
-
-        warn "Transport: setting sequencer position #{tick_before_position}" if @do_log
-        @sequencer.position = tick_before_position
-
-        @sequencer.raw_at position, force_first: true do
-          @on_position_change.each { |block| block.call @sequencer }
-        end
-
-        do_on_start if start_again_later
+      @clock.on_change_position do |bars: nil, beats: nil, midi_beats: nil|
+        change_position_to bars: bars, beats: beats, midi_beats: midi_beats
       end
     end
 
@@ -81,16 +58,12 @@ module Musa
       @on_start << KeyParametersProcedureBinder.new(block)
     end
 
-    def before_each_tick(&block)
-      @before_each_tick << KeyParametersProcedureBinder.new(block)
-    end
-
     def after_stop(&block)
       @after_stop << KeyParametersProcedureBinder.new(block)
     end
 
-    def on_position_change(&block)
-      @on_position_change << KeyParametersProcedureBinder.new(block)
+    def on_change_position(&block)
+      @on_change_position << KeyParametersProcedureBinder.new(block)
     end
 
     def start
@@ -98,11 +71,38 @@ module Musa
 
       @clock.run do
         @before_begin_already_done = false
-        @before_each_tick.each { |block| block.call @sequencer }
         @sequencer.tick
       end
     end
 
+    def change_position_to(bars: nil, beats: nil, midi_beats: nil)
+      position = bars.rationalize || 1r
+      position += Rational(midi_beats, 4 * @sequencer.beats_per_bar) if midi_beats
+      position += Rational(beats, @sequencer.beats_per_bar) if beats
+
+      raise ArgumentError, "undefined new position" unless position
+
+      tick_before_position = position - @sequencer.tick_duration
+
+      warn "Transport: received message position change to #{position}" if @do_log
+
+      start_again_later = false
+
+      if @sequencer.position > tick_before_position
+        do_stop
+        start_again_later = true
+      end
+
+      warn "Transport: setting sequencer position #{tick_before_position}" if @do_log
+      @sequencer.position = tick_before_position
+
+      @sequencer.raw_at position, force_first: true do
+        @on_change_position.each { |block| block.call @sequencer }
+      end
+
+      do_on_start if start_again_later
+    end
+
     def stop
       @clock.terminate
     end

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.14.18'
-  s.date        = '2019-09-29'
+  s.version     = '0.14.26'
+  s.date        = '2019-09-30'
   s.summary     = 'A simple Ruby DSL for making complex music'
   s.description = 'Musa-DSL: A Ruby DSL for algorithmic music composition, device language neutral (MIDI, OSC, etc)'
   s.authors     = ['Javier Sánchez Yeste']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.14.18
+  version: 0.14.26
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus