patchmaster 0.0.0 → 0.0.1

data/lib/patchmaster/song.rb

@@ -1,6 +1,3 @@
-require 'patchmaster/list'
-require 'patchmaster/list_container'
-
 module PM
 
 # A Song is a named list of Patches with a cursor.
@@ -8,11 +5,9 @@ class Song
 
   attr_accessor :name, :patches
 
-  include ListContainer
-
   def initialize(name)
     @name = name
-    @patches = List.new
+    @patches = []
     PatchMaster.instance.all_songs << self
   end
 

data/lib/patchmaster/song_list.rb

@@ -1,6 +1,3 @@
-require 'patchmaster/list'
-require 'patchmaster/list_container'
-
 module PM
 
 # A SongList is a list of Songs with a cursor.
@@ -8,11 +5,9 @@ class SongList
 
   attr_accessor :name, :songs
 
-  include ListContainer
-
   def initialize(name)
     @name = name
-    @songs = List.new
+    @songs = []
   end
 
   def <<(song)
@@ -30,10 +25,5 @@ class SongList
   %w(first prev curr next last).each do |dir|
     instance_eval("def #{dir}_patch; @songs.curr.#{dir}_patch; end")
   end
-
-  # Called when moving out of this song list to another
-  def stop_current_song
-    @songs.stop_current
-  end
 end
 end

data/lib/patchmaster/sorted_song_list.rb

@@ -5,7 +5,7 @@ class SortedSongList < SongList
   def <<(song)
     next_song_after = @songs.detect { |s| s.name > song.name }
     if next_song_after
-      @songs.insert_before(next_song_after, song)
+      @songs.insert(@songs.index(next_song_after), song)
     else
       super(song)
     end

data/lib/patchmaster/trigger.rb

@@ -0,0 +1,32 @@
+module PM
+
+# A Trigger performs an action when it sees a particular array of bytes.
+# Instruments have zero or more triggers. The action is a symbol that gets
+# sent to PM::PatchMaster.
+#
+# Since we want to save them to files, we store the text representation as
+# well.
+class Trigger
+
+  attr_accessor :bytes, :block, :text
+
+  def initialize(bytes, block)
+    @bytes, @block = bytes, block
+  end
+
+  def method_missing(sym, *args)
+    PM::PatchMaster.instance.send(sym, *args)
+  end
+
+  # If +bytes+ matches our +@bytes+ array then run +@block+.
+  def signal(bytes)
+    if bytes == @bytes
+      block.call
+    end
+  end
+
+  def to_s
+    "#{@bytes.inspect} => #{@text ? @text.gsub(/\n\s*/, '; ') : ''}"
+  end
+end
+end

data/test/test_helper.rb

@@ -1,23 +1,40 @@
 require 'test/unit'
 require 'patchmaster'
+require 'midi-eye'
 
 # For all tests, make sure mock I/O MIDI ports are used.
 PM::PatchMaster.instance.no_midi!
 
 module PM
 
-# To help with testing, we replace MockInputPort#gets_data and
+# To help with testing, we replace MockInputPort#gets and
 # MockOutputPort#puts with versions that send what we want and save what is
 # received.
 class MockInputPort
 
   attr_accessor :data_to_send
+    
+  # For MIDIEye::Listener
+  def self.is_compatible?(input)
+    true
+  end
+
+  def initialize(_=nil)
+    @t0 = (Time.now.to_f * 1000).to_i
+  end
 
-  def gets_data
+  def gets
     retval = @data_to_send || []
     @data_to_send = []
-    retval
+    [{:data => retval, :timestamp => (Time.now.to_f * 1000).to_i - @t0}]
   end
+    
+  def poll
+    yield gets
+  end
+
+  # add this class to the Listener class' known input types
+  MIDIEye::Listener.input_types << self 
 end
 
 class MockOutputPort
@@ -43,16 +60,7 @@ class TestConnection < PM::Connection
   def midi_in(bytes)
     @bytes_received ||= []
     @bytes_received += bytes
-    midi_out(@output, bytes)
+    midi_out(bytes)
   end
 
 end
-
-class PMTest < Test::Unit::TestCase
-
-  # Data comes out of UniMIDI::Input#gets_ata as an array of arrays of MIDI
-  # bytes.
-  def midi_data(*bytes)
-    [bytes]
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patchmaster
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unimidi
-  requirement: &2151875240 !ruby/object:Gem::Requirement
+  requirement: &2156042580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151875240
+  version_requirements: *2156042580
 description: ! 'PatchMaster is realtime MIDI performance software that alloweds a
   musician
 
@@ -44,19 +44,20 @@ files:
 - lib/patchmaster/app/patch_window.rb
 - lib/patchmaster/app/pm_window.rb
 - lib/patchmaster/app/prompt_window.rb
+- lib/patchmaster/app/trigger_window.rb
 - lib/patchmaster/connection.rb
 - lib/patchmaster/consts.rb
+- lib/patchmaster/cursor.rb
 - lib/patchmaster/dsl.rb
 - lib/patchmaster/filter.rb
-- lib/patchmaster/io.rb
-- lib/patchmaster/list.rb
-- lib/patchmaster/list_container.rb
+- lib/patchmaster/instrument.rb
 - lib/patchmaster/patch.rb
 - lib/patchmaster/patchmaster.rb
 - lib/patchmaster/predicates.rb
 - lib/patchmaster/song.rb
 - lib/patchmaster/song_list.rb
 - lib/patchmaster/sorted_song_list.rb
+- lib/patchmaster/trigger.rb
 - lib/patchmaster.rb
 - test/test_helper.rb
 homepage: https://github.com/jimm/patchmaster

data/lib/patchmaster/list.rb

@@ -1,121 +0,0 @@
-module PM
-
-# A list (Array) of things with a cursor. +@curr+ is an integer index into
-# an array of data.
-class List
-
-  include Enumerable
-
-  # If +enter_sym+ or +exit_sym+ are defined, they will be sent to a data
-  # element when it becomes the current element or stops being the current
-  # element.
-  def initialize
-    @data = []
-    @curr = nil
-  end
-
-  # Adding data does not modify the cursor.
-  def <<(data)
-    @data << data
-  end
-
-  # Inserts +data+ before +before_this+. If +before_this+ is not in our
-  # list, +data+ is inserted at the beginning of the list.
-  def insert_before(before_this, data)
-    idx = @data.index(before_this) || 0
-    @data[idx, 0] = data
-  end
-
-  # Inserts +data+ after +after_this+. If +after_this+ is not in our list,
-  # +data+ is inserted at the end of the list.
-  def insert_after(after_this, data)
-    idx = @data.index(after_this) || @data.length-1
-    @data[idx + 1, 0] = data
-  end
-
-  def size
-    @data.size
-  end
-  alias_method :length, :size
-
-  def first?
-    @curr == 0
-  end
-
-  def first
-    if !@data.empty? && @curr != 0
-      @curr = 0
-    end
-    curr
-  end
-
-  def next
-    if @curr == nil || @curr >= @data.length - 1
-      @curr = nil
-    else
-      @curr += 1
-    end
-    curr
-  end
-
-  def curr
-    @curr ? @data[@curr] : nil
-  end
-
-  # This does not change what is stored at the current location. Rather,
-  # it moves this list's cursor to point to +data+ and returns +data+.
-  def curr=(data)
-    if curr != data
-      @curr = @data.index(data)
-    end
-    data
-  end
-
-  # Returns the +n+th data element. This method is not normally used to
-  # access data because it does not change the cursor. It is used to peek
-  # into the list's data array, for example during testing.
-  def [](n)
-    @data[n]
-  end
-
-  def prev
-    if @curr == nil || @curr == 0
-      @curr = nil
-    else
-      @curr -= 1
-    end
-    curr
-  end
-
-  def last
-    if !@data.empty? && !last?
-      @curr = @data.length - 1
-    end
-    curr
-  end
-
-  def last?
-    @curr == nil || @curr == @data.length - 1
-  end
-
-  def remove(data)
-    return unless @data.include?(data)
-    @data[@data.index(data), 1] = []
-    if @data.empty?
-      @curr = nil
-    elsif @curr >= @data.length
-      @curr = @data.length - 1
-    end
-  end
-
-  def each
-    @data.each { |data| yield data }
-  end
-
-  # For debugging
-  def to_s
-    "List(#{@data.empty? ? 'empty' : @data[0].class.name}), size #{size}, curr index #{@curr}"
-  end
-
-end
-end

data/lib/patchmaster/list_container.rb

@@ -1,36 +0,0 @@
-module PM
-
-# A ListContainer responds to messages that manipulate the cursors for one
-# or more List objects.
-module ListContainer
-
-  def method_missing(sym, *args)
-    case sym.to_s
-    when /^curr_(\w+)=$/
-      name = $1
-      ivar_sym = "@#{pluralize(name)}".to_sym
-      raise "no such ivar #{ivar_sym} in #{self.class}" unless instance_variable_defined?(ivar_sym)
-      instance_variable_get(ivar_sym).send(:curr=, args[0])
-    when /^(first|next|prev|curr|last)_(\w+)(\?)?$/
-      method, ivar, qmark = $1, $2, $3
-      ivar_sym = "@#{pluralize(ivar)}".to_sym
-      raise "no such ivar #{ivar_sym} in #{self.class}" unless instance_variable_defined?(ivar_sym)
-      instance_variable_get(ivar_sym).send("#{method}#{qmark}".to_sym)
-    else
-      super
-    end
-  end
-
-  def pluralize(str)
-    case str
-    when /s$/, /ch$/
-      "#{str}es"
-    when /y$/
-      "#{str[0..-2]}ies}"
-    else
-      "#{str}s"
-    end
-  end
-
-end
-end