musa-dsl 0.21.1 → 0.22.1

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

@@ -32,7 +32,7 @@ module Musa
         self
       end
 
-      def _prototype
+      def _prototype!
         raise PrototypingSerieError, 'Cannot get prototype of a proxy serie'
       end
 

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

@@ -2,9 +2,14 @@ require_relative 'base-series'
 
 require_relative 'main-serie-constructors'
 require_relative 'main-serie-operations'
-require_relative 'hash-serie-splitter'
+
+require_relative 'array-to-serie'
+
 require_relative 'holder-serie'
 require_relative 'proxy-serie'
 require_relative 'queue-serie'
 
-require_relative 'array-to-serie'
+require_relative 'hash-or-array-serie-splitter'
+
+require_relative 'quantizer-serie'
+require_relative 'flattener-timed-serie'

data/lib/musa-dsl/transport/input-midi-clock.rb

@@ -4,13 +4,20 @@ require 'nibbler'
 module Musa
   module Clock
     class InputMidiClock < Clock
-      def initialize(input, do_log: nil)
+      def initialize(input, logger: nil, do_log: nil)
         do_log ||= false
 
         super()
 
         @input = input
-        @do_log = do_log
+        @logger = logger
+
+        if logger
+          @logger = logger
+        else
+          @logger = Musa::Logger::Logger.new
+          @logger.debug! if do_log
+        end
 
         @nibbler = Nibbler.new
       end
@@ -52,7 +59,7 @@ module Musa
                 messages[index + 1].name == 'Song Position Pointer' &&
                 messages[index + 2].name == 'Continue'
 
-              warn 'InputMidiClock: processing Stop + Song Position Pointer + Continue...' if @do_log
+              @logger.debug('InputMidiClock') { 'processing Stop + Song Position Pointer + Continue...' }
 
               process_start unless @started
 
@@ -62,7 +69,7 @@ module Musa
 
               index += 2
 
-              warn 'InputMidiClock: processing Stop + Song Position Pointer + Continue... done' if @do_log
+              @logger.debug('InputMidiClock') { 'processing Stop + Song Position Pointer + Continue... done' }
 
             else
               process_message messages[index] do
@@ -84,12 +91,12 @@ module Musa
       private
 
       def process_start
-        warn 'InputMidiClock: processing Start...' if @do_log
+        @logger.debug('InputMidiClock') { 'processing Start...' }
 
         @on_start.each(&:call)
         @started = true
 
-        warn 'InputMidiClock: processing Start... done' if @do_log
+        @logger.debug('InputMidiClock') { 'processing Start... done' }
       end
 
       def process_message(m)
@@ -98,16 +105,16 @@ module Musa
           process_start
 
         when 'Stop'
-          warn 'InputMidiClock: processing Stop...' if @do_log
+          @logger.debug('InputMidiClock') { 'processing Stop...' }
 
           @on_stop.each(&:call)
           @started = false
 
-          warn 'InputMidiClock: processing Stop... done' if @do_log
+          @logger.debug('InputMidiClock') { 'processing Stop... done' }
 
         when 'Continue'
-          warn 'InputMidiClock: processing Continue...' if @do_log
-          warn 'InputMidiClock: processing Continue... done' if @do_log
+          @logger.debug('InputMidiClock') { 'processing Continue...' }
+          @logger.debug('InputMidiClock') { 'processing Continue... done' }
 
         when 'Clock'
           yield if block_given? && @started
@@ -116,9 +123,9 @@ module Musa
           new_position_in_midi_beats =
               m.data[0] & 0x7F | ((m.data[1] & 0x7F) << 7)
 
-          warn "InputMidiClock: processing Song Position Pointer new_position_in_midi_beats #{new_position_in_midi_beats}..." if @do_log
+          @logger.debug('InputMidiClock') { "processing Song Position Pointer new_position_in_midi_beats #{new_position_in_midi_beats}..." }
           @on_change_position.each { |block| block.call midi_beats: new_position_in_midi_beats }
-          warn "InputMidiClock: processing Song Position Pointer new_position_in_beats #{new_position_in_midi_beats}... done" if @do_log
+          @logger.debug('InputMidiClock') { "processing Song Position Pointer new_position_in_beats #{new_position_in_midi_beats}... done" }
         end
       end
     end

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

@@ -1,6 +1,9 @@
 require_relative '../core-ext/smart-proc-binder'
+require_relative '../core-ext/inspect-nice'
 require_relative '../sequencer'
 
+using Musa::Extension::InspectNice
+
 module Musa
   module Transport
     class Transport
@@ -15,6 +18,7 @@ module Musa
                      on_start: nil,
                      after_stop: nil,
                      on_position_change: nil,
+                     logger: nil,
                      do_log: nil)
 
         beats_per_bar ||= 4
@@ -37,7 +41,7 @@ module Musa
 
         @do_log = do_log
 
-        @sequencer = Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, do_log: @do_log
+        @sequencer = Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, logger: logger, do_log: @do_log
 
         @clock.on_start do
           do_on_start
@@ -78,15 +82,20 @@ module Musa
       end
 
       def change_position_to(bars: nil, beats: nil, midi_beats: nil)
-        warn "Transport: asked to change position to #{"#{bars} bars " if bars}#{"#{beats} beats " if beats}#{"#{midi_beats} midi beats " if midi_beats}" if @do_log
+        logger.debug('Transport') do
+          "asked to change position to #{"#{bars} bars " if bars}#{"#{beats} beats " if beats}" \
+          "#{"#{midi_beats} midi beats " if midi_beats}"
+        end
 
         position = bars&.rationalize || 1r
         position += Rational(midi_beats, 4 * @sequencer.beats_per_bar) if midi_beats
         position += Rational(beats, @sequencer.beats_per_bar) if beats
 
+        position -= @sequencer.tick_duration
+
         raise ArgumentError, "undefined new position" unless position
 
-        warn "Transport: received message position change to #{position}" if @do_log
+        logger.debug('Transport') { "received message position change to #{position.inspect}" }
 
         start_again_later = false
 
@@ -95,7 +104,7 @@ module Musa
           start_again_later = true
         end
 
-        warn "Transport: setting sequencer position #{position}" if @do_log
+        logger.debug('Transport') { "setting sequencer position #{position.inspect}" }
 
         @sequencer.raw_at position, force_first: true do
           @on_change_position.each { |block| block.call @sequencer }
@@ -110,28 +119,32 @@ module Musa
         @clock.terminate
       end
 
+      def logger
+        @sequencer.logger
+      end
+
       private
 
       def do_before_begin
-        warn 'Transport: doing before_begin initialization...' unless @before_begin.empty? || !@do_log
+        logger.debug('Transport') { 'doing before_begin initialization...' } unless @before_begin.empty?
         @before_begin.each { |block| block.call @sequencer }
-        warn 'Transport: doing before_begin initialization... done' unless @before_begin.empty? || !@do_log
+        logger.debug('Transport') { 'doing before_begin initialization... done' } unless @before_begin.empty?
       end
 
       def do_on_start
-        warn 'Transport: starting...' unless @on_start.empty? || !@do_log
+        logger.debug('Transport') { 'starting...' } unless @on_start.empty?
         @on_start.each { |block| block.call @sequencer }
-        warn 'Transport: starting... done'  unless @on_start.empty? || !@do_log
+        logger.debug('Transport') { 'starting... done' } unless @on_start.empty?
       end
 
       def do_stop
-        warn 'Transport: stoping...' unless @after_stop.empty? || !@do_log
+        logger.debug('Transport') { 'stopping...' } unless @after_stop.empty?
         @after_stop.each { |block| block.call @sequencer }
-        warn 'Transport: stoping... done' unless @after_stop.empty? || !@do_log
+        logger.debug('Transport') { 'stopping... done' } unless @after_stop.empty?
 
-        warn 'Transport: resetting sequencer...' if @do_log
+        logger.debug('Transport') { 'resetting sequencer...' }
         @sequencer.reset
-        warn 'Transport: resetting sequencer... done' if @do_log
+        logger.debug('Transport') { 'resetting sequencer... done' }
 
         do_before_begin
         @before_begin_already_done = true

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.21.1'
-  s.date        = '2020-10-09'
+  s.version     = '0.22.1'
+  s.date        = '2020-11-11'
   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)'
   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.21.1
+  version: 0.22.1
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -89,6 +89,7 @@ files:
 - lib/musa-dsl/core-ext/attribute-builder.rb
 - lib/musa-dsl/core-ext/deep-copy.rb
 - lib/musa-dsl/core-ext/dynamic-proxy.rb
+- lib/musa-dsl/core-ext/hashify.rb
 - lib/musa-dsl/core-ext/inspect-nice.rb
 - lib/musa-dsl/core-ext/smart-proc-binder.rb
 - lib/musa-dsl/core-ext/with.rb
@@ -163,8 +164,11 @@ files:
 - lib/musa-dsl/repl.rb
 - lib/musa-dsl/repl/repl.rb
 - lib/musa-dsl/sequencer.rb
-- lib/musa-dsl/sequencer/base-sequencer-implementation-control.rb
+- lib/musa-dsl/sequencer/base-sequencer-implementation-every.rb
+- lib/musa-dsl/sequencer/base-sequencer-implementation-move.rb
 - lib/musa-dsl/sequencer/base-sequencer-implementation-play-helper.rb
+- lib/musa-dsl/sequencer/base-sequencer-implementation-play-timed.rb
+- lib/musa-dsl/sequencer/base-sequencer-implementation-play.rb
 - lib/musa-dsl/sequencer/base-sequencer-implementation.rb
 - lib/musa-dsl/sequencer/base-sequencer-public.rb
 - lib/musa-dsl/sequencer/base-sequencer-tick-based.rb
@@ -175,11 +179,13 @@ files:
 - lib/musa-dsl/series.rb
 - lib/musa-dsl/series/array-to-serie.rb
 - lib/musa-dsl/series/base-series.rb
-- lib/musa-dsl/series/hash-serie-splitter.rb
+- lib/musa-dsl/series/flattener-timed-serie.rb
+- lib/musa-dsl/series/hash-or-array-serie-splitter.rb
 - lib/musa-dsl/series/holder-serie.rb
 - lib/musa-dsl/series/main-serie-constructors.rb
 - lib/musa-dsl/series/main-serie-operations.rb
 - lib/musa-dsl/series/proxy-serie.rb
+- lib/musa-dsl/series/quantizer-serie.rb
 - lib/musa-dsl/series/queue-serie.rb
 - lib/musa-dsl/series/series.rb
 - lib/musa-dsl/transcription.rb

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

@@ -1,216 +0,0 @@
-require 'forwardable'
-
-module Musa
-  module Sequencer
-    class BaseSequencer
-      class EventHandler
-        include Musa::Extension::SmartProcBinder
-
-        attr_accessor :continue_parameters
-
-        @@counter = 0
-
-        def initialize(parent = nil)
-          @id = (@@counter += 1)
-
-          @parent = parent
-          @handlers = {}
-
-          @stop = false
-        end
-
-        def stop
-          @stop = true
-        end
-
-        def stopped?
-          @stop
-        end
-
-        def pause
-          raise NotImplementedError
-        end
-
-        def continue
-          @paused = false
-        end
-
-        def paused?
-          @paused
-        end
-
-        def on(event, name: nil, only_once: nil, &block)
-          only_once ||= false
-
-          @handlers[event] ||= {}
-
-          # TODO: add on_rescue: proc { |e| _rescue_block_error(e) } [this method is on Sequencer, not in EventHandler]
-          @handlers[event][name] = {block: SmartProcBinder.new(block), only_once: only_once }
-        end
-
-        def launch(event, *value_parameters, **key_parameters)
-          _launch event, value_parameters, key_parameters
-        end
-
-        def _launch(event, value_parameters = nil, key_parameters = nil)
-          value_parameters ||= []
-          key_parameters ||= {}
-          processed = false
-
-          if @handlers.key? event
-            @handlers[event].each do |name, handler|
-              handler[:block].call *value_parameters, **key_parameters
-              @handlers[event].delete name if handler[:only_once]
-              processed = true
-            end
-          end
-
-          @parent._launch event, value_parameters, key_parameters if @parent && !processed
-        end
-
-        def inspect
-          "EventHandler #{id}"
-        end
-
-        def id
-          if @parent
-            "#{@parent.id}.#{self.class.name.split('::').last}-#{@id}"
-          else
-            "#{self.class.name.split('::').last}-#{@id.to_s}"
-          end
-        end
-
-        alias to_s inspect
-      end
-
-      private_constant :EventHandler
-
-      class PlayControl < EventHandler
-        attr_reader :do_after
-
-        def initialize(parent, after: nil)
-          super parent
-
-          @do_after = []
-
-          self.after &after if after
-        end
-
-        def pause
-          @paused = true
-        end
-
-        def store_continuation(sequencer:, serie:, nl_context:, mode:, decoder:, play_eval:, mode_args:)
-          @continuation_sequencer = sequencer
-          @continuation_parameters = {
-              serie: serie,
-              control: self,
-              nl_context: nl_context,
-              mode: mode,
-              decoder: decoder,
-              play_eval: play_eval,
-              mode_args: mode_args
-          }
-        end
-
-        def continue
-          super
-          @continuation_sequencer.continuation_play(@continuation_parameters) if @continuation_sequencer
-        end
-
-        def after(_bars = nil, &block)
-          # TODO implementar parámetro _bars (?)
-          @do_after << block
-        end
-      end
-
-      private_constant :PlayControl
-
-      class EveryControl < EventHandler
-        attr_reader :duration_value, :till_value, :condition_block, :do_on_stop, :do_after
-
-        attr_accessor :_start_position
-        attr_accessor :_execution_counter
-
-        def initialize(parent, duration: nil, till: nil, condition: nil, on_stop: nil, after_bars: nil, after: nil)
-          super parent
-
-          @duration_value = duration
-          @till_value = till
-          @condition_block = condition
-
-          @do_on_stop = []
-          @do_after = []
-
-          @do_on_stop << on_stop if on_stop
-
-          self.after after_bars, &after if after
-        end
-
-        def duration(value)
-          @duration_value = value.rationalize
-        end
-
-        def till(value)
-          @till_value = value.rationalize
-        end
-
-        def condition(&block)
-          @condition_block = block
-        end
-
-        def on_stop(&block)
-          @do_on_stop << block
-        end
-
-        def after(bars = nil, &block)
-          bars ||= 0
-          @do_after << { bars: bars.rationalize, block: block }
-        end
-      end
-
-      private_constant :EveryControl
-
-      class MoveControl < EventHandler
-        attr_reader :every_control, :do_on_stop, :do_after
-
-        def initialize(parent, duration: nil, till: nil, on_stop: nil, after_bars: nil, after: nil)
-          super parent
-
-          @every_control = EveryControl.new(self, duration: duration, till: till)
-
-          @do_on_stop = []
-          @do_after = []
-
-          @do_on_stop << on_stop if on_stop
-          self.after after_bars, &after if after
-
-          @every_control.on_stop do
-            @stop = true
-            @do_on_stop.each(&:call)
-          end
-        end
-
-        def on_stop(&block)
-          @do_on_stop << block
-        end
-
-        def after(bars = nil, &block)
-          bars ||= 0
-          @do_after << { bars: bars.rationalize, block: block }
-        end
-
-        def stop
-          @every_control.stop
-        end
-
-        def stopped?
-          @stop
-        end
-      end
-
-      private_constant :MoveControl
-    end
-  end
-end
-