musa-dsl 0.23.18 → 0.23.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b3da8a6794922e430f83799de2679402d3bfefda3208fa1788f0beedb1ae55e
-  data.tar.gz: 8583d5e0e518ff221cdf8b3f7cd6bc96ffe5a2c8b6c86ae53eb7d339b2a0eabd
+  metadata.gz: 69d8893b895c8b836a51be4f7fc7b51fbab501383c6e3780d0af52e82f1bb324
+  data.tar.gz: 017f7f8a8fb2cd5b3104d6c1f5c5acd535ea3db4c4285d15f1c81fe792cf123c
 SHA512:
-  metadata.gz: 06642f37659b697dca34396cca40aaa0ee30788cb2905e29ae9e2be16d3df570e1195996d50b81d10506059b37ef319f0c7c0aec8ccf789a35dc5d4734ba19ce
-  data.tar.gz: bd2c24988b5f1ef6e11d3b426de27a8ed46a9ca14f08f4d7eb1fbcff95e6854f839bb369e716c3ed05b393852571440bffbb223e2d3333a82900b62ffd0ce0db
+  metadata.gz: 681651cd39523a69d2cbe3fe7271b79ab6f8c0d616cabd8f7d9ef4e0af8f8bbaaed39d41977c35900a748057af8a274b5672762340b98537b9f1d2cba7c5b401
+  data.tar.gz: 29cc0e37bf4f3513d78e32776c9df7a6a622c913a965f7bef8944bd0961ef7f8e23bfc348dbbe9eb7d18a211e224f6f27acc95210340bbad05aacde0d34f5404

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, logger: 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,7 @@ module Musa
         @started = false
         @paused = false
 
+        @delayed_ticks_error = delayed_ticks_error
         @logger = logger
         @do_log = do_log
       end
@@ -56,7 +57,12 @@ module Musa
         @run = true
 
         while @run
-          @timer = Timer.new(@period, correction: @correction, stop: true, logger: @logger, do_log: @do_log)
+          @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,12 @@ module Musa
     class Timer
       attr_accessor :period
 
-      def initialize(period_in_seconds, correction: nil, stop: nil, logger: nil, do_log: 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
@@ -21,10 +23,15 @@ module Musa
             yield
 
             @next_moment += @period
-            to_sleep = (@next_moment  + @correction) - Process.clock_gettime(Process::CLOCK_MONOTONIC)
-
-            if @do_log && to_sleep.negative?
-              @logger&.error "Timer delayed #{-to_sleep}s (near #{(-to_sleep / @period).round} ticks)"
+            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

data/lib/musa-dsl.rb

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

data/musa-dsl.gemspec

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

metadata

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