patchmaster 1.0.0 → 1.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3c68fa48a4f24f2e5b415950ca74445e84a63961
+  data.tar.gz: 2d359863417126a8e63eb401ccabe58727687b0e
+SHA512:
+  metadata.gz: f79589d65c03ea1e0f6371ce149b0d5fff3c2d4b7f725f55afb9aa093f0813efefdd28a4276a370c263c39a618ddd7bb684fce49a76b0c6919a14f4904bb9c2a
+  data.tar.gz: 289d7ab401a04bf15cde5041cc4ce636e22893c6172d96142c116a5c655657cc0cf07df0f0d21a4a09823a0a15ada583c78143764d7e28bff728485428228cb8

data/bin/irb_init.rb

@@ -0,0 +1,17 @@
+# Set IRB prompt
+IRB.conf[:PROMPT][:CUSTOM] = {
+  :PROMPT_I=>"PatchMaster:%03n:%i> ",
+  :PROMPT_N=>"PatchMaster:%03n:%i> ",
+  :PROMPT_S=>"PatchMaster:%03n:%i%l ",
+  :PROMPT_C=>"PatchMaster:%03n:%i* ",
+  :RETURN=>"=> %s\n"
+}
+IRB.conf[:PROMPT_MODE] = :CUSTOM
+
+# Load ./.patchmasterrc or $HOME/.patchmasterrc
+rc_file = File.join('.', '.patchmasterrc')
+rc_file = File.join(ENV['HOME'], '.patchmasterrc') unless File.exist?(rc_file)
+load(rc_file) if File.exist?(rc_file)
+
+puts 'PatchMaster loaded'
+puts 'Type "pm_help" for help'

data/bin/patchmaster

@@ -1,28 +1,25 @@
 #!/usr/bin/env ruby
 #
-# usage: patchmaster [-n] [-i] [-w] [-p port] [-t] [-d] [pm_file]
+# usage: patchmaster [-v] [-n] [-i] [-w] [-p port] [-d] [pm_file]
 #
 # Starts PatchMaster and optionally loads pm_file.
 #
+# -v outputs the version number and exits.
+#
 # The -n flag tells PatchMaster to not use MIDI. All MIDI errors such as not
 # being able to connect to the MIDI instruments specified in pm_file are
 # ignored, and no MIDI data is sent/received. That is useful if you want to
 # run PatchMaster without actually talking to any MIDI instruments.
 #
-# To run PatchMaster from within an IRB session use -i. See the
+# To run PatchMaster from within an IRB session use -i. Reads
+# ./.patchmasterrc if it exists, $HOME/.patchmasterrc if not. See the
 # documentation for details on the commands that are available.
 #
 # To run PatchMaster using a Web browser GUI use -w and point your browser
 # at http://localhost:4567. To change the port, use -p.
 #
-# To run PatchMaster without a GUI use -t. All output will go to the
-# console. The app will run until interrupted. (If you do this, you might
-# want to create a trigger that calls `panic', because you won't be able to
-# use the computer keyboard to do that.)
-#
-# The =-d= flag turns on debug mode. The app becomes slightly more verbose
-# and logs everything to `/tmp/pm_debug.txt'.
-
+# The -d flag turns on debug mode. The app becomes slightly more verbose and
+# logs everything to `/tmp/pm_debug.txt'.
 
 require 'optparse'
 
@@ -36,7 +33,12 @@ OptionParser.new do |opts|
   opts.on("-i", "--irb", "Use an IRB console") { gui = :irb }
   opts.on("-w", "--web", "Use a Web browser GUI") { gui = :web }
   opts.on("-p", "--port PORT", "Web browser GUI port number") { |opt| port = opt.to_i }
-  opts.on("-t", "--text", "--nw", "--no-window", "No windows") { gui = :text }
+  opts.on("-v", "--version", "Show version number and exit") do
+    version_line = IO.readlines(File.join(File.dirname(__FILE__), '../Rakefile')).grep(/GEM_VERSION\s*=/).first
+    version_line =~ /(\d+\.\d+\.\d+)/
+    puts "patchmaster #{$1}"
+    exit 0
+  end
   opts.on_tail("-h", "-?", "--help", "Show this message") do
     puts opts
     exit 0
@@ -56,8 +58,8 @@ when :curses
   pm.gui = PM::Main.instance
   pm.run
 when :irb
-  require 'patchmaster/irb'
-  start_patchmaster_irb
+  require 'patchmaster/irb/irb'
+  start_patchmaster_irb(File.join(File.dirname(__FILE__), 'irb_init.rb'))
 when :web
   require 'patchmaster/web/sinatra_app'
   app = PM::SinatraApp.instance

data/lib/patchmaster/connection.rb

@@ -18,7 +18,7 @@ class Connection
   # turned into 0-based channels for later use.
   def initialize(input, input_chan, output, output_chan, filter=nil, opts={})
     @input, @input_chan, @output, @output_chan, @filter = input, input_chan, output, output_chan, filter
-    @pc_prog, @zone, @xpose = opts[:pc_prog], opts[:zone], opts[:xpose]
+    @bank, @pc_prog, @zone, @xpose = opts[:bank], opts[:pc_prog], opts[:zone], opts[:xpose]
 
     @input_chan -= 1 if @input_chan
     @output_chan -= 1 if @output_chan
@@ -27,7 +27,8 @@ class Connection
   def start(start_bytes=nil)
     bytes = []
     bytes += start_bytes if start_bytes
-    bytes += [CC_BANK_SELECT + @output_chan, @bank] if @bank
+    # Bank select uses MSB if we're only sending one byte
+    bytes += [CONTROLLER + @output_chan, CC_BANK_SELECT+32, @bank] if @bank
     bytes += [PROGRAM_CHANGE + @output_chan, @pc_prog] if @pc_prog
     midi_out(bytes) unless bytes.empty?
     @input.add_connection(self)
@@ -50,21 +51,50 @@ class Connection
     @zone == nil || @zone.include?(note)
   end
 
+  # The workhorse. Ignore bytes that aren't from our input, or are outside
+  # the zone. Change to output channel. Filter.
+  #
+  # Note that running bytes are not handled, but unimidi doesn't seem to use
+  # them anyway.
+  #
+  # Finally, we go through gyrations to avoid duping bytes unless they are
+  # actually modified in some way.
   def midi_in(bytes)
     return unless accept_from_input?(bytes)
 
-    # TODO handle running bytes if needed
+    bytes_duped = false
+
     high_nibble = bytes.high_nibble
     case high_nibble
     when NOTE_ON, NOTE_OFF, POLY_PRESSURE
       return unless inside_zone?(bytes[1])
+
+      if bytes[0] != high_nibble + @output_chan || (@xpose && @xpose != 0)
+        bytes = bytes.dup
+        bytes_duped = true
+      end
+
       bytes[0] = high_nibble + @output_chan
       bytes[1] = ((bytes[1] + @xpose) & 0xff) if @xpose
     when CONTROLLER, PROGRAM_CHANGE, CHANNEL_PRESSURE, PITCH_BEND
-      bytes[0] = high_nibble + @output_chan
+      if bytes[0] != high_nibble + @output_chan
+        bytes = bytes.dup
+        bytes_duped = true
+        bytes[0] = high_nibble + @output_chan
+      end
+    end
+
+    # We can't tell if a filter will modify the bytes, so we have to assume
+    # they will be. If we didn't, we'd have to rely on the filter duping the
+    # bytes and returning the dupe.
+    if @filter
+      if !bytes_duped
+        bytes = bytes.dup
+        bytes_duped = true
+      end
+      bytes = @filter.call(self, bytes)
     end
 
-    bytes = @filter.call(self, bytes) if @filter
     if bytes && bytes.size > 0
       midi_out(bytes)
     end

data/lib/patchmaster/consts.rb

@@ -88,8 +88,8 @@ EOS
   SYSTEM_RESET = 0xFF
 
   # Controller numbers
-  # = 0 - 31 = continuous, LSB
-  # = 32 - 63 = continuous, MSB
+  # = 0 - 31 = continuous, MSB
+  # = 32 - 63 = continuous, LSB
   # = 64 - 97 = switches
   CC_BANK_SELECT = 0
   CC_MOD_WHEEL = 1

data/lib/patchmaster/curses/geometry.rb

@@ -0,0 +1,53 @@
+module PM
+
+# Defines positions and sizes of windows. Rects contain [height, width, top,
+# left], which is the order used by Curses::Window.new.
+class Geometry
+
+  include Curses
+
+  def initialize
+    @top_height = (lines() - 1) * 2 / 3
+    @bot_height = (lines() - 1) - @top_height
+    @top_width = cols() / 3
+
+    @sls_height = @top_height / 3
+    @sl_height = @top_height - @sls_height
+
+    @info_width = cols() - (@top_width * 2)
+    @info_left = @top_width * 2
+  end
+
+  def song_list_rect
+    [@sl_height, @top_width, 0, 0]
+  end
+
+  def song_rect
+    [@sl_height, @top_width, 0, @top_width]
+  end
+
+  def song_lists_rect
+    [@sls_height, @top_width, @sl_height, 0]
+  end
+
+  def trigger_rect
+    [@sls_height, @top_width, @sl_height, @top_width]
+  end
+
+  def patch_rect
+    [@bot_height, cols(), @top_height, 0]
+  end
+
+  def message_rect
+    [1, cols(), lines()-1, 0]
+  end
+
+  def info_rect
+    [@top_height, @info_width, 0, @info_left]
+  end
+
+  def help_rect
+    [lines() - 6, cols() - 6, 3, 3]
+  end
+end
+end

data/lib/patchmaster/curses/help_window.rb

@@ -0,0 +1,29 @@
+require 'curses'
+
+module PM
+class HelpWindow < PmWindow
+
+  CONTENTS = File.join(File.dirname(__FILE__), 'info_window_contents.txt')
+
+  include Curses
+
+  attr_reader :text
+
+  def initialize(rows, cols, row, col)
+    super(rows, cols, row, col, nil)
+    @text = IO.read(CONTENTS)
+    @title = 'PatchMaster Help'
+  end
+
+  def draw
+    super
+    i = 0
+    @text.each_line do |line|
+      @win.setpos(i+2, 3)
+      @win.addstr(make_fit(line.chomp))
+      i += 1
+    end
+  end
+
+end
+end

data/lib/patchmaster/curses/info_window.rb

@@ -1,32 +1,39 @@
 require 'curses'
 
 module PM
-class InfoWindow
+class InfoWindow < PmWindow
 
   CONTENTS = File.join(File.dirname(__FILE__), 'info_window_contents.txt')
 
   include Curses
 
-  attr_reader :win, :text
-
-  TITLE = ' PatchMaster '
+  attr_reader :text
 
   def initialize(rows, cols, row, col)
-    @win = Window.new(rows, cols, row, col)
-    @text = IO.read(CONTENTS)
+    super(rows, cols, row, col, nil)
+    @info_text = IO.read(CONTENTS)
+    @text = nil
   end
 
-  def draw
-    @win.setpos(0, (@win.maxx() - TITLE.length) / 2)
-    @win.attron(A_REVERSE) {
-      @win.addstr(TITLE)
-    }
-    @win.addstr("\n")
-    @text.each_line { |line| @win.addstr(line) }
+  def text=(str)
+    if str
+      @text = str
+      @title = 'Song Notes'
+    else
+      @text = @info_text
+      @title = 'PatchMaster Help'
+    end
   end
 
-  def refresh
-    @win.refresh
+  def draw
+    super
+    i = 1
+    @text.each_line do |line|
+      break if i >= @win.maxy - 2
+      @win.setpos(i+1, 1)
+      @win.addstr(make_fit(" #{line.chomp}"))
+      i += 1
+    end
   end
 
 end

data/lib/patchmaster/curses/info_window_contents.txt

@@ -1,16 +1,17 @@
 j, down, space  - next patch
 k, up           - prev patch
-n, left         - next song
-p, right        - prev song
+n, right        - next song
+p, left         - prev song
 
-g   - goto song
-t   - goto song list
+g    - goto song
+t    - goto song list
 
-h   - help
-ESC - panic
+h, ? - help
+ESC  - panic
 
-l   - load
-s   - save
-e   - edit
+l    - load
+s    - save
+r    - reload
+e    - edit
 
-q   - quit
+q    - quit

data/lib/patchmaster/curses/list_window.rb

@@ -5,7 +5,12 @@ class ListWindow < PmWindow
 
   attr_reader :list
 
-  # +curr_item_method_sym+ is a method symbol that is sent to
+  def initialize(rows, cols, row, col, title_prefix)
+    super
+    @offset = 0
+  end
+
+ # +curr_item_method_sym+ is a method symbol that is sent to
   # PM::PatchMaster to obtain the current item so we can highlight it.
   def set_contents(title, list, curr_item_method_sym)
     @title, @list, @curr_item_method_sym = title, list, curr_item_method_sym
@@ -17,7 +22,15 @@ class ListWindow < PmWindow
     return unless @list
 
     curr_item = PM::PatchMaster.instance.send(@curr_item_method_sym)
-    @list.each_with_index do |thing, i|
+    curr_index = @list.index(curr_item)
+
+    if curr_index < @offset
+      @offset = curr_index
+    elsif curr_index >= @offset + visible_height
+      @offset = curr_index - visible_height + 1
+    end
+
+    @list[@offset, visible_height].each_with_index do |thing, i|
       @win.setpos(i+1, 1)
       @win.attron(A_REVERSE) if thing == curr_item
       @win.addstr(make_fit(" #{thing.name} "))

data/lib/patchmaster/curses/main.rb

@@ -1,6 +1,7 @@
 require 'curses'
 require 'singleton'
-%w(list patch info trigger prompt).each { |w| require "patchmaster/curses/#{w}_window" }
+require 'patchmaster/curses/geometry'
+%w(list patch info trigger prompt help).each { |w| require "patchmaster/curses/#{w}_window" }
 
 module PM
 
@@ -36,21 +37,23 @@ class Main
             @pm.next_patch
           when 'k', Key::UP
             @pm.prev_patch
-          when 'n', Key::LEFT
+          when 'n', Key::RIGHT
             @pm.next_song
-          when 'p', Key::RIGHT
+          when 'p', Key::LEFT
             @pm.prev_song
           when 'g'
             name = PromptWindow.new('Go To Song', 'Go to song:').gets
-            @pm.goto_song(name)
+            @pm.goto_song(name) if name.length > 0
           when 't'
             name = PromptWindow.new('Go To Song List', 'Go to Song List:').gets
-            @pm.goto_song_list(name)
+            @pm.goto_song_list(name) if name.length > 0
           when 'e'
             close_screen
-            file = @loaded_file || PromptWindow.new('Edit', 'Edit file:').gets
-            edit(file)
-          when 'h'
+            file = @pm.loaded_file || PromptWindow.new('Edit', 'Edit file:').gets
+            edit(file) if file.length > 0
+          when 'r'
+            load(@pm.loaded_file) if @pm.loaded_file && @pm.loaded_file.length > 0
+          when 'h', '?'
             help
           when 27        # "\e" doesn't work here
             # Twice in a row sends individual note-off commands
@@ -59,29 +62,28 @@ class Main
             message('Panic sent')
           when 'l'
             file = PromptWindow.new('Load', 'Load file:').gets
-            begin
-              load(file)
-              message("Loaded #{file}")
-            rescue => ex
-              message(ex.to_s)
+            if file.length > 0
+              begin
+                load(file)
+                message("Loaded #{file}")
+              rescue => ex
+                message(ex.to_s)
+              end
             end
           when 's'
             file = PromptWindow.new('Save', 'Save into file:').gets
-            begin
-              save(file)
-              message("Saved #{file}")
-            rescue => ex
-              message(ex.to_s)
-            end
-          when '?'
-            if $DEBUG
-              require 'pp'
-              out = ''
-              str = pp(@pm, out)
-              message("pm = #{out}")
+            if file.length > 0
+              begin
+                save(file)
+                message("Saved #{file}")
+              rescue => ex
+                message(ex.to_s)
+              end
             end
           when 'q'
             break
+          when Key::RESIZE
+            resize_windows
           end
           @prev_cmd = ch
         rescue => ex
@@ -118,40 +120,40 @@ class Main
   end
 
   def create_windows
-    top_height = (lines() - 1) * 2 / 3
-    bot_height = (lines() - 1) - top_height
-    top_width = cols() / 3
-
-    sls_height = top_height / 3
-    sl_height = top_height - sls_height
-    
-    @song_lists_win = ListWindow.new(sls_height, top_width, 0, 0, nil)
-    @song_list_win = ListWindow.new(sl_height, top_width, sls_height, 0, 'Song List')
-    @song_win = ListWindow.new(top_height, top_width, 0, top_width, 'Song')
-    @patch_win = PatchWindow.new(bot_height, cols(), top_height, 0, 'Patch')
-    @message_win = Window.new(1, cols(), lines()-1, 0)
-    @message_win.scrollok(false)
+    g = PM::Geometry.new
 
-    third_height = top_height / 3
-    width = cols() - (top_width * 2) - 1
-    left = top_width * 2 + 1
+    @song_lists_win = ListWindow.new(*g.song_lists_rect, nil)
+    @song_list_win = ListWindow.new(*g.song_list_rect, 'Song List')
+    @song_win = ListWindow.new(*g.song_rect, 'Song')
+    @patch_win = PatchWindow.new(*g.patch_rect, 'Patch')
+    @message_win = Window.new(*g.message_rect)
+    @trigger_win = TriggerWindow.new(*g.trigger_rect)
+    @info_win = InfoWindow.new(*g.info_rect)
 
-    @trigger_win = TriggerWindow.new(third_height, width, third_height * 2, left)
-    @trigger_win.draw
+    @message_win.scrollok(false)
+  end
 
-    @info_win = InfoWindow.new(third_height * 2, width, 0, left)
-    @info_win.draw
+  def resize_windows
+    g = PM::Geometry.new
 
+    @song_lists_win.move_and_resize(g.song_lists_rect)
+    @song_list_win.move_and_resize(g.song_list_rect)
+    @song_win.move_and_resize(g.song_rect)
+    @patch_win.move_and_resize(g.patch_rect)
+    @trigger_win.move_and_resize(g.trigger_rect)
+    @info_win.move_and_resize(g.info_rect)
+
+    r = g.message_rect
+    @message_win.move(r[2], r[3])
+    @message_win.resize(r[0], r[1])
   end
 
   def load(file)
     @pm.load(file)
-    @loaded_file = file
   end
 
   def save(file)
     @pm.save(file)
-    @loaded_file = file
   end
 
   # Opens the most recently loaded/saved file name in an editor. After
@@ -167,7 +169,6 @@ class Main
     @pm.debug(cmd)
     system(cmd)
     load(file)
-    @loaded_file = file
   end
 
   # Return the first legit command from $VISUAL, $EDITOR, vim, vi, and
@@ -179,7 +180,11 @@ class Main
   end
 
   def help
-    message("Help: not yet implemented")
+    g = PM::Geometry.new
+    win = HelpWindow.new(*g.help_rect)
+    win.draw
+    win.refresh
+    getch                       # wait for key and eat it
   end
 
   def message(str)
@@ -193,11 +198,17 @@ class Main
     @pm.debug "#{Time.now} #{str}"
   end
 
+  # Public method callable by triggers
+  def refresh
+    refresh_all
+  end
+
   def refresh_all
     set_window_data
     wins = [@song_lists_win, @song_list_win, @song_win, @patch_win, @info_win, @trigger_win]
     wins.map(&:draw)
-    ([stdscr] + wins).map(&:refresh)
+    ([stdscr] + wins).map(&:noutrefresh)
+    Curses.doupdate
   end
 
   def set_window_data
@@ -209,10 +220,12 @@ class Main
     song = @pm.song
     if song
       @song_win.set_contents(song.name, song.patches, :patch)
+      @info_win.text = song.notes
       patch = @pm.patch
       @patch_win.patch = patch
     else
       @song_win.set_contents(nil, nil, :patch)
+      @info_win.text = nil
       @patch_win.patch = nil
     end
   end

data/lib/patchmaster/curses/patch_window.rb

@@ -17,10 +17,9 @@ class PatchWindow < PmWindow
     draw_headers
     return unless @patch
 
-    max_len = @win.maxx - 3     # minus 2 for borders
-    @patch.connections.each_with_index do |connection, i|
+    @patch.connections[0, visible_height].each_with_index do |connection, i|
       @win.setpos(i+2, 1)
-      draw_connection(connection, max_len)
+      draw_connection(connection)
     end
   end
 
@@ -32,7 +31,7 @@ class PatchWindow < PmWindow
     }
   end
 
-  def draw_connection(connection, max_len)
+  def draw_connection(connection)
     str =  " #{'%16s' % connection.input.name}"
     str << " #{connection.input_chan ? ('%2d' % (connection.input_chan+1)) : '  '} |"
     str << " #{'%16s' % connection.output.name}"
@@ -48,14 +47,18 @@ class PatchWindow < PmWindow
            else
              '           |'
            end
-    str << if connection.xpose && connection.xpose > 0
-             "    #{'%2d' % connection.xpose.to_i} |"
+    str << if connection.xpose && connection.xpose != 0
+             "   #{connection.xpose < 0 ? '' : ' '}#{'%2d' % connection.xpose.to_i} |"
            else
              "       |"
            end
-    str << " #{connection.filter}"
+    str << " #{filter_string(connection.filter)}"
     @win.addstr(make_fit(str))
   end
 
+  def filter_string(filter)
+    filter.to_s.gsub(/\s*#.*/, '').gsub(/\n\s*/, "; ")
+  end
+
 end
 end

data/lib/patchmaster/curses/pm_window.rb

@@ -1,7 +1,8 @@
 require 'curses'
+require 'delegate'
 
 module PM
-class PmWindow
+class PmWindow < SimpleDelegator
 
   include Curses
 
@@ -11,12 +12,15 @@ class PmWindow
   # If title is nil then list's name will be used
   def initialize(rows, cols, row, col, title_prefix)
     @win = Window.new(rows, cols, row, col)
+    super(@win)
     @title_prefix = title_prefix
-    @max_contents_len = @win.maxx - 3 # 2 for borders
+    set_max_contents_len(cols)
   end
 
-  def refresh
-    @win.refresh
+  def move_and_resize(rect)
+    @win.move(rect[2], rect[3])
+    @win.resize(rect[0], rect[1])
+    set_max_contents_len(rect[1])
   end
 
   def draw
@@ -33,6 +37,15 @@ class PmWindow
     }
   end
 
+  # Visible height is height of window minus 2 for the borders.
+  def visible_height
+    @win.maxy - 2
+  end
+
+  def set_max_contents_len(cols)
+    @max_contents_len = cols - 3 # 2 for borders
+  end
+
   def make_fit(str)
     str = str[0..@max_contents_len] if str.length > @max_contents_len
     str

data/lib/patchmaster/curses/trigger_window.rb

@@ -16,8 +16,10 @@ class TriggerWindow < PmWindow
     i = 0
     pm.inputs.each do |instrument|
       instrument.triggers.each do |trigger|
-        @win.setpos(i+1, 1)
-        @win.addstr(make_fit(":#{instrument.sym} #{trigger.to_s}"))
+        if i < visible_height
+          @win.setpos(i+1, 1)
+          @win.addstr(make_fit(":#{instrument.sym} #{trigger.to_s}"))
+        end
         i += 1
       end
     end

data/lib/patchmaster/cursor.rb

@@ -146,7 +146,6 @@ class Cursor
 
     str = str.downcase
     distances = list.collect { |item| dameraulevenshtein(str, item.name.downcase) }
-    min_distance = distances.min
     list[distances.index(distances.min)]
   end
 

data/lib/patchmaster/dsl.rb

@@ -75,6 +75,10 @@ class DSL
     yield @song if block_given?
   end
 
+  def notes(txt)
+    @song.notes = txt
+  end
+
   def patch(name)
     @patch = Patch.new(name)
     @song << @patch
@@ -156,6 +160,14 @@ class DSL
     end
   end
 
+  def alias_input(new_sym, old_sym)
+    @inputs[new_sym] = @inputs[old_sym]
+  end
+
+  def alias_output(new_sym, old_sym)
+    @outputs[new_sym] = @outputs[old_sym]
+  end
+
   # ****************************************************************
 
   def save(file)

data/lib/patchmaster/filter.rb

@@ -16,7 +16,7 @@ class Filter
   end
 
   def to_s
-    (@text || '# no block text found').gsub(/\n\s*/, "; ")
+    @text || '# no block text found'
   end
 
 end

data/lib/patchmaster/instrument.rb

@@ -109,7 +109,7 @@ class MockInputPort
   def gets
     [{:data => [], :timestamp => 0}]
   end
-    
+
   def poll
     yield gets
   end
@@ -118,7 +118,7 @@ class MockInputPort
   end
 
   # add this class to the Listener class' known input types
-  MIDIEye::Listener.input_types << self 
+  MIDIEye::Listener.input_types << self
 
 end
 

data/lib/patchmaster/irb/irb.rb

@@ -0,0 +1,61 @@
+require 'patchmaster'
+require 'irb'
+require 'tempfile'
+
+$dsl = nil
+
+# For bin/patchmaster. Does nothing.
+def run
+end
+
+def dsl
+  unless $dsl
+    $dsl = PM::DSL.new
+    $dsl.song("IRB Song")
+    $dsl.patch("IRB Patch")
+  end
+  $dsl
+end
+
+# Return the current (only) patch.
+def patch
+  dsl.instance_variable_get(:@patch)
+end
+
+# Stop and delete all connections.
+def clear
+  patch.stop
+  patch.connections = []
+  patch.start
+end
+
+def pm_help
+  puts IO.read(File.join(File.dirname(__FILE__), 'irb_help.txt'))
+end
+
+# The "panic" command is handled by $dsl. This version tells panic to send
+# all all-notes-off messages.
+def panic!
+  PM::PatchMaster.instance.panic(true)
+end
+
+def method_missing(sym, *args)
+  pm = PM::PatchMaster.instance
+  if dsl.respond_to?(sym)
+    patch.stop
+    dsl.send(sym, *args)
+    if sym == :input || sym == :inp
+      pm.inputs.last.start
+    end
+    patch.start
+  elsif pm.respond_to?(sym)
+    pm.send(sym, *args)
+  else
+    super
+  end
+end
+
+def start_patchmaster_irb(init_file=nil)
+  ENV['IRBRC'] = init_file if init_file
+  IRB.start
+end

data/lib/patchmaster/irb/irb_help.txt

@@ -0,0 +1,18 @@
+input  num, :sym[, name]                  define an input instrument
+output num, :sym[, name]                  define an output instrument
+prog_chg [bank, ] prog                    send a program change
+conn :in_sym, [chan|nil], :out_sym, chan  create a connection
+xpose num                                 set transpose for connection
+zone zone_def                             set zone for connection
+filter { ... }                            set connection filter
+clear                                     remove all connections
+panic                                     panic
+panic!                                    panic plus note-offs
+
+Alternate names:
+  input      inp
+  output     out
+  conn       c, connection
+  prog_chg   pc
+  xpose      x, transpose
+  filter     f

data/lib/patchmaster/patchmaster.rb

@@ -25,12 +25,14 @@ class PatchMaster < SimpleDelegator
   attr_accessor :use_midi
   alias_method :use_midi?, :use_midi
   attr_accessor :gui
+  attr_reader :loaded_file
 
   # A Cursor to which we delegate incoming position methods (#song_list,
   # #song, #patch, #next_song, #prev_patch, etc.)
   attr_reader :cursor
 
   def initialize
+    @running = false
     @cursor = Cursor.new(self)
     super(@cursor)
     @use_midi = true
@@ -146,12 +148,14 @@ class PatchMaster < SimpleDelegator
   def panic(individual_notes=false)
     debug("panic(#{individual_notes})")
     @outputs.each do |out|
+      buf = []
       MIDI_CHANNELS.times do |chan|
-        out.midi_out([CONTROLLER + chan, CM_ALL_NOTES_OFF, 0])
+        buf += [CONTROLLER + chan, CM_ALL_NOTES_OFF, 0]
         if individual_notes
-          128.times { |note| out.midi_out([NOTE_OFF + chan, note, 0]) }
+          buf += (0..127).collect { |note| [NOTE_OFF + chan, note, 0] }.flatten
         end
       end
+      out.midi_out(buf)
     end
   end
 

data/lib/patchmaster/song.rb

@@ -3,7 +3,7 @@ module PM
 # A Song is a named list of Patches with a cursor.
 class Song
 
-  attr_accessor :name, :patches
+  attr_accessor :name, :patches, :notes
 
   def initialize(name)
     @name = name

data/lib/patchmaster/trigger.rb

@@ -21,7 +21,9 @@ class Trigger
   # If +bytes+ matches our +@bytes+ array then run +@block+.
   def signal(bytes)
     if bytes == @bytes
-      block.call
+      pm = PM::PatchMaster.instance
+      pm.instance_eval &@block
+      pm.gui.refresh if pm.gui
     end
   end
 

data/lib/patchmaster/web/sinatra_app.rb

@@ -17,7 +17,7 @@ def pm
   @pm ||= PM::SinatraApp.instance.pm
 end
 
-def return_status(opts = nil)
+def return_status(opts={})
   pm = pm()
   status = {
     :lists => pm.song_lists.map(&:name),
@@ -51,9 +51,7 @@ def return_status(opts = nil)
       }
     end
   end
-  status.merge(opts) if opts
-
-  json status
+  json status.merge(opts)
 end
 
 # ================================================================
@@ -126,5 +124,10 @@ class SinatraApp
     @pm.stop
     @pm.close_debug_file
   end
+
+  # Public method callable by triggers
+  def refresh
+    # FIXME
+  end
 end
 end

metadata

@@ -1,42 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: patchmaster
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.2
 platform: ruby
 authors:
 - Jim Menard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-eye
-  requirement: &70108862796700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70108862796700
-description: ! 'PatchMaster is a MIDI processing and patching system. It allows a
-  musician to
-
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |
+  PatchMaster is a MIDI processing and patching system. It allows a musician to
   reconfigure a MIDI setup instantaneously and modify the MIDI data in real time.
-
-'
 email: jim@jimmenard.com
 executables:
 - patchmaster
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/irb_init.rb
 - bin/patchmaster
+- lib/patchmaster.rb
 - lib/patchmaster/connection.rb
 - lib/patchmaster/consts.rb
+- lib/patchmaster/curses/geometry.rb
+- lib/patchmaster/curses/help_window.rb
 - lib/patchmaster/curses/info_window.rb
 - lib/patchmaster/curses/info_window_contents.txt
 - lib/patchmaster/curses/list_window.rb
@@ -49,7 +52,8 @@ files:
 - lib/patchmaster/dsl.rb
 - lib/patchmaster/filter.rb
 - lib/patchmaster/instrument.rb
-- lib/patchmaster/irb.rb
+- lib/patchmaster/irb/irb.rb
+- lib/patchmaster/irb/irb_help.txt
 - lib/patchmaster/patch.rb
 - lib/patchmaster/patchmaster.rb
 - lib/patchmaster/predicates.rb
@@ -64,32 +68,30 @@ files:
 - lib/patchmaster/web/public/js/patchmaster.js
 - lib/patchmaster/web/public/style.css
 - lib/patchmaster/web/sinatra_app.rb
-- lib/patchmaster.rb
 - test/test_helper.rb
 homepage: http://www.patchmaster.org/
 licenses:
 - Ruby
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Realtime MIDI setup configuration and MIDI filtering
 test_files:
 - test/test_helper.rb

data/lib/patchmaster/irb.rb

@@ -1,82 +0,0 @@
-require 'patchmaster'
-require 'irb'
-require 'tempfile'
-
-$dsl = nil
-
-# For bin/patchmaster. Does nothing
-def run
-end
-
-def dsl
-  unless $dsl
-    $dsl = PM::DSL.new
-    $dsl.song("IRB Song")
-    $dsl.patch("IRB Patch")
-  end
-  $dsl
-end
-
-def patch
-  dsl.instance_variable_get(:@patch)
-end
-
-def clear
-  patch.stop
-  patch.connections = []
-  patch.start
-end
-
-def pm_help
-  puts <<EOS
-input  num, :sym[, name]                          define an input instrument
-output num, :sym[, name]                          define an output instrument
-conn :in_sym, [chan|nil], :out_sym, [chan|nil]    create a connection
-xpose num                                         set transpose for conn
-zone zone_def                                     set zone for conn
-clear                                             remove all connections
-panic                                             panic
-panic!                                            panic plus note-offs
-EOS
-end
-
-def panic!
-  PM::PatchMaster.instance.panic(true)
-end
-
-def method_missing(sym, *args)
-  pm = PM::PatchMaster.instance
-  if dsl.respond_to?(sym)
-    patch.stop
-    dsl.send(sym, *args)
-    if sym == :input || sym == :inp
-      pm.inputs.last.start
-    end
-    patch.start
-  elsif pm.respond_to?(sym)
-    pm.send(sym, *args)
-  else
-    super
-  end
-end
-
-def start_patchmaster_irb
-  f = Tempfile.new('patchmaster')
-  f.write <<EOS
-  IRB.conf[:PROMPT][:CUSTOM] = {
-    :PROMPT_I=>"PatchMaster:%03n:%i> ",
-    :PROMPT_N=>"PatchMaster:%03n:%i> ",
-    :PROMPT_S=>"PatchMaster:%03n:%i%l ",
-    :PROMPT_C=>"PatchMaster:%03n:%i* ",
-    :RETURN=>"=> %s\n"
-  }
-  IRB.conf[:PROMPT_MODE] = :CUSTOM
-
-  puts 'PatchMaster loaded'
-  puts 'Type "pm_help" for help'
-EOS
-  f.close
-  ENV['IRBRC'] = f.path
-  IRB.start
-  f.unlink
-end