musa-dsl 0.23.9 → 0.23.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79f0b29dc4afd60274d8c1e5727ae70d3233b91a004a0173b57e398f152dcf56
-  data.tar.gz: 7538b77296f7185211e56b344bd3d332afb6de8b2cfa95b166737830a524c68b
+  metadata.gz: 03b06753c72ecbea6d6b7b056996afa6defaa57e74edd389272728822c537e52
+  data.tar.gz: 6580590252818be5df7a5f42094a026897852e874ece2ce77e657a499255b2d1
 SHA512:
-  metadata.gz: 91d9441bc8fb61321764876d90c7ac8079a475e4dd9ce4c12184e3262a7682bdce2cd5d66e272daa2e1e1233734d46bb9bda6232522781ab40e07f27ae5a51e7
-  data.tar.gz: c20a18071678dd0c68567de8a2f1b1b8b1a2fe1cf5d541b99bef712bce79385172e2102219d484acb5e131b25e52a94081e866c56b28736da244a48ead7d78b0
+  metadata.gz: 52a8bb01f12163cac1598946db6a60b10cb460894eac06952c82fb7b9eb32a76c6c05d1ff6b1c2133cd024253f3be5e100eec06c67afc6e0314d3bbbf2332bc2
+  data.tar.gz: a7eb355bb4d9e13523f4769d4f204f150d0eb59fb2adaf0ddc989750b42e3958f1422074d11d798df99d560990a5e005d748ad06d99205273af0bdf3cf12e5e2

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

@@ -1,4 +1,4 @@
-module Musa; module Sequencer
+module Musa::Sequencer
   class BaseSequencer
     private def _every(interval, control, block_procedure_binder: nil, &block)
       block ||= proc {}
@@ -84,4 +84,4 @@ module Musa; module Sequencer
 
     private_constant :EveryControl
   end
-end; end
+end

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

@@ -3,7 +3,7 @@ using Musa::Extension::Arrayfy
 
 using Musa::Extension::InspectNice
 
-module Musa; module Sequencer
+module Musa::Sequencer
   class BaseSequencer
     private def _move(every: nil,
                       from:, to: nil,
@@ -436,4 +436,4 @@ module Musa; module Sequencer
 
     private_constant :MoveControl
   end
-end; end
+end

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

@@ -3,11 +3,9 @@ using Musa::Extension::Arrayfy
 
 using Musa::Extension::InspectNice
 
-module Musa; module Sequencer
+module Musa::Sequencer
   class BaseSequencer
-    private def _play_timed(timed_serie,
-                    control,
-                    &block)
+    private def _play_timed(timed_serie, control, &block)
 
       if first_value_sample = timed_serie.peek_next_value
         debug "_play_timed: first_value_sample #{first_value_sample}"
@@ -40,45 +38,52 @@ module Musa; module Sequencer
 
       source_next_value = timed_serie.next_value
 
-      affected_components = component_ids.select { |_| !source_next_value[:value][_].nil? } if source_next_value
+      if source_next_value
+        affected_components = component_ids.select { |_| !source_next_value[:value][_].nil? }
 
-      if affected_components && affected_components.any?
-        time = source_next_value[:time]
+        if affected_components&.any?
+          time = source_next_value[:time]
 
-        values = hash_mode ? {} : []
-        extra_attributes = extra_attribute_names.collect { |_| [_, hash_mode ? {} : []] }.to_h
-        started_ago = hash_mode ? {} : []
+          values = hash_mode ? {} : []
+          extra_attributes = extra_attribute_names.collect { |_| [_, hash_mode ? {} : []] }.to_h
+          started_ago = hash_mode ? {} : []
 
-        affected_components.each do |component|
-          values[component] = source_next_value[:value][component]
+          affected_components.each do |component|
+            values[component] = source_next_value[:value][component]
 
-          extra_attribute_names.each do |attribute_name|
-            extra_attributes[attribute_name][component] = source_next_value[attribute_name][component]
+            extra_attribute_names.each do |attribute_name|
+              extra_attributes[attribute_name][component] = source_next_value[attribute_name][component]
+            end
+
+            last_positions[component] = _quantize_position(time, warn: false)
           end
 
-          last_positions[component] = _quantize_position(time, warn: false)
-        end
+          component_ids.each do |component|
+            if last_positions[component] && last_positions[component] != time
+              sa = _quantize_position(time, warn: false) - last_positions[component]
+              started_ago[component] = (sa == 0) ? nil : sa
+            end
+          end
 
-        component_ids.each do |component|
-          if last_positions[component] && last_positions[component] != time
-            sa = _quantize_position(time, warn: false) - last_positions[component]
-            started_ago[component] = (sa == 0) ? nil : sa
+          _numeric_at _quantize_position(start_position + time, warn: true), control do
+            binder.call(values,
+                        **extra_attributes,
+                        time: start_position + time,
+                        started_ago: started_ago,
+                        control: control)
+
+            _play_timed_step(hash_mode,
+                             component_ids, extra_attribute_names,
+                             timed_serie,
+                             start_position,
+                             last_positions,
+                             binder, control)
           end
         end
+      else
 
-        _numeric_at _quantize_position(start_position + time, warn: true), control do
-          binder.call(values,
-                      **extra_attributes,
-                      time: start_position + time,
-                      started_ago: started_ago,
-                      control: control)
-
-          _play_timed_step(hash_mode,
-                           component_ids, extra_attribute_names,
-                           timed_serie,
-                           start_position,
-                           last_positions,
-                           binder, control)
+        control.do_after.each do |do_after|
+          _numeric_at position + do_after[:bars], control, &do_after[:block]
         end
       end
     end
@@ -107,5 +112,5 @@ module Musa; module Sequencer
 
     private_constant :PlayTimedControl
   end
-end; end
+end
 

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

@@ -5,7 +5,7 @@ using Musa::Extension::Arrayfy
 
 using Musa::Extension::InspectNice
 
-module Musa; module Sequencer
+module Musa::Sequencer
   class BaseSequencer
     private def _play(serie,
                       control,
@@ -175,4 +175,4 @@ module Musa; module Sequencer
 
     private_constant :PlayControl
   end
-end; end
+end

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

@@ -4,7 +4,7 @@ require_relative '../core-ext/smart-proc-binder'
 using Musa::Extension::Arrayfy
 using Musa::Extension::DeepCopy
 
-module Musa; module Sequencer
+module Musa::Sequencer
   class BaseSequencer
     include Musa::Extension::SmartProcBinder
     include Musa::Extension::DeepCopy
@@ -214,4 +214,4 @@ module Musa; module Sequencer
 
     private_constant :EventHandler
   end
-end; end
+end

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.23.9'
-  s.date        = '2021-08-03'
+  s.version     = '0.23.10'
+  s.date        = '2021-08-05'
   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.9
+  version: 0.23.10
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus