midiator 0.3.0 → 0.3.1

data/lib/midiator/drivers/mmj.rb

@@ -0,0 +1,35 @@
+# The MIDIator driver for JRuby on OSX.
+#
+# == Authors
+#
+# * Jeremy Voorhis
+#
+# == Copyright
+#
+# Copyright (c) 2008 Jeremy Voorhis
+#
+# This code released under the terms of the MIT license.
+#
+
+class MIDIator::Driver::Mmj < MIDIator::Driver # :nodoc:
+  include Java
+  include_package 'de.humatic.mmj'
+  
+  def outputs
+    MidiSystem.get_outputs.inject( [{},0] ) {|(map, i), out|
+      [ map.update(out => i), i + 1 ]
+    }.first
+  end
+  
+  def open( output = 0 )
+    @out = MidiSystem.open_midi_output( output )
+  end
+  
+  def message( *args )
+    @out.send_midi( args.to_java(:byte) )
+  end
+  
+  def close
+    MidiSystem.close_midi_system
+  end
+end

data/lib/midiator/drivers/winmm.rb

@@ -24,26 +24,26 @@ require 'midiator/driver'
 require 'midiator/driver_registry'
 
 class MIDIator::Driver::WinMM < MIDIator::Driver # :nodoc:
-	module C # :nodoc:
-		extend DL::Importable
-		dlload 'winmm'
+  module C # :nodoc:
+    extend DL::Importable
+    dlload 'winmm'
 
-		extern "int midiOutOpen(HMIDIOUT*, int, int, int, int)"
-		extern "int midiOutClose(int)"
-		extern "int midiOutShortMsg(int, int)"
-	end
+    extern "int midiOutOpen(HMIDIOUT*, int, int, int, int)"
+    extern "int midiOutClose(int)"
+    extern "int midiOutShortMsg(int, int)"
+  end
 
-	def open
-		@device = DL.malloc(DL.sizeof('I'))
-		C.midiOutOpen(@device, -1, 0, 0, 0)
-	end
+  def open
+    @device = DL.malloc(DL.sizeof('I'))
+    C.midiOutOpen(@device, -1, 0, 0, 0)
+  end
 
-	def close
-		C.midiOutClose(@device.ptr.to_i)
-	end
+  def close
+    C.midiOutClose(@device.ptr.to_i)
+  end
 
-	def message(one, two=0, three=0)
-		message = one + (two << 8) + (three << 16)
-		C.midiOutShortMsg(@device.ptr.to_i, message)
-	end
+  def message(one, two=0, three=0)
+    message = one + (two << 8) + (three << 16)
+    C.midiOutShortMsg(@device.ptr.to_i, message)
+  end
 end

data/lib/midiator/drums.rb

@@ -16,24 +16,24 @@
 
 module MIDIator::Drums # this file does not rdoc well, so uhh.... :nodoc:
 
-	##########################################################################
-	### G E N E R A L   M I D I   D R U M   N O T E S
-	##########################################################################
-	BassDrum1     = 36  ;;;  LongGuiro     = 74  ;;;  OpenHiHat     = 46
-	BassDrum2     = 35  ;;;  LongWhistle   = 72  ;;;  OpenHighConga = 63
-	Cabasa        = 69  ;;;  LowAgogo      = 68  ;;;  OpenTriangle  = 81
-	ChineseCymbal = 52  ;;;  LowBongo      = 61  ;;;  PedalHiHat    = 44
-	Claves        = 75  ;;;  LowConga      = 64  ;;;  RideBell      = 53
-	ClosedHiHat   = 42  ;;;  LowTimbale    = 66  ;;;  RideCymbal1   = 51
-	Cowbell       = 56  ;;;  LowTom1       = 43  ;;;  RideCymbal2   = 59
-	CrashCymbal1  = 49  ;;;  LowTom2       = 41  ;;;  ShortGuiro    = 73
-	CrashCymbal2  = 57  ;;;  LowWoodBlock  = 77  ;;;  ShortWhistle  = 71
-	HandClap      = 39  ;;;  Maracas       = 70  ;;;  SideStick     = 37
-	HighAgogo     = 67  ;;;  MidTom1       = 47  ;;;  SnareDrum1    = 38
-	HighBongo     = 60  ;;;  MidTom2       = 45  ;;;  SnareDrum2    = 40
-	HighTimbale   = 65  ;;;  MuteCuica     = 78  ;;;  SplashCymbal  = 55
-	HighTom1      = 50  ;;;  MuteHighConga = 62  ;;;  Tambourine    = 54
-	HighTom2      = 48  ;;;  MuteTriangle  = 80  ;;;  VibraSlap     = 58
-	HighWoodBlock = 76  ;;;  OpenCuica     = 79
+  ##########################################################################
+  ### G E N E R A L   M I D I   D R U M   N O T E S
+  ##########################################################################
+  BassDrum1     = 36  ;;;  LongGuiro     = 74  ;;;  OpenHiHat     = 46
+  BassDrum2     = 35  ;;;  LongWhistle   = 72  ;;;  OpenHighConga = 63
+  Cabasa        = 69  ;;;  LowAgogo      = 68  ;;;  OpenTriangle  = 81
+  ChineseCymbal = 52  ;;;  LowBongo      = 61  ;;;  PedalHiHat    = 44
+  Claves        = 75  ;;;  LowConga      = 64  ;;;  RideBell      = 53
+  ClosedHiHat   = 42  ;;;  LowTimbale    = 66  ;;;  RideCymbal1   = 51
+  Cowbell       = 56  ;;;  LowTom1       = 43  ;;;  RideCymbal2   = 59
+  CrashCymbal1  = 49  ;;;  LowTom2       = 41  ;;;  ShortGuiro    = 73
+  CrashCymbal2  = 57  ;;;  LowWoodBlock  = 77  ;;;  ShortWhistle  = 71
+  HandClap      = 39  ;;;  Maracas       = 70  ;;;  SideStick     = 37
+  HighAgogo     = 67  ;;;  MidTom1       = 47  ;;;  SnareDrum1    = 38
+  HighBongo     = 60  ;;;  MidTom2       = 45  ;;;  SnareDrum2    = 40
+  HighTimbale   = 65  ;;;  MuteCuica     = 78  ;;;  SplashCymbal  = 55
+  HighTom1      = 50  ;;;  MuteHighConga = 62  ;;;  Tambourine    = 54
+  HighTom2      = 48  ;;;  MuteTriangle  = 80  ;;;  VibraSlap     = 58
+  HighWoodBlock = 76  ;;;  OpenCuica     = 79
 
 end

data/lib/midiator/interface.rb

@@ -22,84 +22,95 @@
 require 'midiator'
 
 class MIDIator::Interface
-	attr_reader :driver
-
-	### Automatically select a driver to use
-	def autodetect_driver
-		driver = case Platform::IMPL
-		when :macosx
-			:core_midi
-		when :mswin
-			:winmm
-		when :linux
-			:alsa
-		end
-
-		self.use(driver)
-	end
-
-
-	### Attempts to load the MIDI system driver called +driver_name+.
-	def use( driver_name )
-		driver_path = "midiator/drivers/#{driver_name.to_s}"
-
-		begin
-			require driver_path
-		rescue LoadError => e
-			raise LoadError,
-				"Could not load driver '#{driver_name}'."
-		end
-
-		# Fix two side-effects of the camelization process... first, change
-		# instances of Midi to MIDI.  This fixes the acronym form but doesn't
-		# change, for instance, 'timidity'.
-		#
-		# Second, the require path is midiator/drivers/foo, but the module
-		# name is Driver singular, so fix that.
-		driver_class = driver_path.camelize.
-			gsub( /Midi/, 'MIDI' ).
-			sub( /::Drivers::/, '::Driver::')
-
-		# special case for the ALSA driver
-		driver_class.sub!( /Alsa/, 'ALSA' )
-
-		# special case for the WinMM driver
-		driver_class.sub!( /Winmm/, 'WinMM' )
-
-		# special case for the DLSSynth driver
-		driver_class.sub!( /Dls/, 'DLS' )
-
-		# this little trick stolen from ActiveSupport.  It looks for a top-
-		# level module with the given name.
-		@driver = Object.module_eval( "::#{driver_class}" ).new
-	end
-
-
-	### A little shortcut method for playing the given +note+ for the specified
-	### +duration+.
-	def play( note, duration = 0.1, channel = 0, velocity = 100 )
-		@driver.note_on( note, channel, velocity )
-		sleep duration
-		@driver.note_off( note, channel, velocity )
-	end
-
-
-	### Does nothing for +duration+ seconds.
-	def rest( duration = 0.1 )
-		sleep duration
-	end
-
-	#######
-	private
-	#######
-
-	### Checks to see if the currently-loaded driver knows how to do +method+ and
-	### passes the message on if so.  Raises an exception (as normal) if not.
-	def method_missing( method, *args )
-		raise NoMethodError, "Neither MIDIator::Interface nor #{@driver.class} " +
-			"has a '#{method}' method." unless @driver.respond_to? method
-
-		return @driver.send( method, *args )
-	end
+  attr_reader :driver
+
+  ### Automatically select a driver to use
+  def autodetect_driver
+    driver = case Platform::IMPL
+    when :macosx
+      :core_midi
+    when :mswin, :cygwin
+      :winmm
+    when :linux
+      :alsa
+    else
+      if defined?( Java ) && Java::java.lang.System.get_property('os.name') == 'Mac OS X'
+        :mmj
+      else
+        raise "No driver is available."
+      end
+    end
+    
+    self.use(driver)
+  end
+
+
+  ### Attempts to load the MIDI system driver called +driver_name+.
+  def use( driver_name )
+    driver_path = "midiator/drivers/#{driver_name.to_s}"
+
+    begin
+      require driver_path
+    rescue LoadError => e
+      raise LoadError,
+        "Could not load driver '#{driver_name}'."
+    end
+
+    # Fix two side-effects of the camelization process... first, change
+    # instances of Midi to MIDI.  This fixes the acronym form but doesn't
+    # change, for instance, 'timidity'.
+    #
+    # Second, the require path is midiator/drivers/foo, but the module
+    # name is Driver singular, so fix that.
+    driver_class = driver_path.camelize.
+      gsub( /Midi/, 'MIDI' ).
+      sub( /::Drivers::/, '::Driver::')
+
+    # special case for the ALSA driver
+    driver_class.sub!( /Alsa/, 'ALSA' )
+
+    # special case for the WinMM driver
+    driver_class.sub!( /Winmm/, 'WinMM' )
+
+    # special case for the DLSSynth driver
+    driver_class.sub!( /Dls/, 'DLS' )
+
+    # this little trick stolen from ActiveSupport.  It looks for a top-
+    # level module with the given name.
+    @driver = Object.module_eval( "::#{driver_class}" ).new
+  end
+
+
+  ### A little shortcut method for playing the given +note+ for the
+  ### specified +duration+. If +note+ is an array, all notes in it are
+  ### played as a chord.
+  def play( note, duration = 0.1, channel = 0, velocity = 100 )
+    [note].flatten.each do |n|
+      @driver.note_on( n, channel, velocity )
+    end
+    sleep duration
+    [note].flatten.each do |n|
+      @driver.note_off( n, channel, velocity )
+    end 
+  end
+
+
+  ### Does nothing for +duration+ seconds.
+  def rest( duration = 0.1 )
+    sleep duration
+  end
+
+  #######
+  private
+  #######
+
+  ### Checks to see if the currently-loaded driver knows how to do +method+ and
+  ### passes the message on if so.  Raises an exception (as normal) if not.
+  def method_missing( method, *args )
+    raise NoMethodError, "Neither MIDIator::Interface nor #{@driver.class} " +
+      "has a '#{method}' method." unless @driver.respond_to? method
+
+    return @driver.send( method, *args )
+  end
 
 end

data/lib/midiator/notes.rb

@@ -20,71 +20,71 @@
 
 module MIDIator::Notes # this file does not rdoc well, so uhh.... :nodoc:
 
-	##########################################################################
-	### O C T A V E   - 1 ;;; O C T A V E    0    ;;; O C T A V E   1
-	##########################################################################
-	Cn1  = 0  ; Bsn1 = 0  ;;; C0  = 12 ; Bs0 = 12 ;;; C1  = 24 ; Bs1 = 24
-	Csn1 = 1  ; Dbn1 = 1  ;;; Cs0 = 13 ; Db0 = 13 ;;; Cs1 = 25 ; Db1 = 25
-	Dn1  = 2  ;           ;;; D0  = 14 ;          ;;; D1  = 26 ;
-	Dsn1 = 3  ; Ebn1 = 3  ;;; Ds0 = 15 ; Eb0 = 15 ;;; Ds1 = 27 ; Eb1 = 27
-	En1  = 4  ; Fbn1 = 4  ;;; E0  = 16 ; Fb0 = 16 ;;; E1  = 28 ; Fb1 = 28
-	Fn1  = 5  ;           ;;; F0  = 17 ;          ;;; F1  = 29 ;
-	Fsn1 = 6  ; Gbn1 = 6  ;;; Fs0 = 18 ; Gb0 = 18 ;;; Fs1 = 30 ; Gb1 = 30
-	Gn1  = 7  ;           ;;; G0  = 19 ;          ;;; G1  = 31 ;
-	Gsn1 = 8  ; Abn1 = 8  ;;; Gs0 = 20 ; Ab0 = 20 ;;; Gs1 = 32 ; Ab1 = 32
-	An1  = 9  ;           ;;; A0  = 21 ;          ;;; A1  = 33 ;
-	Asn1 = 10 ; Bbn1 = 10 ;;; As0 = 22 ; Bb0 = 22 ;;; As1 = 34 ; Bb1 = 34
-	Bn1  = 11 ; Cb0  = 11 ;;; B0  = 23 ; Cb1 = 23 ;;; B1  = 35 ; Cb2 = 35
+  ##########################################################################
+  ### O C T A V E   - 1 ;;; O C T A V E    0    ;;; O C T A V E   1
+  ##########################################################################
+  Cn1  = 0  ; Bsn1 = 0  ;;; C0  = 12 ; Bs0 = 12 ;;; C1  = 24 ; Bs1 = 24
+  Csn1 = 1  ; Dbn1 = 1  ;;; Cs0 = 13 ; Db0 = 13 ;;; Cs1 = 25 ; Db1 = 25
+  Dn1  = 2  ;           ;;; D0  = 14 ;          ;;; D1  = 26 ;
+  Dsn1 = 3  ; Ebn1 = 3  ;;; Ds0 = 15 ; Eb0 = 15 ;;; Ds1 = 27 ; Eb1 = 27
+  En1  = 4  ; Fbn1 = 4  ;;; E0  = 16 ; Fb0 = 16 ;;; E1  = 28 ; Fb1 = 28
+  Fn1  = 5  ;           ;;; F0  = 17 ;          ;;; F1  = 29 ;
+  Fsn1 = 6  ; Gbn1 = 6  ;;; Fs0 = 18 ; Gb0 = 18 ;;; Fs1 = 30 ; Gb1 = 30
+  Gn1  = 7  ;           ;;; G0  = 19 ;          ;;; G1  = 31 ;
+  Gsn1 = 8  ; Abn1 = 8  ;;; Gs0 = 20 ; Ab0 = 20 ;;; Gs1 = 32 ; Ab1 = 32
+  An1  = 9  ;           ;;; A0  = 21 ;          ;;; A1  = 33 ;
+  Asn1 = 10 ; Bbn1 = 10 ;;; As0 = 22 ; Bb0 = 22 ;;; As1 = 34 ; Bb1 = 34
+  Bn1  = 11 ; Cb0  = 11 ;;; B0  = 23 ; Cb1 = 23 ;;; B1  = 35 ; Cb2 = 35
 
-	##########################################################################
-	### O C T A V E   2 ;;; O C T A V E    3    ;;; O C T A V E   4
-	##########################################################################
-	C2  = 36 ; Bs2 = 36 ;;; C3  = 48 ; Bs3 = 48 ;;; C4  = 60 ; Bs4 = 60
-	Cs2 = 37 ; Db2 = 37 ;;; Cs3 = 49 ; Db3 = 49 ;;; Cs4 = 61 ; Db4 = 61
-	D2  = 38 ;          ;;; D3  = 50 ;          ;;; D4  = 62 ;
-	Ds2 = 39 ; Eb2 = 39 ;;; Ds3 = 51 ; Eb3 = 51 ;;; Ds4 = 63 ; Eb4 = 63
-	E2  = 40 ; Fb2 = 40 ;;; E3  = 52 ; Fb3 = 52 ;;; E4  = 64 ; Fb4 = 64
-	F2  = 41 ;          ;;; F3  = 53 ;          ;;; F4  = 65 ;
-	Fs2 = 42 ; Gb2 = 42 ;;; Fs3 = 54 ; Gb3 = 54 ;;; Fs4 = 66 ; Gb4 = 66
-	G2  = 43 ;          ;;; G3  = 55 ;          ;;; G4  = 67 ;
-	Gs2 = 44 ; Ab2 = 44 ;;; Gs3 = 56 ; Ab3 = 56 ;;; Gs4 = 68 ; Ab4 = 68
-	A2  = 45 ;          ;;; A3  = 57 ;          ;;; A4  = 69 ;
-	As2 = 46 ; Bb2 = 46 ;;; As3 = 58 ; Bb3 = 58 ;;; As4 = 70 ; Bb4 = 70
-	B2  = 47 ; Cb3 = 47 ;;; B3  = 59 ; Cb4 = 59 ;;; B4  = 71 ; Cb5 = 71
+  ##########################################################################
+  ### O C T A V E   2 ;;; O C T A V E    3    ;;; O C T A V E   4
+  ##########################################################################
+  C2  = 36 ; Bs2 = 36 ;;; C3  = 48 ; Bs3 = 48 ;;; C4  = 60 ; Bs4 = 60
+  Cs2 = 37 ; Db2 = 37 ;;; Cs3 = 49 ; Db3 = 49 ;;; Cs4 = 61 ; Db4 = 61
+  D2  = 38 ;          ;;; D3  = 50 ;          ;;; D4  = 62 ;
+  Ds2 = 39 ; Eb2 = 39 ;;; Ds3 = 51 ; Eb3 = 51 ;;; Ds4 = 63 ; Eb4 = 63
+  E2  = 40 ; Fb2 = 40 ;;; E3  = 52 ; Fb3 = 52 ;;; E4  = 64 ; Fb4 = 64
+  F2  = 41 ;          ;;; F3  = 53 ;          ;;; F4  = 65 ;
+  Fs2 = 42 ; Gb2 = 42 ;;; Fs3 = 54 ; Gb3 = 54 ;;; Fs4 = 66 ; Gb4 = 66
+  G2  = 43 ;          ;;; G3  = 55 ;          ;;; G4  = 67 ;
+  Gs2 = 44 ; Ab2 = 44 ;;; Gs3 = 56 ; Ab3 = 56 ;;; Gs4 = 68 ; Ab4 = 68
+  A2  = 45 ;          ;;; A3  = 57 ;          ;;; A4  = 69 ;
+  As2 = 46 ; Bb2 = 46 ;;; As3 = 58 ; Bb3 = 58 ;;; As4 = 70 ; Bb4 = 70
+  B2  = 47 ; Cb3 = 47 ;;; B3  = 59 ; Cb4 = 59 ;;; B4  = 71 ; Cb5 = 71
 
-	##########################################################################
-	### O C T A V E   5 ;;; O C T A V E    6    ;;; O C T A V E   7
-	##########################################################################
-	C5  = 72 ; Bs5 = 72 ;;; C6  = 84 ; Bs6 = 84 ;;; C7  = 96  ; Bs7 = 96
-	Cs5 = 73 ; Db5 = 73 ;;; Cs6 = 85 ; Db6 = 85 ;;; Cs7 = 97  ; Db7 = 97
-	D5  = 74 ;          ;;; D6  = 86 ;          ;;; D7  = 98  ;
-	Ds5 = 75 ; Eb5 = 75 ;;; Ds6 = 87 ; Eb6 = 87 ;;; Ds7 = 99  ; Eb7 = 99
-	E5  = 76 ; Fb5 = 76 ;;; E6  = 88 ; Fb6 = 88 ;;; E7  = 100 ; Fb7 = 100
-	F5  = 77 ;          ;;; F6  = 89 ;          ;;; F7  = 101 ;
-	Fs5 = 78 ; Gb5 = 78 ;;; Fs6 = 90 ; Gb6 = 90 ;;; Fs7 = 102 ; Gb7 = 102
-	G5  = 79 ;          ;;; G6  = 91 ;          ;;; G7  = 103 ;
-	Gs5 = 80 ; Ab5 = 80 ;;; Gs6 = 92 ; Ab6 = 92 ;;; Gs7 = 104 ; Ab7 = 104
-	A5  = 81 ;          ;;; A6  = 93 ;          ;;; A7  = 105 ;
-	As5 = 82 ; Bb5 = 82 ;;; As6 = 94 ; Bb6 = 94 ;;; As7 = 106 ; Bb7 = 106
-	B5  = 83 ; Cb6 = 83 ;;; B6  = 95 ; Cb7 = 95 ;;; B7  = 107 ; Cb8 = 107
+  ##########################################################################
+  ### O C T A V E   5 ;;; O C T A V E    6    ;;; O C T A V E   7
+  ##########################################################################
+  C5  = 72 ; Bs5 = 72 ;;; C6  = 84 ; Bs6 = 84 ;;; C7  = 96  ; Bs7 = 96
+  Cs5 = 73 ; Db5 = 73 ;;; Cs6 = 85 ; Db6 = 85 ;;; Cs7 = 97  ; Db7 = 97
+  D5  = 74 ;          ;;; D6  = 86 ;          ;;; D7  = 98  ;
+  Ds5 = 75 ; Eb5 = 75 ;;; Ds6 = 87 ; Eb6 = 87 ;;; Ds7 = 99  ; Eb7 = 99
+  E5  = 76 ; Fb5 = 76 ;;; E6  = 88 ; Fb6 = 88 ;;; E7  = 100 ; Fb7 = 100
+  F5  = 77 ;          ;;; F6  = 89 ;          ;;; F7  = 101 ;
+  Fs5 = 78 ; Gb5 = 78 ;;; Fs6 = 90 ; Gb6 = 90 ;;; Fs7 = 102 ; Gb7 = 102
+  G5  = 79 ;          ;;; G6  = 91 ;          ;;; G7  = 103 ;
+  Gs5 = 80 ; Ab5 = 80 ;;; Gs6 = 92 ; Ab6 = 92 ;;; Gs7 = 104 ; Ab7 = 104
+  A5  = 81 ;          ;;; A6  = 93 ;          ;;; A7  = 105 ;
+  As5 = 82 ; Bb5 = 82 ;;; As6 = 94 ; Bb6 = 94 ;;; As7 = 106 ; Bb7 = 106
+  B5  = 83 ; Cb6 = 83 ;;; B6  = 95 ; Cb7 = 95 ;;; B7  = 107 ; Cb8 = 107
 
-	##########################################################################
-	### O C T A V E   8   ;;; O C T A V E    9
-	##########################################################################
-	C8  = 108 ; Bs8 = 108 ;;; C9  = 120 ; Bs9 = 120
-	Cs8 = 109 ; Db8 = 109 ;;; Cs9 = 121 ; Db9 = 121
-	D8  = 110 ;           ;;; D9  = 122 ;
-	Ds8 = 111 ; Eb8 = 111 ;;; Ds9 = 123 ; Eb9 = 123
-	E8  = 112 ; Fb8 = 112 ;;; E9  = 124 ; Fb9 = 124
-	F8  = 113 ;           ;;; F9  = 125 ;
-	Fs8 = 114 ; Gb8 = 114 ;;; Fs9 = 126 ; Gb9 = 126
-	G8  = 115 ;           ;;; G9  = 127 ;
-	Gs8 = 116 ; Ab8 = 116
-	A8  = 117 ;
-	As8 = 118 ; Bb8 = 118
-	B8  = 119 ; Cb9 = 119
+  ##########################################################################
+  ### O C T A V E   8   ;;; O C T A V E    9
+  ##########################################################################
+  C8  = 108 ; Bs8 = 108 ;;; C9  = 120 ; Bs9 = 120
+  Cs8 = 109 ; Db8 = 109 ;;; Cs9 = 121 ; Db9 = 121
+  D8  = 110 ;           ;;; D9  = 122 ;
+  Ds8 = 111 ; Eb8 = 111 ;;; Ds9 = 123 ; Eb9 = 123
+  E8  = 112 ; Fb8 = 112 ;;; E9  = 124 ; Fb9 = 124
+  F8  = 113 ;           ;;; F9  = 125 ;
+  Fs8 = 114 ; Gb8 = 114 ;;; Fs9 = 126 ; Gb9 = 126
+  G8  = 115 ;           ;;; G9  = 127 ;
+  Gs8 = 116 ; Ab8 = 116
+  A8  = 117 ;
+  As8 = 118 ; Bb8 = 118
+  B8  = 119 ; Cb9 = 119
 
-	# Shortcuts!
-	MiddleC = 84
+  # Shortcuts!
+  MiddleC = 84
 
 end

data/lib/midiator/timer.rb

@@ -15,48 +15,48 @@
 #
 
 class MIDIator::Timer
-	attr_reader :resolution, :queue, :thread
+  attr_reader :resolution, :queue, :thread
 
-	### Create a new Timer object that ticks every +resolution+ seconds.
-	def initialize( resolution )
-		@resolution = resolution
-		@queue = []
+  ### Create a new Timer object that ticks every +resolution+ seconds.
+  def initialize( resolution )
+    @resolution = resolution
+    @queue = []
 
-		@thread = Thread.new do
-			loop do
-				dispatch
-				sleep @resolution
-			end
-		end
-	end
+    @thread = Thread.new do
+      loop do
+        dispatch
+        sleep @resolution
+      end
+    end
+  end
 
 
-	### Empty the queue
-	def flush
-		@queue.clear
-	end
+  ### Empty the queue
+  def flush
+    @queue.clear
+  end
 
 
-	### Add a new job to be performed at +time+.
-	def at( time, &block )
-		time = time.to_f if time.kind_of? Time
-		@queue.push [ time, block ]
-	end
+  ### Add a new job to be performed at +time+.
+  def at( time, &block )
+    time = time.to_f if time.kind_of? Time
+    @queue.push [ time, block ]
+  end
 
-	#######
-	private
-	#######
+  #######
+  private
+  #######
 
-	### Check to see if there is work to perform in this timeslice and
-	### do it if so.
-	def dispatch
-		now = Time.now.to_f
+  ### Check to see if there is work to perform in this timeslice and
+  ### do it if so.
+  def dispatch
+    now = Time.now.to_f
 
-		# move "ready" work out of the queue
-		ready, @queue = @queue.partition {|time, proc| time <= now }
+    # move "ready" work out of the queue
+    ready, @queue = @queue.partition {|time, proc| time <= now }
 
-		# call all of the "ready" jobs, passing in the time
-		ready.each {|time, proc| proc.call( time ) }
-	end
+    # call all of the "ready" jobs, passing in the time
+    ready.each {|time, proc| proc.call( time ) }
+  end
 
 end