xi-midi 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0054fce720de93807aaae4f8a831e8f6630ff2d
-  data.tar.gz: 86b5f9503158cb98d54055315c899014055097bf
+  metadata.gz: e744c9b11148667886a22d33a97854d6965dfd82
+  data.tar.gz: 98ae2827a7f5ae07629f254a706aa7fc7cf72b0d
 SHA512:
-  metadata.gz: 6c5e72413f734805515921452edbd9ddaad362a4f086b7191ccba87575858e47c092a4fb52ed09149fc5e545edd42a29afc7477e77d0751a428411bd76ae813b
-  data.tar.gz: 46eee9088db90c41ab27e075b924a2bd89668cf2d1fee12152505384dbda6ac4e23fc3e63224845dcb231f248066af38cf37fa5d5e8321acd00a211be537102e
+  metadata.gz: 7ec2b45575d310e0cd2d9d748155c885bb410ab3196a762f8227bf6694967faa05e80c462a84b546b329384d92c6a54a0df8289df3097bfb1e6537663e9b2509
+  data.tar.gz: ec55b9d6864031e17007b7d908b82958d728d87f3f4c43b980587d22ba8d55bd6149c33e5b05d8622007464cff0b8d74ee184f0986638f1f2bdb48f2b40ba158

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in xi-midi.gemspec
 gemspec
-
-gem 'rawmidi', git: 'https://github.com/munshkr/rawmidi-ruby'

data/lib/xi/midi.rb

@@ -5,4 +5,6 @@ module Xi
   module MIDI
     # Your code goes here...
   end
+
+  Midi = MIDI
 end

data/lib/xi/midi/proxy.rb

@@ -73,13 +73,8 @@ module Xi::MIDI
     def send_bytes(device, *bytes)
       return unless open?(device)
 
-      logger.debug([:send_bytes, device, bytes].join(', '))
+      debug(:send_bytes, device, bytes)
       @mutex.synchronize { @outputs[device].write(bytes) }
     end
-
-    def logger
-      # FIXME this should be configurable
-      @logger ||= Logger.new("/tmp/xi.log")
-    end
   end
 end

data/lib/xi/midi/stream.rb

@@ -2,23 +2,22 @@ require 'xi/stream'
 require 'xi/midi/proxy'
 
 module Xi::MIDI
-  class Stream < ::Stream
+  class Stream < Xi::Stream
     attr_accessor :device, :channel
 
-    def initialize(clock, device: 0, channel: 0)
-      super(clock)
+    def initialize(name, clock, device: 0, channel: 0)
+      super
 
       @device = device
       @channel = channel
       @playing_notes = {}
 
-      midi.open(device)
+      midi.open(device) unless midi.open?(device)
       at_exit { kill_playing_notes }
     end
 
     def set(**params)
-      params[:gate] = :midinote
-      super(params)
+      super(gate: :midinote, **params)
     end
 
     def stop
@@ -37,38 +36,47 @@ module Xi::MIDI
       end
     end
 
-    def do_gate_on_change(so_ids)
+    def do_gate_on_change(changes)
+      debug "Gate on change: #{changes}"
+
       channel = Array(@state[:channel] || 0)
       midinote = Array(@state[:midinote] || 60)
       velocity = Array(@state[:velocity] || 127)
 
-      so_ids.each.with_index do |so_id, i|
-        channel_i = channel[i % channel.size]
-        midinote_i = midinote[i % midinote.size]
-        velocity_i = velocity[i % velocity.size]
+      changes.each do |change|
+        change.fetch(:so_ids).each.with_index do |so_id, i|
+          channel_i = channel[i % channel.size]
+          midinote_i = midinote[i % midinote.size]
+          velocity_i = velocity[i % velocity.size]
 
-        logger.info "MIDI Note on: #{[channel_i, midinote_i, velocity_i]}"
-        midi.note_on(@device, channel_i, midinote_i, velocity_i)
+          debug "MIDI Note on: #{[channel_i, midinote_i, velocity_i]}"
+          midi.note_on(@device, channel_i, midinote_i, velocity_i)
 
-        @playing_notes[so_id] = {channel: channel_i, midinote: midinote_i}
+          @playing_notes[so_id] = {channel: channel_i, midinote: midinote_i}
+        end
       end
     end
 
-    def do_gate_off_change(so_ids)
-      so_ids.each do |so_id|
-        note = @playing_notes.delete(so_id)
-        if note
-          logger.info "MIDI Note off: #{[note[:channel], note[:midinote]]}"
-          midi.note_off(@device, note[:channel], note[:midinote])
+    def do_gate_off_change(changes)
+      debug "Gate off change: #{changes}"
+
+      changes.each do |change|
+        change.fetch(:so_ids).each do |so_id|
+          note = @playing_notes.delete(so_id)
+          if note
+            debug "MIDI Note off: #{[note[:channel], note[:midinote]]}"
+            midi.note_off(@device, note[:channel], note[:midinote])
+          end
         end
       end
     end
 
     def do_state_change
-      logger.info changed_state
-      changed_state.each do |p, v|
+      debug "State change: #{changed_state}"
+
+      changed_state.each do |p, vs|
         cc_id = cc_parameters[p]
-        midi.cc(@device, channel, cc_id, v) if cc_id
+        Array(vs).each { |v| midi.cc(@device, channel, cc_id, v.to_i) } if cc_id
       end
     end
 
@@ -80,5 +88,9 @@ module Xi::MIDI
     def midi
       Proxy.instance
     end
+
+    def latency_sec
+      0.01
+    end
   end
 end

data/lib/xi/midi/version.rb

@@ -1,5 +1,5 @@
 module Xi
   module MIDI
-    VERSION = "0.1.0"
+    VERSION = "0.1.3"
   end
 end

data/lib/xi/midi/volca_bass.rb

@@ -0,0 +1,22 @@
+module Xi::MIDI
+  module VolcaBass
+    CC = {
+      slide: 5,
+      expression: 11,
+      octave: 40,
+      lforate: 41,
+      lfoint: 42,
+      pitch1: 43,
+      pitch2: 44,
+      pitch3: 45,
+      attack: 46,
+      decay: 47,
+      cutoffegint: 48,
+      bgate: 49
+    }
+
+    def cc_parameters
+      CC
+    end
+  end
+end

data/lib/xi/midi/volca_beats.rb

@@ -0,0 +1,52 @@
+module Xi::MIDI
+  module VolcaBeats
+    CC = {
+      lKick: 40,
+      lSnare: 41,
+      lLoTom: 42,
+      lHiTom: 43,
+      lClHat: 44,
+      lOpHat: 45,
+      lClap: 46,
+      lClaves: 47,
+      lAgogo: 48,
+      lCrash: 49,
+      sClap: 50,
+      sClaves: 51,
+      sAgogo: 52,
+      sCrash: 53,
+      stutterTime: 54,
+      stutterDepth: 55,
+      tomDecay: 56,
+      clHatDecay: 57,
+      opHatDecay: 58,
+      hatGrain: 59,
+    }
+
+    DRUMS = {
+      bd: 36,
+      sn: 38,
+      lt: 43,
+      ht: 50,
+      ch: 42,
+      oh: 46,
+      cp: 39,
+      cl: 75,
+      ag: 67,
+      cr: 49,
+    }
+
+    def cc_parameters
+      CC
+    end
+
+    def transform_state
+      super
+
+      if !changed_param?(:midinote) && changed_param?(:drum)
+        @state[:midinote] = Array(@state[:drum]).map { |n| DRUMS[n.to_sym] }.compact
+        @changed_params << :midinote
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xi-midi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Damián Silvani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,8 @@ files:
 - lib/xi/midi/proxy.rb
 - lib/xi/midi/stream.rb
 - lib/xi/midi/version.rb
+- lib/xi/midi/volca_bass.rb
+- lib/xi/midi/volca_beats.rb
 - lib/xi/midi/volca_keys.rb
 - xi-midi.gemspec
 homepage: https://github.com/xi-livecode/xi-midi