musa-dsl 0.22.1 → 0.22.6

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

@@ -324,8 +324,13 @@ module Musa
               run_operation eval_use_variable(element[:use_variable])
 
             when :event
-              value_parameters = element[:value_parameters] ? element[:value_parameters].collect { |e| subcontext.eval_element(e) } : []
-              key_parameters = element[:key_parameters] ? element[:key_parameters].collect { |k, e| [k, subcontext.eval_element(e)] }.to_h : {}
+              value_parameters = element[:value_parameters] ?
+                                     element[:value_parameters].collect { |e| subcontext.eval_element(e) } :
+                                     []
+
+              key_parameters = element[:key_parameters] ?
+                                   element[:key_parameters].collect { |k, e| [k, subcontext.eval_element(e)] }.to_h :
+                                   {}
 
               { current_operation: :event,
                 current_event: element[:event],

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

@@ -7,181 +7,82 @@ module Musa; module Sequencer
   class BaseSequencer
     private def _play_timed(timed_serie,
                     control,
-                    reference: nil,
-                    step: nil,
-                    right_open: nil,
                     &block)
 
-      reference ||= 0r
-      step ||= 1r
-
       if first_value_sample = timed_serie.peek_next_value
-
         debug "_play_timed: first_value_sample #{first_value_sample}"
 
         hash_mode = first_value_sample[:value].is_a?(Hash)
 
         if hash_mode
-          components = first_value_sample[:value].keys
-
-          reference = reference.hashify(keys: components)
-          step = step.hashify(keys: components)
-          right_open = right_open.hashify(keys:components)
+          component_ids = first_value_sample[:value].keys
         else
           size = first_value_sample[:value].size
-          components = (0 .. size-1).to_a
-
-          reference = reference.arrayfy(size: size)
-          step = step.arrayfy(size: size)
-          right_open = right_open.arrayfy(size: size)
-        end
-
-        split = timed_serie.flatten_timed.split
-        quantized_series = hash_mode ? {} : []
-
-        components.each do |component|
-          quantized_series[component] =
-              QUANTIZE(split[component],
-                       reference: reference[component],
-                       step: step[component],
-                       right_open: right_open[component],
-                       stops: true).instance
+          component_ids = (0 .. size-1).to_a
         end
+        extra_attribute_names = Set[*(first_value_sample.keys - [:time, :value])]
 
         last_positions = hash_mode ? {} : []
       end
 
       binder = SmartProcBinder.new(block)
 
-      _play_timed_step(hash_mode, components, quantized_series, position, last_positions, binder, control)
+      _play_timed_step(hash_mode, component_ids, extra_attribute_names, timed_serie,
+                       position, last_positions, binder, control)
     end
 
-
-    private def _play_timed_step(hash_mode, components, quantized_series, start_position, last_positions,
+    private def _play_timed_step(hash_mode,
+                                 component_ids, extra_attribute_names,
+                                 timed_serie,
+                                 start_position,
+                                 last_positions,
                                  binder, control)
 
-      affected_components_by_time = {}
-
-      components.each do |component|
-        if v = quantized_series[component].peek_next_value
+      source_next_value = timed_serie.next_value
 
-          debug "_play_timed_step: quantized_series[#{component}].peek_next_value #{v}"
-          time = v[:time]
-
-          affected_components_by_time[time] ||= []
-          affected_components_by_time[time] << component
-        end
-      end
+      affected_components = component_ids.select { |_| !source_next_value[:value][_].nil? } if source_next_value
 
-      if affected_components_by_time.any?
-        time = affected_components_by_time.keys.sort.first
+      if affected_components && affected_components.any?
+        time = source_next_value[:time]
 
         values = hash_mode ? {} : []
-        next_values = hash_mode ? {} : []
-        durations = hash_mode ? {} : []
-        q_durations = hash_mode ? {} : []
+        extra_attributes = extra_attribute_names.collect { |_| [_, hash_mode ? {} : []] }.to_h
         started_ago = hash_mode ? {} : []
 
-        affected_components_by_time[time].each do |component|
-          value = quantized_series[component].next_value
-
-          values[component] = value[:value]
-          durations[component] = value[:duration]
-
-          q_durations[component] =
-              _quantize_position(time + durations[component], warn: false) -
-              _quantize_position(time, warn: false)
+        affected_components.each do |component|
+          values[component] = source_next_value[:value][component]
 
-          nv = quantized_series[component].peek_next_value
-          next_values[component] = (nv && nv[:value] != values[component]) ? nv[:value] : nil
+          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
 
-        components.each do |component|
+        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
 
-        _numeric_at start_position + _quantize_position(time, warn: false), control do
-          debug "_play_timed_step: before binder.call: durations #{durations} q_durations #{q_durations}"
-          binder.call(values, next_values,
-                      duration: durations,
-                      quantized_duration: q_durations,
+        _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, components, quantized_series, start_position, last_positions,
+          _play_timed_step(hash_mode,
+                           component_ids, extra_attribute_names,
+                           timed_serie,
+                           start_position,
+                           last_positions,
                            binder, control)
         end
       end
     end
 
-    # TODO implement this alternative play method as another mode
-    # Este es un modo muy interesante pero que implica un procesamiento diferente en el yield_block que no me
-    # sirve para el código de samples/multidim_sample, puesto que en este el next_values es literal,
-    # mientras que samples/multidim_sample necesita que el next_value sea nil si el valor no cambia durante el periodo.
-    #
-    private def _play_timed_step_b(hash_mode, components, quantized_series, start_position, last_positions,
-                                   binder, control)
-
-      affected_components_by_time = {}
-
-      components.each do |component|
-        if v = quantized_series[component].peek_next_value
-          time = v[:time]
-
-          affected_components_by_time[time] ||= []
-          affected_components_by_time[time] << component
-        end
-      end
-
-      if !affected_components_by_time.empty?
-        time = affected_components_by_time.keys.sort.first
-
-        values = hash_mode ? {} : []
-        next_values = hash_mode ? {} : []
-        durations = hash_mode ? {} : []
-        q_durations = hash_mode ? {} : []
-        started_ago = hash_mode ? {} : []
-
-        affected_components_by_time[time].each do |component|
-          value = quantized_series[component].next_value
-
-          values[component] = value[:value]
-          durations[component] = value[:duration]
-
-          q_durations[component] =
-              _quantize_position(time + durations[component], warn: false) -
-                  _quantize_position(time, warn: false)
-
-          last_positions[component] = _quantize_position(time, warn: false)
-        end
-
-        components.each do |component|
-          nv = quantized_series[component].peek_next_value
-          next_values[component] = nv[:value] if nv
-
-          if last_positions[component] && last_positions[component] != time
-            started_ago[component] = _quantize_position(time, warn: false) - last_positions[component]
-          end
-        end
-
-        _numeric_at start_position + _quantize_position(time, warn: false), control do
-          binder.call(values, next_values,
-                      duration: durations,
-                      quantized_duration: q_durations,
-                      started_ago: started_ago,
-                      control: control)
-
-          _play_timed_step_b(hash_mode, components, quantized_series, start_position, last_positions,
-                             binder, control)
-        end
-      end
-    end
-
     class PlayTimedControl < EventHandler
       attr_reader :do_on_stop, :do_after
 

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

@@ -9,6 +9,8 @@ module Musa; module Sequencer
     include Musa::Extension::SmartProcBinder
     include Musa::Extension::DeepCopy
 
+    using Musa::Extension::InspectNice
+
     private def _tick(position_to_run)
       @before_tick.each { |block| block.call position_to_run }
       queue = @timeslots[position_to_run]
@@ -63,21 +65,16 @@ module Musa; module Sequencer
       nil
     end
 
-    private def _numeric_at(at_position, control, with: nil, debug: nil, &block)
+    private def _numeric_at(at_position, control, debug: nil, &block)
       raise ArgumentError, "'at_position' parameter cannot be nil" if at_position.nil?
       raise ArgumentError, 'Yield block is mandatory' unless block
 
       at_position = _quantize_position(at_position)
 
-      value_parameters = []
-      value_parameters << with if !with.nil? && !with.is_a?(Hash)
-
       block_key_parameters_binder =
           SmartProcBinder.new block, on_rescue: proc { |e| _rescue_error(e) }
 
       key_parameters = {}
-      key_parameters.merge! block_key_parameters_binder._apply(nil, with).last if with.is_a?(Hash)
-
       key_parameters[:control] = control if block_key_parameters_binder.key?(:control)
 
       if at_position == @position
@@ -85,7 +82,7 @@ module Musa; module Sequencer
 
         begin
           locked = @tick_mutex.try_lock
-          block_key_parameters_binder._call(value_parameters, key_parameters)
+          block_key_parameters_binder._call(nil, key_parameters)
         ensure
           @tick_mutex.unlock if locked
         end
@@ -100,8 +97,8 @@ module Musa; module Sequencer
           end
         end
 
-        @timeslots[at_position] << { parent_control: control, block: block_key_parameters_binder,
-                                     value_parameters: value_parameters,
+        @timeslots[at_position] << { parent_control: control,
+                                     block: block_key_parameters_binder,
                                      key_parameters: key_parameters }
       else
         @logger.warn('BaseSequencer') { "._numeric_at: ignoring past 'at' command for #{at_position}" }
@@ -110,20 +107,14 @@ module Musa; module Sequencer
       nil
     end
 
-    private def _serie_at(bar_position_serie, control, with: nil, debug: nil, &block)
-      bar_position = bar_position_serie.next_value
-
-      with_value = if with.respond_to? :next_value
-                     with.next_value
-                   else
-                     with
-                   end
+    private def _serie_at(position_or_serie, control, debug: nil, &block)
+      bar_position = position_or_serie.next_value
 
       if bar_position
-        _numeric_at bar_position, control, with: with_value, debug: debug, &block
+        _numeric_at bar_position, control, debug: debug, &block
 
         _numeric_at bar_position, control, debug: false do
-          _serie_at bar_position_serie, control, with: with, debug: debug, &block
+          _serie_at position_or_serie, control, debug: debug, &block
         end
       else
         # serie finalizada
@@ -224,8 +215,3 @@ module Musa; module Sequencer
     private_constant :EventHandler
   end
 end; end
-
-require_relative 'base-sequencer-implementation-every'
-require_relative 'base-sequencer-implementation-move'
-require_relative 'base-sequencer-implementation-play'
-require_relative 'base-sequencer-implementation-play-timed'

data/lib/musa-dsl/sequencer/base-sequencer-tick-based.rb

@@ -3,6 +3,8 @@ module Musa
     class BaseSequencer
       module TickBasedTiming
 
+        using Musa::Extension::InspectNice
+
         attr_reader :position, :ticks_per_bar, :tick_duration
 
         def tick
@@ -27,9 +29,7 @@ module Musa
           _release_public_ticks
         end
 
-        private
-
-        def _init_timing
+        private def _init_timing
           @ticks_per_bar = Rational(beats_per_bar * ticks_per_beat)
           @tick_duration = Rational(1, @ticks_per_bar)
 
@@ -37,11 +37,11 @@ module Musa
           @hold_ticks = 0
         end
 
-        def _reset_timing
+        private def _reset_timing
           @position = @position_mutex.synchronize { 1r - @tick_duration }
         end
 
-        def _quantize_position(position, warn: true)
+        private def _quantize_position(position, warn: true)
           ticks_position = position / @tick_duration
 
           if ticks_position.round != ticks_position
@@ -50,19 +50,19 @@ module Musa
 
             if warn
               @logger.warn('BaseSequencer') { "_check_position: rounding "\
-                  "position #{original_position} (#{original_position.to_f.round(5)}) "\
-                  "to tick precision: #{position} (#{position.to_f.round(5)})" }
+                  "position #{original_position.inspect} (#{original_position.to_f.round(5)}) "\
+                  "to tick precision: #{position.inspect} (#{position.to_f.round(5)})" }
             end
           end
 
           position
         end
 
-        def _hold_public_ticks
+        private def _hold_public_ticks
           @hold_public_ticks = true
         end
 
-        def _release_public_ticks
+        private def _release_public_ticks
           @hold_ticks.times { _tick(@position_mutex.synchronize { @position += @tick_duration }) }
           @hold_ticks = 0
           @hold_public_ticks = false

data/lib/musa-dsl/sequencer/base-sequencer-tickless-based.rb

@@ -53,16 +53,14 @@ module Musa
           @on_fast_forward.each { |block| block.call(false) }
         end
 
-        private
-
-        def _init_timing
+        private def _init_timing
         end
 
-        def _reset_timing
+        private def _reset_timing
           @position = nil
         end
 
-        def _quantize_position(position, warn: false)
+        private def _quantize_position(position, warn: false)
           position
         end
       end

data/lib/musa-dsl/sequencer/{base-sequencer-public.rb → base-sequencer.rb}

@@ -30,6 +30,7 @@ module Musa
         else
           @logger = Musa::Logger::Logger.new(sequencer: self, position_format: log_position_format)
 
+          @logger.fatal!
           @logger.error! if do_error_log || do_error_log.nil?
           @logger.debug! if do_log
         end
@@ -82,6 +83,11 @@ module Musa
         @timeslots.empty?
       end
 
+      def quantize_position(position, warn: nil)
+        warn ||= false
+        _quantize_position(position, warn: warn)
+      end
+
       def run
         tick until empty?
       end
@@ -114,22 +120,19 @@ module Musa
         @event_handlers.last.launch event, *value_parameters, **key_parameters
       end
 
-      def wait(bars_delay, with: nil, debug: nil, &block)
+      def wait(bars_delay, debug: nil, &block)
         debug ||= false
 
         control = EventHandler.new @event_handlers.last
         @event_handlers.push control
 
         if bars_delay.is_a? Numeric
-          _numeric_at position + bars_delay.rationalize, control, with: with, debug: debug, &block
+          _numeric_at position + bars_delay.rationalize, control, debug: debug, &block
         else
           bars_delay = Series::S(*bars_delay) if bars_delay.is_a?(Array)
           bars_delay = bars_delay.instance if bars_delay
 
-          with = Series::S(*with).repeat if with.is_a?(Array)
-          with = with.instance if with
-
-          _serie_at bars_delay.eval { |delay| position + delay }, control, with: with, debug: debug, &block
+          _serie_at bars_delay.eval { |delay| position + delay }, control, debug: debug, &block
         end
 
         @event_handlers.pop
@@ -137,11 +140,11 @@ module Musa
         control
       end
 
-      def now(with: nil, &block)
+      def now(&block)
         control = EventHandler.new @event_handlers.last
         @event_handlers.push control
 
-        _numeric_at position, control, with: with, &block
+        _numeric_at position, control, &block
 
         @event_handlers.pop
 
@@ -154,22 +157,19 @@ module Musa
         nil
       end
 
-      def at(bar_position, with: nil, debug: nil, &block)
+      def at(bar_position, debug: nil, &block)
         debug ||= false
 
         control = EventHandler.new @event_handlers.last
         @event_handlers.push control
 
         if bar_position.is_a? Numeric
-          _numeric_at bar_position.rationalize, control, with: with, debug: debug, &block
+          _numeric_at bar_position.rationalize, control, debug: debug, &block
         else
           bar_position = Series::S(*bar_position) if bar_position.is_a? Array
           bar_position = bar_position.instance if bar_position
 
-          with = Series::S(*with).repeat if with.is_a? Array
-          with = with.instance if with
-
-          _serie_at bar_position, control, with: with, debug: debug, &block
+          _serie_at bar_position, control, debug: debug, &block
         end
 
         @event_handlers.pop
@@ -215,9 +215,6 @@ module Musa
       end
 
       def play_timed(timed_serie,
-                     reference: nil,
-                     step: nil,
-                     right_open: nil,
                      on_stop: nil,
                      after_bars: nil, after: nil,
                      &block)
@@ -233,12 +230,7 @@ module Musa
 
         @event_handlers.push control
 
-        _play_timed(timed_serie.instance,
-                    control,
-                    reference: reference,
-                    step: step,
-                    right_open: right_open,
-                    &block)
+        _play_timed(timed_serie.instance, control, &block)
 
         @event_handlers.pop