musa-dsl 0.23.15 → 0.23.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dab879e30a1ece7bc5a71a32398213d0592b4a95bb6a852346ec472314bcee7
-  data.tar.gz: c10467430f594206804aee8521c51b514af79c29bca67b70782e0c7820294eb1
+  metadata.gz: 69d8893b895c8b836a51be4f7fc7b51fbab501383c6e3780d0af52e82f1bb324
+  data.tar.gz: 017f7f8a8fb2cd5b3104d6c1f5c5acd535ea3db4c4285d15f1c81fe792cf123c
 SHA512:
-  metadata.gz: 892c2017cc142814b475872a1bd9a4471686667b8237c5130ea3e7589fd50a0a0eb6d163ef40bd46b4924385fff4dc0ff9abfb18186349053fb362fe65becb17
-  data.tar.gz: 9f287f7302a6d3547e5b85190c5cbda040e4a2e0f0c4dc89b4bb0dea3823772fcaae32c137aec1733b1e658fefe06963ef3cb4bbcc468244a77ef623f0cd7c17
+  metadata.gz: 681651cd39523a69d2cbe3fe7271b79ab6f8c0d616cabd8f7d9ef4e0af8f8bbaaed39d41977c35900a748057af8a274b5672762340b98537b9f1d2cba7c5b401
+  data.tar.gz: 29cc0e37bf4f3513d78e32776c9df7a6a622c913a965f7bef8944bd0961ef7f8e23bfc348dbbe9eb7d18a211e224f6f27acc95210340bbad05aacde0d34f5404

data/lib/musa-dsl/series/quantizer-serie.rb

@@ -468,16 +468,19 @@ module Musa
       private def next_crossings
         from_time, from_value = get_time_value(@source.next_value)
 
-        if from_time && from_value
-          raise 'time only can go forward' if @last_time && from_time <= @last_time
+        return unless from_time && from_value
 
-          @last_time = from_time
+        if @last_time && from_time < @last_time
+          raise "time only can go forward: last time = #{@last_time} (#{@last_time.to_f}) but " \
+          "from_time = #{from_time} (#{from_time.to_f}) (expected last_time to be < from_time) "
+        end
 
-          to_time, to_value = get_time_value(@source.peek_next_value)
+        @last_time = from_time
 
-          if to_time && to_value
-            crossings(from_time, from_value, to_time, to_value)
-          end
+        to_time, to_value = get_time_value(@source.peek_next_value)
+
+        if to_time && to_value
+          crossings(from_time, from_value, to_time, to_value)
         end
       end
 

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

@@ -3,7 +3,7 @@ require_relative 'clock'
 module Musa
   module Clock
     class TimerClock < Clock
-      def initialize(period = nil, ticks_per_beat: nil, bpm: nil, correction: nil, do_log: nil)
+      def initialize(period = nil, ticks_per_beat: nil, bpm: nil, correction: nil, delayed_ticks_error: nil, logger: nil, do_log: nil)
         do_log ||= false
 
         super()
@@ -20,6 +20,8 @@ module Musa
         @started = false
         @paused = false
 
+        @delayed_ticks_error = delayed_ticks_error
+        @logger = logger
         @do_log = do_log
       end
 
@@ -55,7 +57,12 @@ module Musa
         @run = true
 
         while @run
-          @timer = Timer.new(@period, correction: @correction, stop: true)
+          @timer = Timer.new(@period,
+                             correction: @correction,
+                             stop: true,
+                             delayed_ticks_error: @delayed_ticks_error,
+                             logger: @logger,
+                             do_log: @do_log)
 
           @timer.run do
             yield if block_given?

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

@@ -3,10 +3,14 @@ module Musa
     class Timer
       attr_accessor :period
 
-      def initialize(period_in_seconds, correction: nil, stop: nil)
-        @period = period_in_seconds.rationalize
+      def initialize(tick_period_in_seconds, correction: nil, stop: nil, delayed_ticks_error: nil, logger: nil, do_log: nil)
+        @period = tick_period_in_seconds.rationalize
         @correction = (correction || 0r).rationalize
         @stop = stop || false
+
+        @delayed_ticks_error = delayed_ticks_error || 1.0
+        @logger = logger
+        @do_log = do_log
       end
 
       def run
@@ -19,7 +23,16 @@ module Musa
             yield
 
             @next_moment += @period
-            to_sleep = (@next_moment  + @correction) - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            to_sleep = (@next_moment + @correction) - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+            if @do_log && to_sleep.negative? & @logger
+              tick_errors = -to_sleep / @period
+              if tick_errors >= @delayed_ticks_error
+                @logger.error "Timer delayed #{tick_errors.round(2)} ticks (#{-to_sleep}s)"
+              else
+                @logger.warn "Timer delayed #{tick_errors.round(2)} ticks (#{-to_sleep}s)"
+              end
+            end
 
             sleep to_sleep if to_sleep > 0.0
           end

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.23.15'
+  VERSION = '0.23.19'
 end
 
 require_relative 'musa-dsl/core-ext'

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.23.15'
-  s.date        = '2021-09-07'
+  s.version     = '0.23.19'
+  s.date        = '2021-09-28'
   s.summary     = 'A simple Ruby DSL for making complex music'
   s.description = 'Musa-DSL: A Ruby framework and DSL for algorithmic sound and musical thinking and composition'
   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.23.15
+  version: 0.23.19
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus