musa-dsl 0.14.18 → 0.21.0

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

@@ -1,40 +1,42 @@
 module Musa
-  class Timer
-    attr_accessor :period
+  module Clock
+    class Timer
+      attr_accessor :period
+
+      def initialize(period_in_seconds, correction: nil, stop: nil)
+        @period = period_in_seconds.rationalize
+        @correction = (correction || 0r).rationalize
+        @stop = stop || false
+      end
 
-    def initialize(period_in_seconds, correction: nil, stop: nil)
-      @period = period_in_seconds.rationalize
-      @correction = (correction || 0r).rationalize
-      @stop ||= false
-    end
+      def run
+        @thread = Thread.current
 
-    def run
-      @thread = Thread.current
+        @next_moment = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
-      @next_moment = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        loop do
+          unless @stop
+            yield
 
-      loop do
-        unless @stop
-          yield
+            @next_moment += @period
+            to_sleep = (@next_moment  + @correction) - Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
-          @next_moment += @period
-          to_sleep = (@next_moment  + @correction) - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            sleep to_sleep if to_sleep > 0.0
+          end
 
-          sleep to_sleep if to_sleep > 0.0
+          sleep if @stop
         end
-
-        sleep if @stop
       end
-    end
 
-    def stop
-      @stop = true
-    end
+      def stop
+        @stop = true
+      end
 
-    def continue
-      @stop = false
-      @next_moment = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      @thread.run
+      def continue
+        @stop = false
+        @next_moment = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        @thread.run
+      end
     end
   end
 end

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

@@ -1,137 +1,141 @@
-require 'musa-dsl/sequencer'
-
-require 'musa-dsl/core-ext/key-parameters-procedure-binder'
+require_relative '../core-ext/smart-proc-binder'
+require_relative '../sequencer'
 
 module Musa
-  class Transport
-    attr_reader :sequencer
+  module Transport
+    class Transport
+      include Musa::Extension::SmartProcBinder
+
+      attr_reader :sequencer
+
+      def initialize(clock,
+                     beats_per_bar = nil,
+                     ticks_per_beat = nil,
+                     before_begin: nil,
+                     on_start: nil,
+                     after_stop: nil,
+                     on_position_change: nil,
+                     do_log: nil)
+
+        beats_per_bar ||= 4
+        ticks_per_beat ||= 24
+        do_log ||= false
+
+        @clock = clock
 
-    def initialize(clock,
-                   beats_per_bar = nil,
-                   ticks_per_beat = nil,
-                   before_begin: nil,
-                   on_start: nil,
-                   after_stop: nil,
-                   before_each_tick: nil,
-                   on_position_change: nil,
-                   do_log: nil)
+        @before_begin = []
+        @before_begin << SmartProcBinder.new(before_begin) if before_begin
 
-      beats_per_bar ||= 4
-      ticks_per_beat ||= 24
-      do_log ||= false
+        @on_start = []
+        @on_start << SmartProcBinder.new(on_start) if on_start
 
-      @clock = clock
+        @on_change_position = []
+        @on_change_position << SmartProcBinder.new(on_position_change) if on_position_change
 
-      @before_begin = []
-      @before_begin << KeyParametersProcedureBinder.new(before_begin) if before_begin
+        @after_stop = []
+        @after_stop << SmartProcBinder.new(after_stop) if after_stop
 
-      @on_start = []
-      @on_start << KeyParametersProcedureBinder.new(on_start) if on_start
+        @do_log = do_log
 
-      @before_each_tick = []
-      @before_each_tick << KeyParametersProcedureBinder.new(before_each_tick) if before_each_tick
+        @sequencer = Sequencer::Sequencer.new beats_per_bar, ticks_per_beat, do_log: @do_log
+
+        @clock.on_start do
+          do_on_start
+        end
+
+        @clock.on_stop do
+          do_stop
+        end
 
-      @on_position_change = []
-      @on_position_change << KeyParametersProcedureBinder.new(on_position_change) if on_position_change
+        @clock.on_change_position do |bars: nil, beats: nil, midi_beats: nil|
+          change_position_to bars: bars, beats: beats, midi_beats: midi_beats
+        end
+      end
 
-      @after_stop = []
-      @after_stop << KeyParametersProcedureBinder.new(after_stop) if after_stop
+      def before_begin(&block)
+        @before_begin << SmartProcBinder.new(block)
+      end
 
-      @do_log = do_log
+      def on_start(&block)
+        @on_start << SmartProcBinder.new(block)
+      end
 
-      @sequencer = Sequencer.new beats_per_bar, ticks_per_beat, do_log: @do_log
+      def after_stop(&block)
+        @after_stop << SmartProcBinder.new(block)
+      end
 
-      @clock.on_start do
-        do_on_start
+      def on_change_position(&block)
+        @on_change_position << SmartProcBinder.new(block)
       end
 
-      @clock.on_stop do
-        do_stop
+      def start
+        do_before_begin unless @before_begin_already_done
+
+        @clock.run do
+          @before_begin_already_done = false
+          @sequencer.tick
+        end
       end
 
-      @clock.on_song_position_pointer do |midi_beat_position|
-        position = Rational(midi_beat_position, 4 * beats_per_bar) + 1
-        tick_before_position = position - Rational(1, beats_per_bar * ticks_per_beat)
+      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
+
+        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
+
+        raise ArgumentError, "undefined new position" unless position
 
         warn "Transport: received message position change to #{position}" if @do_log
 
         start_again_later = false
 
-        if @sequencer.position > tick_before_position
+        if @sequencer.position > position
           do_stop
           start_again_later = true
         end
 
-        warn "Transport: setting sequencer position #{tick_before_position}" if @do_log
-        @sequencer.position = tick_before_position
+        warn "Transport: setting sequencer position #{position}" if @do_log
 
         @sequencer.raw_at position, force_first: true do
-          @on_position_change.each { |block| block.call @sequencer }
+          @on_change_position.each { |block| block.call @sequencer }
         end
 
+        @sequencer.position = position
+
         do_on_start if start_again_later
       end
-    end
-
-    def before_begin(&block)
-      @before_begin << KeyParametersProcedureBinder.new(block)
-    end
-
-    def on_start(&block)
-      @on_start << KeyParametersProcedureBinder.new(block)
-    end
-
-    def before_each_tick(&block)
-      @before_each_tick << KeyParametersProcedureBinder.new(block)
-    end
-
-    def after_stop(&block)
-      @after_stop << KeyParametersProcedureBinder.new(block)
-    end
-
-    def on_position_change(&block)
-      @on_position_change << KeyParametersProcedureBinder.new(block)
-    end
-
-    def start
-      do_before_begin unless @before_begin_already_done
 
-      @clock.run do
-        @before_begin_already_done = false
-        @before_each_tick.each { |block| block.call @sequencer }
-        @sequencer.tick
+      def stop
+        @clock.terminate
       end
-    end
-
-    def stop
-      @clock.terminate
-    end
 
-    private
+      private
 
-    def do_before_begin
-      warn 'Transport: doing before_begin initialization...' unless @before_begin.empty? || !@do_log
-      @before_begin.each { |block| block.call @sequencer }
-      warn 'Transport: doing before_begin initialization... done' unless @before_begin.empty? || !@do_log
-    end
+      def do_before_begin
+        warn 'Transport: doing before_begin initialization...' unless @before_begin.empty? || !@do_log
+        @before_begin.each { |block| block.call @sequencer }
+        warn 'Transport: doing before_begin initialization... done' unless @before_begin.empty? || !@do_log
+      end
 
-    def do_on_start
-      warn 'Transport: starting...' unless @on_start.empty? || !@do_log
-      @on_start.each { |block| block.call @sequencer }
-      warn 'Transport: starting... done'  unless @on_start.empty? || !@do_log
-    end
+      def do_on_start
+        warn 'Transport: starting...' unless @on_start.empty? || !@do_log
+        @on_start.each { |block| block.call @sequencer }
+        warn 'Transport: starting... done'  unless @on_start.empty? || !@do_log
+      end
 
-    def do_stop
-      warn 'Transport: stoping...' unless @after_stop.empty? || !@do_log
-      @after_stop.each { |block| block.call @sequencer }
-      warn 'Transport: stoping... done' unless @after_stop.empty? || !@do_log
+      def do_stop
+        warn 'Transport: stoping...' unless @after_stop.empty? || !@do_log
+        @after_stop.each { |block| block.call @sequencer }
+        warn 'Transport: stoping... done' unless @after_stop.empty? || !@do_log
 
-      warn 'Transport: resetting sequencer...' if @do_log
-      @sequencer.reset
-      warn 'Transport: resetting sequencer... done' if @do_log
+        warn 'Transport: resetting sequencer...' if @do_log
+        @sequencer.reset
+        warn 'Transport: resetting sequencer... done' if @do_log
 
-      do_before_begin
-      @before_begin_already_done = true
+        do_before_begin
+        @before_begin_already_done = true
+      end
     end
   end
 end

data/musa-dsl.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.14.18'
-  s.date        = '2019-09-29'
+  s.version     = '0.21.0'
+  s.date        = '2020-10-02'
   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']
   s.email       = 'javier.sy@gmail.com'
   s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|samples)/}) }
   s.homepage    = 'https://github.com/javier-sy/musa-dsl'
-  s.license     = 'CC-BY-NC-ND-4.0'
+  s.license     = 'LGPL-3.0'
 
   s.add_runtime_dependency 'citrus', '~> 3.0.0', '>= 3.0.0'
 

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.14.18
+  version: 0.21.0
 platform: ruby
 authors:
 - Javier Sánchez Yeste
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -78,34 +78,49 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.md
 - README.md
 - lib/musa-dsl.rb
 - lib/musa-dsl/core-ext.rb
-- lib/musa-dsl/core-ext/array-apply-get.rb
 - lib/musa-dsl/core-ext/array-explode-ranges.rb
-- lib/musa-dsl/core-ext/array-to-neumas.rb
-- lib/musa-dsl/core-ext/array-to-serie.rb
 - lib/musa-dsl/core-ext/arrayfy.rb
-- lib/musa-dsl/core-ext/as-context-run.rb
-- lib/musa-dsl/core-ext/duplicate.rb
+- 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/inspect-nice.rb
-- lib/musa-dsl/core-ext/key-parameters-procedure-binder.rb
-- lib/musa-dsl/core-ext/proc-nice.rb
-- lib/musa-dsl/core-ext/send-nice.rb
-- lib/musa-dsl/core-ext/string-to-neumas.rb
+- lib/musa-dsl/core-ext/smart-proc-binder.rb
+- lib/musa-dsl/core-ext/with.rb
 - lib/musa-dsl/datasets.rb
-- lib/musa-dsl/datasets/gdv-decorators.rb
+- lib/musa-dsl/datasets/dataset.rb
+- lib/musa-dsl/datasets/delta-d.rb
+- lib/musa-dsl/datasets/e.rb
 - lib/musa-dsl/datasets/gdv.rb
+- lib/musa-dsl/datasets/gdvd.rb
+- lib/musa-dsl/datasets/helper.rb
+- lib/musa-dsl/datasets/p.rb
+- lib/musa-dsl/datasets/packed-v.rb
 - lib/musa-dsl/datasets/pdv.rb
+- lib/musa-dsl/datasets/ps.rb
+- lib/musa-dsl/datasets/score.rb
+- lib/musa-dsl/datasets/score/queriable.rb
+- lib/musa-dsl/datasets/score/render.rb
+- lib/musa-dsl/datasets/score/to-mxml/process-pdv.rb
+- lib/musa-dsl/datasets/score/to-mxml/process-ps.rb
+- lib/musa-dsl/datasets/score/to-mxml/process-time.rb
+- lib/musa-dsl/datasets/score/to-mxml/to-mxml.rb
+- lib/musa-dsl/datasets/v.rb
 - lib/musa-dsl/generative.rb
+- lib/musa-dsl/generative/backboner.rb
 - lib/musa-dsl/generative/darwin.rb
 - lib/musa-dsl/generative/generative-grammar.rb
 - lib/musa-dsl/generative/markov.rb
-- lib/musa-dsl/generative/rules.rb
 - lib/musa-dsl/generative/variatio.rb
+- lib/musa-dsl/logger.rb
+- lib/musa-dsl/logger/logger.rb
+- lib/musa-dsl/matrix.rb
+- lib/musa-dsl/matrix/matrix.rb
 - lib/musa-dsl/midi.rb
 - lib/musa-dsl/midi/midi-recorder.rb
 - lib/musa-dsl/midi/midi-voices.rb
@@ -115,11 +130,36 @@ files:
 - lib/musa-dsl/music/chords.rb
 - lib/musa-dsl/music/equally-tempered-12-tone-scale-system.rb
 - lib/musa-dsl/music/scales.rb
-- lib/musa-dsl/neuma.rb
-- lib/musa-dsl/neuma/neuma.rb
+- lib/musa-dsl/musicxml.rb
+- lib/musa-dsl/musicxml/builder/attributes.rb
+- lib/musa-dsl/musicxml/builder/backup-forward.rb
+- lib/musa-dsl/musicxml/builder/direction.rb
+- lib/musa-dsl/musicxml/builder/helper.rb
+- lib/musa-dsl/musicxml/builder/measure.rb
+- lib/musa-dsl/musicxml/builder/note-complexities.rb
+- lib/musa-dsl/musicxml/builder/note.rb
+- lib/musa-dsl/musicxml/builder/part-group.rb
+- lib/musa-dsl/musicxml/builder/part.rb
+- lib/musa-dsl/musicxml/builder/pitched-note.rb
+- lib/musa-dsl/musicxml/builder/rest.rb
+- lib/musa-dsl/musicxml/builder/score-partwise.rb
+- lib/musa-dsl/musicxml/builder/typed-text.rb
+- lib/musa-dsl/musicxml/builder/unpitched-note.rb
 - lib/musa-dsl/neumalang.rb
+- lib/musa-dsl/neumalang/datatypes.citrus
+- lib/musa-dsl/neumalang/neuma.citrus
 - lib/musa-dsl/neumalang/neumalang.citrus
 - lib/musa-dsl/neumalang/neumalang.rb
+- lib/musa-dsl/neumalang/process.citrus
+- lib/musa-dsl/neumalang/terminals.citrus
+- lib/musa-dsl/neumalang/vectors.citrus
+- lib/musa-dsl/neumas.rb
+- lib/musa-dsl/neumas/array-to-neumas.rb
+- lib/musa-dsl/neumas/neuma-decoder.rb
+- lib/musa-dsl/neumas/neuma-gdv-decoder.rb
+- lib/musa-dsl/neumas/neuma-gdvd-decoder.rb
+- lib/musa-dsl/neumas/neumas.rb
+- lib/musa-dsl/neumas/string-to-neumas.rb
 - lib/musa-dsl/repl.rb
 - lib/musa-dsl/repl/repl.rb
 - lib/musa-dsl/sequencer.rb
@@ -127,9 +167,13 @@ files:
 - lib/musa-dsl/sequencer/base-sequencer-implementation-play-helper.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
+- lib/musa-dsl/sequencer/base-sequencer-tickless-based.rb
 - lib/musa-dsl/sequencer/sequencer-dsl.rb
 - lib/musa-dsl/sequencer/sequencer.rb
+- lib/musa-dsl/sequencer/timeslots.rb
 - 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/holder-serie.rb
@@ -138,6 +182,11 @@ files:
 - lib/musa-dsl/series/proxy-serie.rb
 - lib/musa-dsl/series/queue-serie.rb
 - lib/musa-dsl/series/series.rb
+- lib/musa-dsl/transcription.rb
+- lib/musa-dsl/transcription/from-gdv-to-midi.rb
+- lib/musa-dsl/transcription/from-gdv-to-musicxml.rb
+- lib/musa-dsl/transcription/from-gdv.rb
+- lib/musa-dsl/transcription/transcription.rb
 - lib/musa-dsl/transport.rb
 - lib/musa-dsl/transport/clock.rb
 - lib/musa-dsl/transport/dummy-clock.rb
@@ -149,9 +198,9 @@ files:
 - musa-dsl.gemspec
 homepage: https://github.com/javier-sy/musa-dsl
 licenses:
-- CC-BY-NC-ND-4.0
+- LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,8 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A simple Ruby DSL for making complex music
 test_files: []