xi-lang 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7ee847da08f4dd79a890c7586a6c410d49994b5
-  data.tar.gz: 098aa22714b668efef3e238a8bb7abac2be2476a
+  metadata.gz: 65bceb35fd0dbad39331e9c89bea0a83254fe075
+  data.tar.gz: a20c3dd41afe001b698aab57d8cd3577e66d6dcb
 SHA512:
-  metadata.gz: 72f6b2715e0753723b848a9dc1b3a7754d7417bac71ac96cfa9869dc5c0f8ce0d497b7d76897e41af6c5f903a7166eeff90f8993adbf2e4fd29c52cb15437800
-  data.tar.gz: fc8186a9b0685c9ee1045424c3cafb1ecd171c4de2b3e6fb156570ad4c40f1cce144c6ab1fe1ae1fbf8cff4213e929ce8252d392b44d8d9ee23034eae3df6293
+  metadata.gz: e92c7bf49fa2bba86bf0eb153d7c0d1fd363a21060d52faf3a472655ffce291c8e57563edc303ae1ef65c591dc6b6db746d2f64592e469e927ba56a35ce6cd31
+  data.tar.gz: 3ab57ef7a85d4cac9a9e260aba0b030972b80105e320036feefc3ef3a418b22aec361180685cdda28ef92ab72ee39639ca7786595c030000b96f76d4b04c5be5

data/lib/xi/clock.rb

@@ -1,5 +1,4 @@
 require 'thread'
-require 'logger'
 require 'set'
 
 Thread.abort_on_exception = true
@@ -7,7 +6,7 @@ Thread.abort_on_exception = true
 module Xi
   class Clock
     DEFAULT_CPS  = 1.0
-    INTERVAL_SEC = 20 / 1000.0
+    INTERVAL_SEC = 10 / 1000.0
 
     def initialize(cps: DEFAULT_CPS)
       @mutex = Mutex.new
@@ -83,11 +82,7 @@ module Xi
       return unless playing?
       @streams.each { |s| s.notify(cycles) }
     rescue => err
-      logger.error(err)
-    end
-
-    def logger
-      @logger ||= Logger.new(STDOUT)
+      error(err)
     end
   end
 end

data/lib/xi/core_ext/object.rb

@@ -0,0 +1,5 @@
+require "xi/logger"
+
+class Object
+  include Xi::Logger
+end

data/lib/xi/core_ext.rb

@@ -1,4 +1,5 @@
 require 'xi/core_ext/enumerable'
 require 'xi/core_ext/fixnum'
 require 'xi/core_ext/numeric'
+require 'xi/core_ext/object'
 require 'xi/core_ext/simple'

data/lib/xi/logger.rb

@@ -0,0 +1,25 @@
+require 'tmpdir'
+require 'logger'
+
+module Xi::Logger
+  LOG_FILE = File.join(Dir.tmpdir, 'xi.log')
+
+  def logger
+    @@logger ||= begin
+      logger = ::Logger.new(LOG_FILE)
+      logger.formatter = proc do |severity, datetime, progname, msg|
+        "[#{datetime.strftime("%F %T %L")}] #{msg}\n"
+      end
+      logger
+    end
+  end
+
+  def debug(*args)
+    logger.debug(args.map(&:to_s).join(' '.freeze))
+  end
+
+  def error(error)
+    logger.error("#{error}:\n#{error.backtrace.join("\n".freeze)}")
+    ErrorLog.instance << error.to_s
+  end
+end

data/lib/xi/music_parameters.rb

@@ -0,0 +1,47 @@
+require 'xi/scale'
+
+class Xi::Stream
+  module MusicParameters
+    DEFAULT = {
+      degree: 0,
+      octave: 5,
+      root:   0,
+      scale:  Xi::Scale.major,
+      steps_per_octave: 12,
+    }
+
+    private
+
+    def transform_state
+      super
+
+      @state = DEFAULT.merge(@state)
+
+      if !changed_param?(:note) && changed_param?(:degree, :scale, :steps_per_octave)
+        @state[:note] = reduce_to_note
+        @changed_params << :note
+      end
+
+      if !changed_param?(:midinote) && changed_param?(:note)
+        @state[:midinote] = reduce_to_midinote
+        @changed_params << :midinote
+      end
+    end
+
+    def reduce_to_midinote
+      Array(@state[:note]).compact.map { |n|
+        @state[:root].to_i + @state[:octave].to_i * @state[:steps_per_octave] + n
+      }
+    end
+
+    def reduce_to_note
+      Array(@state[:degree]).compact.map do |d|
+        d.degree_to_key(Array(@state[:scale]), @state[:steps_per_octave])
+      end
+    end
+
+    def changed_param?(*params)
+      @changed_params.any? { |p| params.include?(p) }
+    end
+  end
+end

data/lib/xi/pattern/transforms.rb

@@ -210,18 +210,33 @@ module Xi
         end
       end
 
-      # Traverses the pattern in order and then in reverse order
+      # Traverses the pattern in order and then in reverse order, skipping
+      # first and last values if +skip_extremes+ is true.
       #
       # @example
-      #   peek (0..3).p.bounce   #=> [0, 1, 2, 3, 3, 2, 1, 0]
+      #   peek (0..3).p.bounce   #=> [0, 1, 2, 3, 2, 1]
+      #   peek 10.p.bounce       #=> [10]
       #
+      # @example with skip_extremes=false
+      #   peek (0..3).p.bounce(false)   #=> [0, 1, 2, 3, 3, 2, 1, 0]
+      #
+      # @param skip_extremes [Boolean] Skip first and last values
+      #   to avoid repeated values (default: true)
       # @return [Pattern]
       #
-      def bounce
-        Pattern.new(self, size: size * 2 - 1) do |y|
-          each.with_index { |v, i| y << v if i > 0 }
-          reverse_each.with_index { |v, i| y << v if i > 0 }
-        end
+      def bounce(skip_extremes=true)
+        return self if size == 0 || size == 1
+
+        Pattern.new(self, size: size * 2 - 1) { |y|
+          last_id = 0
+          each.with_index { |v, i|
+            y << v
+            last_id = i
+          }
+          reverse_each.with_index { |v, i|
+            y << v unless skip_extremes && (i == 0 || i == last_id)
+          }
+        }
       end
 
       # Normalizes a pattern of values that range from +min+ to +max+ to 0..1
@@ -306,7 +321,12 @@ module Xi
       #
       def sometimes(probability=0.5)
         prob_pat = probability.p
-        Pattern.new(self, size: size * prob_pat.size) do |y|
+
+        if times_pat.infinite?
+          fail ArgumentError, 'times must be a finite pattern'
+        end
+
+        Pattern.new(self, size: size * prob_pat.reduce(:+)) do |y|
           prob_pat.each do |prob|
             each { |v| y << (rand < prob ? v : nil) }
           end
@@ -318,7 +338,12 @@ module Xi
       #
       def repeat_each(times)
         times_pat = times.p
-        Pattern.new(self, size: size * times_pat.size) do |y|
+
+        if times_pat.infinite?
+          fail ArgumentError, 'times must be a finite pattern'
+        end
+
+        Pattern.new(self, size: size * times_pat.reduce(:+)) do |y|
           times_pat.each do |t|
             each { |v| t.times { y << v } }
           end

data/lib/xi/repl.rb

@@ -37,12 +37,16 @@ module Xi
       Pry.hooks.add_hook(:after_eval, "check_for_errors") do |result, pry|
         more_errors = ErrorLog.instance.more_errors?
         ErrorLog.instance.each do |msg|
-          puts "(╯°□°）╯︵ ɹoɹɹǝ #{msg}"
+          puts red("Error: #{msg}")
         end
-        puts "(⌣_⌣”) There were more errors..." if more_errors
+        puts red("There were more errors...") if more_errors
       end
     end
 
+    def red(string)
+      "\e[31m\e[1m#{string}\e[22m\e[0m"
+    end
+
     def load_init_script
       require(init_script_path)
     end

data/lib/xi/scale.rb

@@ -0,0 +1,97 @@
+class Xi::Scale
+  DEGREES = {
+    # TWELVE TONES PER OCTAVE
+    # 5 note scales
+    minorPentatonic: [0,3,5,7,10],
+    majorPentatonic: [0,2,4,7,9],
+    # another mode of major pentatonic
+    ritusen: [0,2,5,7,9],
+    # another mode of major pentatonic
+    egyptian: [0,2,5,7,10],
+
+    kumoi: [0,2,3,7,9],
+    hirajoshi: [0,2,3,7,8],
+
+    iwato: [0,1,5,6,10],    # mode of hirajoshi
+    chinese: [0,4,6,7,11],  # mode of hirajoshi
+    indian: [0,4,5,7,10],
+    pelog: [0,1,3,7,8],
+
+    prometheus: [0,2,4,6,11],
+    scriabin: [0,1,4,7,9],
+
+    # han chinese pentatonic scales
+    gong: [0,2,4,7,9],
+    shang: [0,2,5,7,10],
+    jiao: [0,3,5,8,10],
+    zhi: [0,2,5,7,9],
+    yu: [0,3,5,7,10],
+
+    # 6 note scales
+    whole: [0, 2, 4, 6, 8, 10],
+    augmented: [0,3,4,7,8,11],
+    augmented2: [0,1,4,5,8,9],
+
+    # hexatonic modes with no tritone
+    hexMajor7: [0,2,4,7,9,11],
+    hexDorian: [0,2,3,5,7,10],
+    hexPhrygian: [0,1,3,5,8,10],
+    hexSus: [0,2,5,7,9,10],
+    hexMajor6: [0,2,4,5,7,9],
+    hexAeolian: [0,3,5,7,8,10],
+
+    # 7 note scales
+    major: [0,2,4,5,7,9,11],
+    ionian: [0,2,4,5,7,9,11],
+    dorian: [0,2,3,5,7,9,10],
+    phrygian: [0,1,3,5,7,8,10],
+    lydian: [0,2,4,6,7,9,11],
+    mixolydian: [0,2,4,5,7,9,10],
+    aeolian: [0,2,3,5,7,8,10],
+    minor: [0,2,3,5,7,8,10],
+    locrian: [0,1,3,5,6,8,10],
+
+    harmonicMinor: [0,2,3,5,7,8,11],
+    harmonicMajor: [0,2,4,5,7,8,11],
+
+    melodicMinor: [0,2,3,5,7,9,11],
+    melodicMinorDesc: [0,2,3,5,7,8,10],
+    melodicMajor: [0,2,4,5,7,8,10],
+
+    bartok: [0,2,4,5,7,8,10],
+    hindu: [0,2,4,5,7,8,10],
+
+    # raga modes
+    todi: [0,1,3,6,7,8,11],
+    purvi: [0,1,4,6,7,8,11],
+    marva: [0,1,4,6,7,9,11],
+    bhairav: [0,1,4,5,7,8,11],
+    ahirbhairav: [0,1,4,5,7,9,10],
+
+    superLocrian: [0,1,3,4,6,8,10],
+    romanianMinor: [0,2,3,6,7,9,10],
+    hungarianMinor: [0,2,3,6,7,8,11],
+    neapolitanMinor: [0,1,3,5,7,8,11],
+    enigmatic: [0,1,4,6,8,10,11],
+    spanish: [0,1,4,5,7,8,10],
+
+    # modes of whole tones with added note ->
+    leadingWhole: [0,2,4,6,8,10,11],
+    lydianMinor: [0,2,4,6,7,8,10],
+    neapolitanMajor: [0,1,3,5,7,9,11],
+    locrianMajor: [0,2,4,5,6,8,10],
+
+    # 8 note scales
+    diminished: [0,1,3,4,6,7,9,10],
+    diminished2: [0,2,3,5,6,8,9,11],
+
+    # 12 note scales
+    chromatic: (0..11).to_a,
+  }
+
+  class << self
+    DEGREES.each do |name, list|
+      define_method(name) { list }
+    end
+  end
+end

data/lib/xi/stream.rb

@@ -1,10 +1,16 @@
 require 'set'
+require 'xi/music_parameters'
 
 module Xi
   class Stream
-    attr_reader :clock, :source, :source_patterns, :state, :event_duration, :gate
+    prepend MusicParameters
+
+    attr_reader :clock, :opts, :source, :state, :event_duration, :gate
+
+    def initialize(name, clock, **opts)
+      @name = name.to_sym
+      @opts = opts
 
-    def initialize(clock)
       @mutex = Mutex.new
       @playing = false
       @last_sound_object_id = 0
@@ -18,6 +24,7 @@ module Xi
 
     def set(event_duration: nil, gate: nil, **source)
       @mutex.synchronize do
+        source[:s] ||= @name
         @source = source
         @gate = gate if gate
         @event_duration = event_duration if event_duration
@@ -26,7 +33,7 @@ module Xi
       play
       self
     end
-    alias_method :<<, :set
+    alias_method :call, :set
 
     def event_duration=(new_value)
       @mutex.synchronize do
@@ -76,10 +83,11 @@ module Xi
     alias_method :pause, :play
 
     def inspect
-      "#<#{self.class.name}:#{"0x%014x" % object_id} " \
-        "clock=#{@clock.inspect} #{playing? ? :playing : :stopped}>"
+      "#<#{self.class.name} :#{@name} " \
+        "#{playing? ? :playing : :stopped} at #{@clock.cps}cps" \
+        "#{" #{@opts}" if @opts.any?}>"
     rescue => err
-      logger.error(err)
+      error(err)
     end
 
     def notify(now)
@@ -89,9 +97,10 @@ module Xi
         @changed_params.clear
 
         forward_enums(now) if @must_forward
+        gate_off = gate_off_old_sound_objects(now)
+        gate_on = play_enums(now)
 
-        gate_on, gate_off = play_enums(now)
-
+        # Call hooks
         do_gate_off_change(gate_off) unless gate_off.empty?
         do_state_change if state_changed?
         do_gate_on_change(gate_on) unless gate_on.empty?
@@ -106,6 +115,8 @@ module Xi
 
     def forward_enums(now)
       @enums.each do |p, (enum, total_dur)|
+        next if total_dur == 0
+
         cur_pos = now % total_dur
         start_pos = now - cur_pos
 
@@ -123,34 +134,40 @@ module Xi
       @must_forward = false
     end
 
-    def play_enums(now)
+    def gate_off_old_sound_objects(now)
       gate_off = []
+
+      # Check if there are any currently playing sound objects that
+      # must be gated off
+      @playing_sound_objects.dup.each do |end_pos, h|
+        if now >= h[:at] - latency_sec
+          gate_off << h
+          @playing_sound_objects.delete(end_pos)
+        end
+      end
+
+      gate_off
+    end
+
+    def play_enums(now)
       gate_on = []
 
       @enums.each do |p, (enum, total_dur)|
+        next if total_dur == 0
+
         cur_pos = now % total_dur
         start_pos = now - cur_pos
 
-        # Check if there are any currently playing sound objects that
-        # must be gated off
-        @playing_sound_objects.dup.each do |end_pos, h|
-          if now >= h[:at] - latency_sec
-            gate_off << h
-            @playing_sound_objects.delete(end_pos)
-          end
-        end
-
         next_ev = enum.peek
 
         # Do we need to play next event now? If not, skip this parameter
         if (@prev_end[p].nil? || now >= @prev_end[p]) && cur_pos >= next_ev.start - latency_sec
-          #logger.info "cur_pos=#{cur_pos} >= next_ev.start=#{next_ev.start}"
           # Update state based on pattern value
           # TODO: Pass as parameter exact time (start_ts + next_ev.start)
           update_state(p, next_ev.value)
+          transform_state
 
-          # If this parameter is a gate, mark it as gate on as
-          # a new sound object
+          # If a gate parameter changed, create a new sound object
           if p == @gate
             new_so_ids = Array(next_ev.value)
               .size.times.map { new_sound_object_id }
@@ -173,7 +190,11 @@ module Xi
         end
       end
 
-      [gate_on, gate_off]
+      gate_on
+    end
+
+    # @override
+    def transform_state
     end
 
     def new_sound_object_id
@@ -189,21 +210,21 @@ module Xi
     end
 
     def do_gate_on_change(ss)
-      logger.info "Gate on change: #{ss}"
+      debug "Gate on change: #{ss}"
     end
 
     def do_gate_off_change(ss)
-      logger.info "Gate off change: #{ss}"
+      debug "Gate off change: #{ss}"
     end
 
     def do_state_change
-      logger.info "State change: #{@state
+      debug "State change: #{@state
         .select { |k, v| @changed_params.include?(k) }.to_h}"
     end
 
     def update_state(p, v)
       if v != @state[p]
-        logger.debug "Update state of :#{p}: #{v}"
+        debug "Update state of :#{p}: #{v}"
         @changed_params << p
         @state[p] = v
       end
@@ -220,10 +241,5 @@ module Xi
     def latency_sec
       0.05
     end
-
-    def logger
-      # FIXME this should be configurable
-      @logger ||= Logger.new("/tmp/xi.log")
-    end
   end
 end

data/lib/xi/version.rb

@@ -1,3 +1,3 @@
 module Xi
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/xi.rb

@@ -9,18 +9,68 @@ def inf
   Float::INFINITY
 end
 
-module Xi::Init
-  def default_clock
-    @default_clock ||= Clock.new
+module Xi
+  def self.default_backend
+    @default_backend
   end
 
-  def peek(pattern, *args)
-    pattern.peek(*args)
+  def self.default_backend=(new_name)
+    @default_backend = new_name && new_name.to_sym
   end
 
-  def peek_events(pattern, *args)
-    pattern.peek_events(*args)
+  module Init
+    def peek(pattern, *args)
+      pattern.peek(*args)
+    end
+
+    def peek_events(pattern, *args)
+      pattern.peek_events(*args)
+    end
+
+    def clock
+      @default_clock ||= Clock.new
+    end
+
+    def stop_all
+      @streams.each do |backend, ss|
+        ss.each do |name, stream|
+          stream.stop
+        end
+      end
+    end
+    alias_method :hush, :stop_all
+
+    def method_missing(method, backend=nil, **opts)
+      backend ||= Xi.default_backend
+      super if backend.nil?
+
+      if !backend.is_a?(String) && !backend.is_a?(Symbol)
+        fail ArgumentError, "invalid backend '#{backend}'"
+      end
+
+      @streams ||= {}
+      @streams[backend] ||= {}
+
+      s = @streams[backend][method] ||= begin
+        require "xi/#{backend}"
+        cls = Class.const_get("#{backend.to_s.capitalize}::Stream")
+        cls.new(method, self.clock, **opts)
+      end
+
+      b = Pry.binding_for(self)
+      b.local_variable_set(method, s)
+
+      s
+    end
   end
 end
 
-self.extend Xi::Init
+singleton_class.include Xi::Init
+
+# Try to load Supercollider backend and set it as default if installed
+begin
+  require "xi/supercollider"
+  Xi.default_backend = :supercollider
+rescue LoadError
+  Xi.default_backend = nil
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xi-lang
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Damián Silvani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,13 +133,17 @@ files:
 - lib/xi/core_ext/enumerable.rb
 - lib/xi/core_ext/fixnum.rb
 - lib/xi/core_ext/numeric.rb
+- lib/xi/core_ext/object.rb
 - lib/xi/core_ext/simple.rb
 - lib/xi/error_log.rb
 - lib/xi/event.rb
+- lib/xi/logger.rb
+- lib/xi/music_parameters.rb
 - lib/xi/pattern.rb
 - lib/xi/pattern/generators.rb
 - lib/xi/pattern/transforms.rb
 - lib/xi/repl.rb
+- lib/xi/scale.rb
 - lib/xi/stream.rb
 - lib/xi/version.rb
 - xi.gemspec