xi-lang 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db7114dfd1ad753386c1b126704628fd79bb3ed6bd22d46cbc3348591146a90f
-  data.tar.gz: f59674febf3c4021a36ab1b5de41fca7e2336b622c184693956b0fde32041ea7
+  metadata.gz: f2354b1293961d34731653d4461341638cc38e733a0c762b29ad8a7cc7574a7b
+  data.tar.gz: 3a3f2e8f0ce893304cde881800c03c33fe14e9ef01e76ba9810c1a2c3f9d8348
 SHA512:
-  metadata.gz: 798f94e61d6a6d80e4d766e1670f772109ca8e3ce5745d6ace5c8d7fc7763d0362cc18fe3884cf4162ecbb9be2646685eda66218cec933659d81d879a34e1b3e
-  data.tar.gz: 34130095d8b4e99e53f13a309a7817bc1f01107b71e2c71b8099a3b872a38abe52d53c385999d1c11569df02773944713795f08b534c8307b7bce9085a2b0586
+  metadata.gz: b13a449ea692bfafc775fe0af0d05997655d15493e33bc2849d77e7237c58a4bdd5af89f9962c97eb265462fa353b5b468678cdf1ffe416e90b7c716b663151b
+  data.tar.gz: fdaaf2a270cf50cbe45de430b23269cd5e30d43ca145bd4d691a19801e3e355df1f3ba6c99f9b33d9eab3ec6e80ac257b3cb95e8c7fb066036ba0025d3ab1d02

data/README.md

@@ -1,13 +1,12 @@
 # Xi  [![Build Status](https://travis-ci.org/xi-livecode/xi.svg?branch=master)](https://travis-ci.org/xi-livecode/xi)
 
-Xi (pronounced /ˈzaɪ/) is a musical pattern language inspired in Tidal and
-SuperCollider for building higher-level musical constructs easily.  It is
-implemented on the Ruby programming language.
+Xi is a musical pattern language inspired in Tidal and SuperCollider for
+building higher-level musical constructs easily.  It is implemented on the Ruby
+programming language and uses SuperCollider as a backend.
 
-Xi is only a patterns library, but can talk to different backends:
-
-- [SuperCollider](https://github.com/supercollider/supercollider)
-- MIDI devices
+Xi is only a patterns library, but can talk to
+[SuperCollider](https://github.com/supercollider/supercollider) synths or MIDI
+devices.
 
 *NOTE*: Be advised that this project is in very early alpha stages. There are a
 multiple known bugs, missing features, documentation and tests.
@@ -40,17 +39,20 @@ clap.set n: s("..x. xyz. .x.. .xyx", 60, 61, 60).p.decelerate(2),
 
 ### Quickstart
 
-You will need Ruby 2.1+ installed on your system.  Check by running `ruby
--v`.  To install Xi you must install the core libraries and REPL, and then one
-or more backends.
+You will need Ruby 2.4+ installed on your system.  Check by running `ruby -v`.
+To install Xi you must install the core libraries and REPL, and then one or
+more backends.
+
+    $ gem install xi-lang
 
-If you want to use Xi with SuperCollider:
+Available backends:
 
-    $ gem install xi-lang xi-supercollider
+* xi-midi: MIDI devices support
+* xi-superdirt: [SuperDirt](https://github.com/musikinformatik/SuperDirt) backend
 
-Or with MIDI:
+For example:
 
-    $ gem install xi-lang xi-midi
+    $ gem install xi-lang xi-superdirt
 
 Then run Xi REPL with:
 
@@ -100,4 +102,4 @@ the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
-See [LICENSE](LICENSE)
+See [LICENSE](LICENSE.txt)

data/lib/xi/core_ext/integer.rb

@@ -0,0 +1,11 @@
+module Xi::CoreExt
+  module Integer
+    def /(o)
+      super(o.to_r)
+    end
+  end
+end
+
+class Integer
+  prepend Xi::CoreExt::Integer
+end

data/lib/xi/core_ext/numeric.rb

@@ -21,14 +21,8 @@ module Xi::CoreExt
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4')
-  class Fixnum
-    include Xi::CoreExt::Numeric
-  end
-else
-  class Integer
-    include Xi::CoreExt::Numeric
-  end
+class Integer
+  include Xi::CoreExt::Numeric
 end
 
 class Float

data/lib/xi/core_ext/scalar.rb

@@ -8,12 +8,7 @@ module Xi::CoreExt
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4')
-  class Fixnum; include Xi::CoreExt::Scalar; end
-else
-  class Integer; include Xi::CoreExt::Scalar; end
-end
-
+class Integer;  include Xi::CoreExt::Scalar; end
 class Float;    include Xi::CoreExt::Scalar; end
 class String;   include Xi::CoreExt::Scalar; end
 class Symbol;   include Xi::CoreExt::Scalar; end

data/lib/xi/core_ext.rb

@@ -1,7 +1,7 @@
 require 'xi/core_ext/array'
 require 'xi/core_ext/enumerable'
 require 'xi/core_ext/enumerator'
-require 'xi/core_ext/fixnum'
+require 'xi/core_ext/integer'
 require 'xi/core_ext/numeric'
 require 'xi/core_ext/object'
 require 'xi/core_ext/scalar'

data/lib/xi/osc/version.rb

@@ -0,0 +1,5 @@
+module Xi
+  module OSC
+    VERSION = "0.1.5"
+  end
+end

data/lib/xi/osc.rb

@@ -0,0 +1,36 @@
+require "xi/osc/version"
+require 'osc-ruby'
+
+module Xi
+  module OSC
+    def initialize(name, clock, server: 'localhost', port:, **opts)
+      super
+      @osc = ::OSC::Client.new(server, port)
+    end
+
+    private
+
+    def send_msg(address, *args)
+      msg = message(address, *args)
+      debug(__method__, msg.address, *msg.to_a)
+      send_osc_msg(msg)
+    end
+
+    def send_bundle(address, *args, at: Time.now)
+      msg = message(address, *args)
+      bundle = ::OSC::Bundle.new(at, msg)
+      debug(__method__, msg.address, at.to_i, at.usec, *msg.to_a)
+      send_osc_msg(bundle)
+    end
+
+    def message(address, *args)
+      ::OSC::Message.new(address, *args)
+    end
+
+    def send_osc_msg(msg)
+      @osc.send(msg)
+    rescue StandardError => err
+      error(err)
+    end
+  end
+end

data/lib/xi/pattern/generators.rb

@@ -61,7 +61,7 @@ module Xi
       #   peek P.rand([1, 2, 3, 4], 6)    #=> [1, 3, 2, 2, 4, 3]
       #
       # @param list [#each] list of values
-      # @param repeats [Fixnum, Symbol] number or inf (default: 1)
+      # @param repeats [Integer, Symbol] number or inf (default: 1)
       # @return [Pattern]
       #
       def rand(list, repeats=1)
@@ -83,7 +83,7 @@ module Xi
       #   peek P.xrand([1, 2, 3], 8)       #=> [1, 3, 2, 3, 1, 2, 3, 2]
       #
       # @param list [#each] list of values
-      # @param repeats [Fixnum, Symbol] number or inf (default: 1)
+      # @param repeats [Integer, Symbol] number or inf (default: 1)
       # @return [Pattern]
       #
       def xrand(list, repeats=1)
@@ -109,7 +109,7 @@ module Xi
       #   peek P.shuf([1, 2, 3], 3)       #=> [2, 3, 1, 2, 3, 1, 2, 3, 1]
       #
       # @param list [#each] list of values
-      # @param repeats [Fixnum, Symbol] number or inf (default: 1)
+      # @param repeats [Integer, Symbol] number or inf (default: 1)
       # @return [Pattern]
       #
       def shuf(list, repeats=1)
@@ -137,8 +137,8 @@ module Xi
       #   P.sin(22).duration      #=> (1/1)
       #   P.sin(19, 2).duration   #=> (2/1)
       #
-      # @param quant [Fixnum]
-      # @param delta [Fixnum] (default: 1)
+      # @param quant [Integer]
+      # @param delta [Integer] (default: 1)
       # @return [Pattern]
       #
       def sin(quant, delta=1)
@@ -160,8 +160,8 @@ module Xi
       #   peek P.sin1(8).map { |i| i.round(2) }
       #     #=> [0.5, 0.85, 1.0, 0.85, 0.5, 0.15, 0.0, 0.15]
       #
-      # @param quant [Fixnum]
-      # @param delta [Fixnum] (default: 1)
+      # @param quant [Integer]
+      # @param delta [Integer] (default: 1)
       # @return [Pattern]
       #
       def sin1(quant, delta=1)

data/lib/xi/pattern/transforms.rb

@@ -132,17 +132,17 @@ module Xi
       #   peek [1, 2, 3].p.seq(1, 1)        #=> [2, 3, 1]
       #   peek [1, 2, 3].p.seq(2, 2)        #=> [3, 2, 1, 3, 2, 1]
       #
-      # @param repeats [Fixnum] number (defaut: 1)
-      # @param offset [Fixnum] (default: 0)
+      # @param repeats [Integer] number (defaut: 1)
+      # @param offset [Integer] (default: 0)
       # @return [Pattern]
       #
       def seq(repeats=1, offset=0)
-        unless repeats.is_a?(Fixnum) && repeats >= 0
-          fail ArgumentError, "repeats must be a non-negative Fixnum"
+        unless repeats.is_a?(Integer) && repeats >= 0
+          fail ArgumentError, "repeats must be a non-negative Integer"
         end
 
-        unless offset.is_a?(Fixnum) && offset >= 0
-          fail ArgumentError, "offset must be a non-negative Fixnum"
+        unless offset.is_a?(Integer) && offset >= 0
+          fail ArgumentError, "offset must be a non-negative Integer"
         end
 
         Pattern.new(self, size: size * repeats) do |y|
@@ -362,7 +362,7 @@ module Xi
       #   peek [1, 2, 3].p.rand             #=> [2]
       #   peek [1, 2, 3, 4].p.rand(6)       #=> [1, 3, 2, 2, 4, 3]
       #
-      # @param repeats [Fixnum, Symbol] number or inf (default: 1)
+      # @param repeats [Integer, Symbol] number or inf (default: 1)
       # @return [Pattern]
       #
       def rand(repeats=1)
@@ -378,7 +378,7 @@ module Xi
       #   peek [1, 2, 3, 4, 5].p.xrand    #=> [4]
       #   peek [1, 2, 3].p.xrand(8)       #=> [1, 3, 2, 3, 1, 2, 3, 2]
       #
-      # @param repeats [Fixnum, Symbol] number or inf (default: 1)
+      # @param repeats [Integer, Symbol] number or inf (default: 1)
       # @return [Pattern]
       #
       def xrand(repeats=1)
@@ -394,7 +394,7 @@ module Xi
       #   peek [1, 2, 3, 4, 5].p.xrand    #=> [4]
       #   peek [1, 2, 3].p.xrand(8)       #=> [1, 3, 2, 3, 1, 2, 3, 2]
       #
-      # @param repeats [Fixnum, Symbol] number or inf (default: 1)
+      # @param repeats [Integer, Symbol] number or inf (default: 1)
       # @return [Pattern]
       #
       def shuf(repeats=1)

data/lib/xi/pattern.rb

@@ -59,7 +59,7 @@ module Xi
     #   #     [3,  4, 1, 0]]
     #
     # @param source [Array]
-    # @param size [Fixnum] number of events per iteration
+    # @param size [Integer] number of events per iteration
     # @param delta [Numeric, Array<Numeric>, Pattern<Numeric>] event delta
     # @param metadata [Hash]
     # @yield [yielder, delta] yielder and event delta
@@ -345,7 +345,7 @@ module Xi
 
     # Returns the first +n+ events from the pattern, starting from +cycle+
     #
-    # @param n [Fixnum]
+    # @param n [Integer]
     # @param cycle [Numeric]
     # @return [Array] values
     #
@@ -380,7 +380,7 @@ module Xi
     #
     # @see #take
     #
-    # @param n [Fixnum]
+    # @param n [Integer]
     # @param args same arguments as {#take}
     # @return [Object, Array]
     #
@@ -420,7 +420,7 @@ module Xi
     # pattern size is assumed to be 1, so iteration size depends on delta
     # values.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     #
     def iteration_size
       finite? ? delta_size.lcm(@size) : delta_size

data/lib/xi/supercollider/stream.rb

@@ -0,0 +1,128 @@
+require 'xi/stream'
+require 'xi/osc'
+require 'set'
+
+module Xi::Supercollider
+  class Stream < Xi::Stream
+    include Xi::OSC
+
+    MAX_NODE_ID = 10000
+    DEFAULT_PARAMS = {
+      out:  0,
+      amp:  1.0,
+      pan:  0.0,
+      vel:  127,
+    }
+
+    def initialize(name, clock, server: 'localhost', port: 57110, base_node_id: 2000, **opts)
+      super
+
+      @base_node_id = base_node_id
+      @playing_synths = [].to_set
+      at_exit { free_playing_synths }
+    end
+
+    def set(params)
+      super(gate: params[:gate] || :freq, **params)
+    end
+
+    def stop
+      @mutex.synchronize do
+        @playing_synths.each do |so_id|
+          n_set(node_id(so_id), gate: 0)
+        end
+      end
+      super
+    end
+
+    def free_playing_synths
+      n_free(*@playing_synths.map { |so_id| node_id(so_id) })
+    end
+
+    def node_id(so_id)
+      (@base_node_id + so_id) % MAX_NODE_ID
+    end
+
+    private
+
+    def transform_state
+      super
+
+      @state = DEFAULT_PARAMS.merge(@state)
+
+      if changed_param?(:db) && !changed_param?(:amp)
+        @state[:amp] = @state[:db].db_to_amp
+        @changed_params << :amp
+      end
+
+      if changed_param?(:midinote) && !changed_param?(:freq)
+        @state[:freq] = Array(@state[:midinote]).map(&:midi_to_cps)
+        @changed_params << :freq
+      end
+    end
+
+    def do_gate_on_change(changes)
+      debug "Gate on change: #{changes}"
+
+      name = @state[:s] || :default
+      state_params = @state.reject { |k, _| %i(s).include?(k) }
+
+      freq = Array(state_params[:freq])
+
+      changes.each do |change|
+        at = Time.at(change.fetch(:at))
+
+        change.fetch(:so_ids).each.with_index do |so_id, i|
+          freq_i = freq.size > 0 ? freq[i % freq.size] : nil
+
+          s_new(name, node_id(so_id), **state_params, freq: freq_i, at: at)
+          @playing_synths << so_id
+        end
+      end
+    end
+
+    def do_gate_off_change(changes)
+      debug "Gate off change: #{changes}"
+
+      changes.each do |change|
+        at = Time.at(change.fetch(:at))
+
+        change.fetch(:so_ids).each do |so_id|
+          n_set(node_id(so_id), gate: 0, at: at)
+          @playing_synths.delete(so_id)
+        end
+      end
+    end
+
+    def do_state_change
+      debug "State change: #{changed_state}"
+      @playing_synths.each do |so_id|
+        n_set(node_id(so_id), **changed_state)
+      end
+    end
+
+    def n_set(id, at: Time.now, **args)
+      send_bundle('/n_set', id, *osc_args(args), at: at)
+    end
+
+    def s_new(name, id, add_action: 0, target_id: 1, at: Time.now, **args)
+      send_bundle('/s_new', name.to_s, id.to_i, add_action.to_i,
+                  target_id.to_i, *osc_args(args), at: at)
+    end
+
+    def n_free(*ids, at: Time.now)
+      send_bundle('/n_free', *ids, at: at)
+    end
+
+    def osc_args(**args)
+      args.map { |k, v| [k.to_s, coerce_osc_value(v)] }.flatten(1)
+    end
+
+    def coerce_osc_value(value)
+      v = Array(value).first
+      v = v.to_f if v.is_a?(Rational)
+      v = v.to_i if !v.is_a?(Float) && !v.is_a?(String) && !v.is_a?(Symbol)
+      v
+    end
+  end
+end

data/lib/xi/supercollider/version.rb

@@ -0,0 +1,5 @@
+module Xi
+  module Supercollider
+    VERSION = "0.1.6"
+  end
+end

data/lib/xi/supercollider.rb

@@ -0,0 +1,8 @@
+require "xi/supercollider/version"
+require "xi/supercollider/stream"
+
+module Xi
+  module Supercollider
+    # Your code goes here...
+  end
+end

data/lib/xi/version.rb

@@ -1,3 +1,3 @@
 module Xi
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/synthdefs/other.scd

@@ -0,0 +1,43 @@
+(
+SynthDef(\kick, { |out=0, amp=1, freq=70, attack=0.001, xstart=1, xend=0.25, xdur=0.05, release=0.15, pan=0.5|
+  var sig = SinOsc.ar(freq * XLine.ar(xstart, xend, xdur));
+  var env = EnvGen.ar(Env.perc(attack, release, 1, -4), doneAction: 2);
+  sig = Pan2.ar(sig, pan) * env;
+  sig = (sig * 5).tanh;
+  OffsetOut.ar(out, Pan2.ar(sig * env, pan, amp * 0.25));
+}).add;
+
+SynthDef(\snare, { |out=0, amp=1, freq=1000, freq2=180, attack=0.01, release=0.2, pan=0|
+  var snd1 = WhiteNoise.ar(amp);
+  var snd2 = SinOsc.ar(freq2, 0, amp);
+  var env = Env.perc(attack, release).kr(doneAction: 2);
+  var sum = RHPF.ar(snd1 * env, 2500) + LPF.ar(snd2 * env, 1500);
+  OffsetOut.ar(out, Pan2.ar(sum, pan, amp * 0.1))
+}).add;
+
+SynthDef(\bassy, { |out=0, amp=1, freq=440, hctf=1000, lctf=5000, rq=0.5, attack=0.001, release=1, mul=1, pan=0.5|
+  var sig = Saw.ar(freq);
+  var env = EnvGen.ar(Env.perc(attack, release), doneAction: 2);
+  sig = mul * BHiPass.ar(RLPF.ar(sig, lctf * env, rq), hctf, rq);
+  OffsetOut.ar(out, Pan2.ar(sig * env, pan, amp * 0.1))
+}).add;
+
+SynthDef(\sin, { |out, amp=1, attack=0.001, release=1, sustain=1, pan=0, accelerate=0, freq=440, detune=0.1|
+  var env = EnvGen.ar(Env.perc(attack, release, 1, -4), timeScale: sustain / 2, doneAction: 2);
+  var sound = SinOsc.ar([freq, freq+detune] * Line.kr(1,1+accelerate, sustain));
+  OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp));
+}).add;
+
+SynthDef(\fm, { |out, amp=1, attack=0.001, sustain=1, pan=0, accelerate=0, freq=440, carPartial=1, modPartial=1, index=3, mul=0.1, detune=0.1|
+  var env = EnvGen.ar(Env.perc(attack, 0.999, 1, -3), timeScale: sustain / 2, doneAction: 2);
+  var mod = SinOsc.ar(freq * modPartial * Line.kr(1,1+accelerate, sustain), 0, freq * index * LFNoise1.kr(5.reciprocal).abs);
+  var car = SinOsc.ar(([freq, freq+detune] * carPartial) + mod, 0, mul);
+  OffsetOut.ar(out, Pan2.ar(car * env, pan, amp));
+}).add;
+
+SynthDef(\saw, {|out, amp=1, attack=0.001, sustain=1, pan=0, accelerate=0, freq=440, detune=0.1|
+  var env = EnvGen.ar(Env.perc(attack, 0.999, 1, -4), timeScale: sustain / 2, doneAction: 2);
+  var sound = Saw.ar([freq, freq + detune] * Line.kr(1, 1 + accelerate, sustain));
+  OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp * 0.1));
+}).add;
+)

data/synthdefs/superdirt.scd

@@ -0,0 +1,322 @@
+//
+// The following synth definitions were taken from Superdirt almost as is.
+// Original file at https://github.com/musikinformatik/SuperDirt/blob/bb1536329896e6e211c3bafee7befb06d06fc856/library/default-synths-extra.scd
+//
+// Source code included in this file is licensed under GPL v2.
+// Please refer to LICENSE file at
+// https://github.com/musikinformatik/SuperDirt/blob/master/LICENSE
+//
+
+// Physical modeling of a vibrating string, using a delay line (CombL) excited
+// by an intial pulse (Impulse).  To make it a bit richer, I've combined two
+// slightly detuned delay lines.
+//
+// "accelerate" is used for a pitch glide
+// "sustain" changes the envelope timescale
+(
+  SynthDef(\smandolin, { |out, amp=1, sustain=1, pan=0, accelerate=0, freq=440, detune=0.2|
+    var env = EnvGen.ar(Env.linen(0.002, 0.996, 0.002, 1,-3), timeScale: sustain, doneAction: 2);
+    var sound = Decay.ar(Impulse.ar(0,0,0.1), 0.1 * (freq.cpsmidi) / 69) * WhiteNoise.ar;
+    var pitch = freq * Line.kr(1, 1 + accelerate, sustain);
+    sound = CombL.ar(sound, 0.05, pitch.reciprocal * (1 - (detune/100)), sustain)
+      + CombL.ar(sound, 0.05, pitch.reciprocal * (1 + (detune/100)), sustain);
+    OffsetOut.ar(out, Pan2.ar(sound * env * amp, pan))
+  }).add
+);
+
+// An example of additive synthesis, building up a gong-like noise from a sum
+// of sine-wave harmonics.  Notice how the envelope timescale and amplitude can
+// be scaled as a function of the harmonic frequency.
+// "voice" provides something like a tone knob
+// "decay" adjusts how the harmonics decay as in the other SynthDefs
+// "sustain" affects the overall envelope timescale
+// "accelerate" for pitch glide
+(
+  SynthDef(\sgong, { |out, amp=1, sustain=1, pan=0, accelerate=0, freq=440, voice=0, decay=1|
+    // lowest modes for clamped circular plate
+    var freqlist = [1.000,  2.081,  3.414,  3.893,  4.995,  5.954,  6.819,  8.280,  8.722,  8.882, 10.868, 11.180, 11.754, 13.710, 13.715, 15.057, 15.484, 16.469, 16.817, 18.628] ** 1.0;
+    var tscale = 100.0 / freq / (freqlist ** (2 - clip(decay, 0, 2)));
+    var ascale =freqlist ** clip(voice,0,4);
+    var sound = Mix.arFill(15, { arg i;
+      EnvGen.ar(Env.perc(0.01 * tscale[i], 0.5 * tscale[i], 0.2 * ascale[i]), timeScale: sustain * 5)
+        * SinOsc.ar(freq * freqlist[i] * Line.kr(1, 1 + accelerate, sustain))
+    });
+    OffsetOut.ar(out, Pan2.ar(sound * amp / 15, pan))
+  }).add
+);
+
+// Hooking into a nice synth piano already in Supercollider.
+//
+// Uses the "velocity" parameter to affect how hard the keys are pressed
+// "sustain" controls envelope and decay time.
+(
+  SynthDef(\spiano, { |out, amp=1, sustain=1, pan=0, velocity=1, detune=0.1, muffle=1, stereo=0.2, freq=440|
+    var env = EnvGen.ar(Env.linen(0.002, 0.996, 0.002, 1, -3), timeScale: sustain, doneAction: 2);
+    // the +0.01 to freq is because of edge case rounding internal to the MdaPiano synth
+    var sound = MdaPiano.ar(freq + 0.01, vel: velocity * 100, hard: 0.8 * velocity, decay: 0.1 * sustain,
+      tune: 0.5, random: 0.05, stretch: detune, muffle: 0.8 * muffle, stereo: stereo);
+    OffsetOut.ar(out, Pan2.ar(sound * env * amp * 0.35, pan))
+  }).add
+);
+
+// Waveguide mesh, hexagonal drum-like membrane
+(
+  SynthDef(\shex, { |out, speed=1, sustain=1, pan=0, freq=440, accelerate=0|
+    var env = EnvGen.ar(Env.linen(0.02, 0.96, 0.02, 1,-3), timeScale: sustain, doneAction: 2);
+    var tension = 0.05 * freq / 400 * Line.kr(1, accelerate + 1, sustain);
+    var loss = 1.0 - (0.01 * speed / freq);
+    var sound = MembraneHexagon.ar(Decay.ar(Impulse.ar(0, 0, 1), 0.01), tension, loss);
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan))
+  }).add
+);
+
+// Kick Drum using Rumble-San's implementation as a starting point
+// http://blog.rumblesan.com/post/53271713518/drum-sounds-in-supercollider-part-1
+//
+// "n" controls the kick frequency in a nonstandard way
+// "sustain" affects overall envelope timescale
+// "accelerate" sweeps the click filter freq
+// "pitch1" affects the click frequency
+// "decay" changes the click duration relative to the overall timescale
+(
+  SynthDef(\skick, { |out, sustain=1, pan=0, accelerate=0, n=60, pitch1=1, decay=1, amp=1|
+    var env, sound, dur, clickdur;
+    env = EnvGen.ar(Env.linen(0.01, 0, 0.5, 1, -3), timeScale: sustain, doneAction: 2);
+    sound = SinOsc.ar((n - 25.5).midicps);
+    clickdur = 0.02 * sustain * decay;
+    sound = sound + (LPF.ar(WhiteNoise.ar(1), 1500 * pitch1 * Line.kr(1, 1 + accelerate, clickdur))
+      * Line.ar(1, 0, clickdur));
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp))
+  }).add
+);
+
+// A vaguely 808-ish kick drum
+//
+// "n" controls the chirp frequency
+// "sustain" the overall timescale
+// "speed" the filter sweep speed
+// "voice" the sinewave feedback
+(
+  SynthDef(\s808, { |out, speed=1, sustain=1, pan=0, voice=0, n=60, amp=1|
+    var env, sound, freq;
+    n = ((n>0)*n) + ((n<1)*3);
+    freq = (n*10).midicps;
+    env = EnvGen.ar(Env.linen(0.01, 0, 1, 1, -3), timeScale:sustain, doneAction:2);
+    sound = LPF.ar(SinOscFB.ar(XLine.ar(freq.expexp(10, 2000, 1000, 8000), freq, 0.025/speed), voice), 9000);
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp))
+  }).add
+);
+
+// Hi-hat using Rumble-San's implementation as a starting point
+// http://blog.rumblesan.com/post/53271713518/drum-sounds-in-supercollider-part-1
+//
+// "n" using it in a weird way to provide some variation on the frequency
+// "sustain" affects the overall envelope rate,
+// "accelerate" sweeps the filter
+(
+  SynthDef(\shat, {|out, sustain=1, pan=0, accelerate=0, n=60, amp=1, freq=2000|
+    var env, sound, accel, frq;
+    env = EnvGen.ar(Env.linen(0.01, 0, 0.3, 1, -3), timeScale: sustain, doneAction:2);
+    accel = Line.kr(1, 1+accelerate, 0.2*sustain);
+    frq = freq*accel*(n/5 + 1).wrap(0.5,2);
+    sound = HPF.ar(LPF.ar(WhiteNoise.ar(1), 3*frq), frq);
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp))
+  }).add
+);
+
+// Snare drum using Rumble-San's implementation as a starting point
+// http://blog.rumblesan.com/post/53271713909/drum-sounds-in-supercollider-part-2
+//
+// "n" for some variation on frequency
+// "decay" for scaling noise duration relative to tonal part
+// "sustain" for overall timescale
+// "accelerate" for tonal glide
+(
+  SynthDef(\ssnare, {|out, sustain=1, pan=0, accelerate=0, n=60, decay=1, amp=1|
+    var env, sound, accel;
+    env = EnvGen.ar(Env.linen(0.01, 0, 0.6, 1, -3), timeScale:sustain, doneAction:2);
+    accel = Line.kr(1, 1+accelerate, 0.2);
+    sound = LPF.ar(Pulse.ar(100*accel*(n/5+1).wrap(0.5,2)), Line.ar(1030, 30, 0.2*sustain));
+    sound = sound + (BPF.ar(HPF.ar(WhiteNoise.ar(1), 500), 1500) * Line.ar(1, 0, 0.2*decay));
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp))
+  }).add
+);
+
+// Hand clap using Rumble-San's implementation as a starting point
+// http://blog.rumblesan.com/post/53271713909/drum-sounds-in-supercollider-part-2
+//
+// "delay" controls the echo delay
+// "speed" will affect the decay time
+// "n" changes how spread is calculated
+// "pitch1" will scale the bandpass frequency
+// "sustain" the overall timescale
+(
+  SynthDef(\sclap, {|out, speed=1, sustain=1, pan=0, n=60, delay=1, pitch1=1, amp=1|
+    var env, sound;
+    var spr = 0.005 * delay;
+    env = EnvGen.ar(Env.linen(0.01, 0, 0.6, 1, -3), timeScale:sustain, doneAction:2);
+    sound = BPF.ar(LPF.ar(WhiteNoise.ar(1), 7500*pitch1), 1500*pitch1);
+    sound = Mix.arFill(4, {arg i; sound * 0.5 * EnvGen.ar(Env.new([0,0,1,0],[spr*(i**(n.clip(0,5)+1)),0,0.04/speed]))});
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp))
+  }).add
+);
+
+// A controllable synth siren, defaults to 1 second, draw it out with "sustain"
+(
+  SynthDef(\ssiren, {|out, sustain=1, pan=0, freq=440, amp=1|
+    var env, sound;
+    env = EnvGen.ar(Env.linen(0.05, 0.9, 0.05, 1, -2), timeScale:sustain, doneAction:2);
+    sound = VarSaw.ar(freq * (1.0 + EnvGen.kr(Env.linen(0.25,0.5,0.25,3,0), timeScale:sustain, doneAction:2)),
+      0, width:Line.kr(0.05,1,sustain));
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp))
+  }).add
+);
+
+// The next four synths respond to the following parameters in addition to
+// gain, pan, n, and all the "effect" parameters (including attack, hold, and
+// release).  Default values in parentheses.
+//
+// sustain - scales overall duration
+// decay(0) - amount of decay after initial attack
+// accelerate(0) - pitch glide
+// semitone(12) - how far off in pitch the secondary oscillator is (need not be integer)
+// pitch1(1) - filter frequency scaling multiplier, the frequency itself follows the pitch set by "n"
+// speed(1)- LFO rate
+// lfo(1) - how much the LFO affects the filter frequency
+// resonance(0.2) - filter resonance
+// voice(0.5) - depends on the individual synth
+
+// A moog-inspired square-wave synth; variable-width pulses with filter
+// frequency modulated by an LFO
+//
+// "voice" controls the pulse width (exactly zero or one will make no sound)
+(
+  SynthDef(\ssquare, {|out, speed=1, decay=0, sustain=1, pan=0, accelerate=0, freq=440,
+    voice=0.5, semitone=12, resonance=0.2, lfo=1, pitch1=1, amp=1|
+    var env = EnvGen.ar(Env.pairs([[0,0],[0.05,1],[0.2,1-decay],[0.95,1-decay],[1,0]], -3), timeScale:sustain, doneAction:2);
+    var basefreq = freq* Line.kr(1, 1+accelerate, sustain);
+    var basefreq2 = basefreq / (2**(semitone/12));
+    var lfof1 = min(basefreq*10*pitch1, 22000);
+    var lfof2 = min(lfof1 * (lfo + 1), 22000);
+    var sound = (0.7 * Pulse.ar(basefreq, voice)) + (0.3 * Pulse.ar(basefreq2, voice));
+    sound = MoogFF.ar(
+      sound,
+      SinOsc.ar(basefreq/64*speed, 0).range(lfof1,lfof2),
+      resonance*4);
+    sound = sound.tanh * 2;
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp));
+  }).add
+);
+
+// A moog-inspired sawtooth synth; slightly detuned saws with triangle
+// harmonics, filter frequency modulated by LFO
+//
+// "voice" controls a relative phase and detune amount
+(
+  SynthDef(\ssaw, {|out, speed=1, decay=0, sustain=1, pan=0, accelerate=0, freq=440,
+    voice=0.5, semitone=12, resonance=0.2, lfo=1, pitch1=1, amp=1|
+    var env = EnvGen.ar(Env.pairs([[0,0],[0.05,1],[0.2,1-decay],[0.95,1-decay],[1,0]], -3), timeScale:sustain, doneAction:2);
+    var basefreq = freq * Line.kr(1, 1+accelerate, sustain);
+    var basefreq2 = basefreq * (2**(semitone/12));
+    var lfof1 = min(basefreq*10*pitch1, 22000);
+    var lfof2 = min(lfof1 * (lfo + 1), 22000);
+    var sound = MoogFF.ar(
+      (0.5 * Mix.arFill(3, {|i|  SawDPW.ar(basefreq * ((i-1)*voice/50+1), 0)})) + (0.5 * LFTri.ar(basefreq2, voice)),
+      LFTri.ar(basefreq/64*speed, 0.5).range(lfof1,lfof2),
+      resonance*4);
+    sound = sound.tanh*2;
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp));
+  }).add
+);
+
+// A moog-inspired PWM synth; pulses multiplied by phase-shifted pulses, double
+// filtering with an envelope on the second.
+//
+// "voice" controls the phase shift rate
+(
+  SynthDef(\spwm, {|out, speed=1, decay=0, sustain=1, pan=0, accelerate=0, freq=440,
+    voice=0.5, semitone=12, resonance=0.2, lfo=1, pitch1=1, amp=1|
+    var env = EnvGen.ar(Env.pairs([[0,0],[0.05,1],[0.2,1-decay],[0.95,1-decay],[1,0]], -3), timeScale:sustain, doneAction:2);
+    var env2 = EnvGen.ar(Env.pairs([[0,0.1],[0.1,1],[0.4,0.5],[0.9,0.2],[1,0.2]], -3), timeScale:sustain/speed);
+    var basefreq = freq * Line.kr(1, 1+accelerate, sustain);
+    var basefreq2 = basefreq / (2**(semitone/12));
+    var lfof1 = min(basefreq*10*pitch1, 22000);
+    var lfof2 = min(lfof1 * (lfo + 1), 22000);
+    var sound = 0.7 * PulseDPW.ar(basefreq) * DelayC.ar(PulseDPW.ar(basefreq), 0.2, Line.kr(0,voice,sustain)/basefreq);
+    sound = 0.3 * PulseDPW.ar(basefreq2) * DelayC.ar(PulseDPW.ar(basefreq2), 0.2, Line.kr(0.1,0.1+voice,sustain)/basefreq) + sound;
+    sound = MoogFF.ar(sound, SinOsc.ar(basefreq/32*speed, 0).range(lfof1,lfof2), resonance*4);
+    sound = MoogFF.ar(sound, min(env2*lfof2*1.1, 22000), 3);
+    sound = sound.tanh*5;
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp));
+  }).add
+);
+
+// This synth is inherently stereo, so handles the "pan" parameter itself and
+// tells SuperDirt not to mix down to mono.
+//
+// "voice" scales the comparator frequencies, higher values will sound "breathier"
+(
+  SynthDef(\scomparator, {|out, speed=1, decay=0, sustain=1, pan=0, accelerate=0, freq=440,
+    voice=0.5, resonance=0.5, lfo=1, pitch1=1, amp=1|
+    var env = EnvGen.ar(Env.pairs([[0,0],[0.05,1],[0.2,1-decay],[0.95,1-decay],[1,0]], -3), timeScale:sustain, doneAction:2);
+    var basefreq = freq * Line.kr(1, 1+accelerate, sustain);
+    var sound = VarSaw.ar(basefreq, 0, Line.ar(0,1,sustain));
+    var freqlist =[ 1.000, 2.188,  5.091,  8.529,  8.950,  9.305, 13.746, 14.653, 19.462, 22.003, 24.888, 25.991,
+      26.085, 30.509, 33.608, 35.081, 40.125, 42.023, 46.527, 49.481]**(voice/5);
+    sound = Splay.arFill(16, {|i| sound > LFTri.ar(freqlist[i])}, 1);
+    sound = MoogFF.ar(
+      sound,
+      pitch1 * 4 * basefreq + SinOsc.ar(basefreq/64*speed, 0, lfo*basefreq/2) + LFNoise2.ar(1,lfo*basefreq),
+      LFNoise2.ar(0,0.1,4*resonance));
+    sound = 0.5 * Balance2.ar(sound[0], sound[1], pan*2-1);
+    OffsetOut.ar(out, Pan2.ar(sound * env, 0.5, amp));
+  }).add
+);
+
+// Uses the Atari ST emulation UGen with 3 oscillators
+//
+// "slide" is for a linear frequency glide that will repeat "speed" times (can
+// be fractional or negative).
+// "accelerate" is for an overall glide
+// "pitch2" and "pitch3" control the ratio of harmonics
+// "voice" causes variations in the levels of the 3 oscillators
+(
+  SynthDef(\schip, {|out, sustain=1, pan=0, freq=440, speed=1, slide=0, pitch2=2, pitch3=3, accelerate=0, voice=0, amp=1|
+    var env, basefreq, sound, va, vb, vc;
+    env = EnvGen.ar(Env.linen(0.01, 0.98, 0.01,1,-1), timeScale:sustain, doneAction:2);
+    basefreq = freq + wrap2(slide * 100 * Line.kr(-1,1+(2*speed-2),sustain), slide * 100);
+    basefreq = basefreq * Line.kr(1, accelerate+1, sustain);
+    va = (voice < 0.5) * 15;
+    vb = ((2*voice) % 1 < 0.5) * 15;
+    vc = ((4*voice) % 1 < 0.5) * 15;
+    sound= AY.ar( AY.freqtotone(basefreq), AY.freqtotone(pitch2*basefreq), AY.freqtotone(pitch3*basefreq),
+      vola:va, volb:vb, volc:vc)/2;
+    sound = tanh(sound)*2;
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp));
+  }).add
+);
+
+// Digital noise in several flavors with a bandpass filter
+//
+// "voice" at 0 is a digital noise for which "n" controls rate, at 1 is
+// Brown+White noise for which "n" controls knee frequency.
+// "accelerate" causes glide in n, "speed" will cause it to repeat
+// "pitch1" scales the bandpass frequency (which tracks "n")
+// "slide" works like accelerate on the bandpass
+// "resonance" is the filter resonance
+(
+  SynthDef(\snoise, {|out, sustain=1, pan=0, freq=440, accelerate=0, slide=0, pitch1=1, speed=1, resonance=0, voice=0, amp=1|
+    var env, basefreq, sound, ffreq, acc;
+    env = EnvGen.ar(Env.linen(0.01, 0.98, 0.01,1,-1), timeScale:sustain, doneAction:2);
+    acc = accelerate * freq * 4;
+    basefreq = freq * 8 + wrap2(acc* Line.kr(-1,1+(2*speed-2), sustain), acc);
+    ffreq = basefreq*5*pitch1* Line.kr(1,1+slide, sustain);
+    ffreq = clip(ffreq, 60,20000);
+    sound = XFade2.ar( LFDNoise0.ar(basefreq.min(22000), 0.5),
+      XFade2.ar(BrownNoise.ar(0.5), WhiteNoise.ar(0.5), basefreq.cpsmidi/127),
+      2*voice-1);
+    sound = HPF.ar(BMoog.ar(sound, ffreq, resonance, 3), 20);
+    sound = clip(sound, -1,1) * 0.3;
+    OffsetOut.ar(out, Pan2.ar(sound * env, pan, amp));
+  }).add
+);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xi-lang
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Damián Silvani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,13 +134,15 @@ files:
 - lib/xi/core_ext/array.rb
 - lib/xi/core_ext/enumerable.rb
 - lib/xi/core_ext/enumerator.rb
-- lib/xi/core_ext/fixnum.rb
+- lib/xi/core_ext/integer.rb
 - lib/xi/core_ext/numeric.rb
 - lib/xi/core_ext/object.rb
 - lib/xi/core_ext/scalar.rb
 - lib/xi/core_ext/string.rb
 - lib/xi/error_log.rb
 - lib/xi/logger.rb
+- lib/xi/osc.rb
+- lib/xi/osc/version.rb
 - lib/xi/pattern.rb
 - lib/xi/pattern/generators.rb
 - lib/xi/pattern/transforms.rb
@@ -148,8 +150,13 @@ files:
 - lib/xi/scale.rb
 - lib/xi/step_sequencer.rb
 - lib/xi/stream.rb
+- lib/xi/supercollider.rb
+- lib/xi/supercollider/stream.rb
+- lib/xi/supercollider/version.rb
 - lib/xi/tidal_clock.rb
 - lib/xi/version.rb
+- synthdefs/other.scd
+- synthdefs/superdirt.scd
 - xi.gemspec
 homepage: https://github.com/xi-livecode/xi
 licenses:
@@ -170,8 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Musical pattern language for livecoding

data/lib/xi/core_ext/fixnum.rb

@@ -1,17 +0,0 @@
-module Xi::CoreExt
-  module Fixnum
-    def /(o)
-      super(o.to_r)
-    end
-  end
-end
-
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4')
-  class Fixnum
-    prepend Xi::CoreExt::Fixnum
-  end
-else
-  class Integer
-    prepend Xi::CoreExt::Fixnum
-  end
-end