musa-dsl 0.14.26 → 0.14.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fda568f7b4eef0b94479ab3f9e5833a130d82ba2386687607a0a4193c292f0e
-  data.tar.gz: e7366f81def8b65c0977c004ef02a50ce01472a1c5a29b5b9ec0916ff1989538
+  metadata.gz: 8f74dd3331fee5343754a2a50d2a8b449588e2bf4355bcc0c040aae1d3947ed4
+  data.tar.gz: '009c5e942ef81604a8c0742deb8ad0c54e196a4236e0f3d5635948754194d7d1'
 SHA512:
-  metadata.gz: 1d78176e99d1746d2eba617fac89602c56bc4aa8a165d7f0ee1e696b726f52c0b7a89347b313e47d2d5e6252cb3f2c5d0627af0a68a6ccb0deb10d3f1c3a4ceb
-  data.tar.gz: c16e547be13a8c6592722afbc6cb6a8b571a8930b0c0079b9067baee43c4c237b1123fff554674bd572c68a662d718f10c0402dd0fe5d01a779560d3f1b5bf76
+  metadata.gz: 1b731f4fc517e25458f7592ef2e79b6ed4b15ef9ba2e08d099879cb1ba83075da8fdb677a76ac937a42efad4e99f4d40b1e43949cc0b06e11d8c396cd31beea2
+  data.tar.gz: e245ea33a9f473a8676c9ace488287f33977bb66e8dc0bfc24fc3737ef4fcabe461ba05303aa96bafe974b85127f0fc258b81100ea0dbdd8d954f1c5aa73e228

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

@@ -7,6 +7,54 @@ require_relative 'base-sequencer-implementation-play-helper'
 class Musa::BaseSequencer
   private
 
+  def _tick
+    position_to_run = @position_mutex.synchronize { @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|
+
+        if command.key?(:parent_control) && !command[:parent_control].stopped?
+          @event_handlers.push command[:parent_control]
+
+          @@tick_mutex.synchronize do
+            original_stdout = $stdout
+            original_stderr = $stderr
+
+            $stdout = command[:parent_control].stdout
+            $stderr = command[:parent_control].stderr
+
+            command[:block]._call command[:value_parameters], command[:key_parameters] if command[:block]
+
+            $stdout = original_stdout
+            $stderr = original_stderr
+          end
+
+          @event_handlers.pop
+        else
+          @@tick_mutex.synchronize do
+            command[:block]._call command[:value_parameters], command[:key_parameters] if command[:block]
+          end
+        end
+      end
+
+      @score.delete position_to_run
+    end
+
+    Thread.pass
+  end
+
+  def _hold_public_ticks
+    @hold_public_ticks = true
+  end
+
+  def _release_public_ticks
+    @hold_ticks.times { _tick }
+    @hold_ticks = 0
+    @hold_public_ticks = false
+  end
+
   def _raw_numeric_at(bar_position, force_first: nil, &block)
     force_first ||= false
 

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

@@ -24,6 +24,10 @@ class Musa::BaseSequencer
     @ticks_per_bar = Rational(beats_per_bar * ticks_per_beat)
     @tick_duration = Rational(1, @ticks_per_bar)
 
+    @position_mutex = Mutex.new
+    @hold_public_ticks = false
+    @hold_ticks = 0
+
     @score = {}
 
     @everying = []
@@ -43,42 +47,14 @@ class Musa::BaseSequencer
 
     @event_handlers = [EventHandler.new]
 
-    @position = @ticks_per_bar - 1
+    @position = @position_mutex.synchronize { @ticks_per_bar - 1 }
   end
 
   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|
-
-        if command.key?(:parent_control) && !command[:parent_control].stopped?
-          @event_handlers.push command[:parent_control]
-
-          @@tick_mutex.synchronize do
-            original_stdout = $stdout
-            original_stderr = $stderr
-
-            $stdout = command[:parent_control].stdout
-            $stderr = command[:parent_control].stderr
-
-            command[:block]._call command[:value_parameters], command[:key_parameters] if command[:block]
-
-            $stdout = original_stdout
-            $stderr = original_stderr
-          end
-
-          @event_handlers.pop
-        else
-          @@tick_mutex.synchronize do
-            command[:block]._call command[:value_parameters], command[:key_parameters] if command[:block]
-          end
-        end
-      end
-
-      @score.delete position_to_run
+    if @hold_public_ticks
+      @hold_ticks += 1
+    else
+      _tick
     end
   end
 
@@ -123,11 +99,13 @@ class Musa::BaseSequencer
 
     raise ArgumentError, "Sequencer #{self}: cannot move back. current position: #{@position} new position: #{position}" if position < @position
 
+    _hold_public_ticks
     @on_fast_forward.each { |block| block.call(true) }
 
-    tick while @position < position
+    _tick while @position < position
 
     @on_fast_forward.each { |block| block.call(false) }
+    _release_public_ticks
   end
 
   def on(event, &block)

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

@@ -82,24 +82,23 @@ module Musa
 
       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
+      if @sequencer.position > position
         do_stop
         start_again_later = true
       end
 
-      warn "Transport: setting sequencer position #{tick_before_position}" if @do_log
-      @sequencer.position = tick_before_position
+      warn "Transport: setting sequencer position #{position}" if @do_log
 
       @sequencer.raw_at position, force_first: true do
         @on_change_position.each { |block| block.call @sequencer }
       end
 
+      @sequencer.position = position
+
       do_on_start if start_again_later
     end
 

data/musa-dsl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.14.26'
+  s.version     = '0.14.29'
   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)'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.14.26
+  version: 0.14.29
 platform: ruby
 authors:
 - Javier Sánchez Yeste