midilib 2.0.4 → 2.0.5

data/lib/midilib/utils.rb

@@ -1,18 +1,18 @@
 module MIDI
 
-# Utility methods.
-class Utils
+  # Utility methods.
+  class Utils
 
     # MIDI note names. NOTE_NAMES[0] is 'C', NOTE_NAMES[1] is 'C#', etc.
     NOTE_NAMES = [
-	'C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B'
+      'C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B'
     ]
 
     # Given a MIDI note number, return the name and octave as a string.
     def Utils.note_to_s(num)
-	note = num % 12
-	octave = num / 12
-	return "#{NOTE_NAMES[note]}#{octave - 1}"
+      note = num % 12
+      octave = num / 12
+      return "#{NOTE_NAMES[note]}#{octave - 1}"
     end
 
     # Given an integer, returns it as a variable length array of bytes (the
@@ -22,15 +22,15 @@ class Utils
     # input from a stream of bytes. Therefore we don't supply it here. That is
     # a part of the MIDIFile class.
     def Utils.as_var_len(val)
-	buffer = []
-	buffer << (val & 0x7f)
-	val = (val >> 7)
-	while val > 0
-	    buffer << (0x80 + (val & 0x7f))
-	    val = (val >> 7)
-	end
-	return buffer.reverse!
+      buffer = []
+      buffer << (val & 0x7f)
+      val = (val >> 7)
+      while val > 0
+        buffer << (0x80 + (val & 0x7f))
+        val = (val >> 7)
+      end
+      return buffer.reverse!
     end
 
-end
+  end
 end

data/test/event_equality.rb

@@ -6,76 +6,76 @@
 
 module MIDI
 
-    class Event
-	def ==(an_obj)
-	    return an_obj.instance_of?(self.class) &&
-		@status == an_obj.status &&
-		@delta_time == an_obj.delta_time &&
-		@time_from_start == an_obj.time_from_start
-	end
+  class Event
+    def ==(an_obj)
+      return an_obj.instance_of?(self.class) &&
+        @status == an_obj.status &&
+        @delta_time == an_obj.delta_time &&
+        @time_from_start == an_obj.time_from_start
     end
+  end
 
-    class ChannelEvent
-	def ==(an_obj)
-	    return super(an_obj) && @channel == an_obj.channel
-	end
+  class ChannelEvent
+    def ==(an_obj)
+      return super(an_obj) && @channel == an_obj.channel
     end
+  end
 
-    class NoteEvent < ChannelEvent
-	def ==(an_obj)
-	    return super(an_obj) &&
-		@note == an_obj.note && @velocity == an_obj.velocity
-	end
+  class NoteEvent < ChannelEvent
+    def ==(an_obj)
+      return super(an_obj) &&
+        @note == an_obj.note && @velocity == an_obj.velocity
     end
+  end
 
-    class Controller < ChannelEvent
-	def ==(an_obj)
-	    return super(an_obj) &&
-		@controller == an_obj.controller && @value == an_obj.value
-	end
+  class Controller < ChannelEvent
+    def ==(an_obj)
+      return super(an_obj) &&
+        @controller == an_obj.controller && @value == an_obj.value
     end
+  end
 
-    class ProgramChange < ChannelEvent
-	def ==(an_obj)
-	    return super(an_obj) && @program == an_obj.program
-	end
+  class ProgramChange < ChannelEvent
+    def ==(an_obj)
+      return super(an_obj) && @program == an_obj.program
     end
+  end
 
-    class ChannelPressure < ChannelEvent
-	def ==(an_obj)
-	    return super(an_obj) && @pressure == an_obj.pressure
-	end
+  class ChannelPressure < ChannelEvent
+    def ==(an_obj)
+      return super(an_obj) && @pressure == an_obj.pressure
     end
+  end
 
-    class PitchBend < ChannelEvent
-	def ==(an_obj)
-	    return super(an_obj) && @value == an_obj.value
-	end
+  class PitchBend < ChannelEvent
+    def ==(an_obj)
+      return super(an_obj) && @value == an_obj.value
     end
+  end
 
-    class SystemExclusive < SystemCommon
-	def ==(an_obj)
-	    return super(an_obj) && @data == an_obj.data
-	end
+  class SystemExclusive < SystemCommon
+    def ==(an_obj)
+      return super(an_obj) && @data == an_obj.data
     end
+  end
 
-    class SongPointer < SystemCommon
-	def ==(an_obj)
-	    return super(an_obj) && @pointer == an_obj.pointer
-	end
+  class SongPointer < SystemCommon
+    def ==(an_obj)
+      return super(an_obj) && @pointer == an_obj.pointer
     end
+  end
 
-    class SongSelect < SystemCommon
-	def ==(an_obj)
-	    return super(an_obj) && @song == an_obj.song
-	end
+  class SongSelect < SystemCommon
+    def ==(an_obj)
+      return super(an_obj) && @song == an_obj.song
     end
+  end
 
-    class MetaEvent < Event
-	def ==(an_obj)
-	    return super(an_obj) && @meta_type == an_obj.meta_type &&
-		@data == an_obj.data
-	end
+  class MetaEvent < Event
+    def ==(an_obj)
+      return super(an_obj) && @meta_type == an_obj.meta_type &&
+        @data == an_obj.data
     end
+  end
 
 end

data/test/test_event.rb

@@ -8,130 +8,128 @@ require 'midilib'
 
 class EventTester < Test::Unit::TestCase
 
-    def test_note_on
-	e = MIDI::NoteOn.new
-	assert_equal(MIDI::NOTE_ON, e.status)
-	assert_equal(0, e.channel)
-	assert_equal(64, e.note)
-	assert_equal(64, e.velocity)
-	assert_equal(0, e.delta_time)
-	assert_equal(0, e.time_from_start)
+  def test_note_on
+    e = MIDI::NoteOn.new
+    assert_equal(MIDI::NOTE_ON, e.status)
+    assert_equal(0, e.channel)
+    assert_equal(64, e.note)
+    assert_equal(64, e.velocity)
+    assert_equal(0, e.delta_time)
+    assert_equal(0, e.time_from_start)
+  end
+
+  def test_to_s
+    e = MIDI::NoteOn.new
+    assert_equal("0: ch 00 on 40 40", e.to_s)
+    e.print_decimal_numbers = true
+    assert_equal("0: ch 0 on 64 64", e.to_s)
+    e.print_note_names = true
+    assert_equal("0: ch 0 on E4 64", e.to_s)
+    e.print_decimal_numbers = false
+    assert_equal("0: ch 00 on E4 40", e.to_s)
+  end
+
+  def test_pitch_bend
+    e = MIDI::PitchBend.new(0, 128)
+    b = e.data_as_bytes
+    assert_equal(0, b[1])	# lsb, 7 bits
+    assert_equal(1, b[2])	# msb, 7 bits
+
+    e.value = (3 << 7) + 42
+    b = e.data_as_bytes
+    assert_equal(42, b[1])	# lsb, 7 bits
+    assert_equal(3, b[2])	# msb, 7 bits
+  end
+
+  def test_quantize_1
+    e = MIDI::NoteOn.new
+    e.quantize_to(4)
+    assert_equal(0, e.time_from_start)
+
+    # Each value in this array is the expected quantized value of
+    # its index in the array.
+
+    # Test with quantize_to(4)
+    [0, 0, 4, 4, 4, 4, 8, 8, 8, 8, 12, 12, 12, 12, 16].each_with_index do |after, before|
+      e.time_from_start = before
+      e.quantize_to(4)
+      assert_equal(after, e.time_from_start)
     end
 
-    def test_quantize
-	e = MIDI::NoteOn.new
-	e.quantize_to(4)
-	assert_equal(0, e.time_from_start)
-
-	# Each value in this array is the expected quantized value of
-	# its index in the array.
-
-	# Test with quantize_to(4)
-	[0, 0, 4, 4, 4, 4, 8, 8, 8, 8, 12, 12, 12, 12, 16].each_with_index {
-	    | after, before |
-	    e.time_from_start = before
-	    e.quantize_to(4)
-	    assert_equal(after, e.time_from_start)
-	}
-
-	# Test with quantize_to(6)
-	[0, 0, 0, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 12, 12,
-	 18, 18, 18, 18, 18, 18, 24].each_with_index {
-	    | after, before |
-	    e.time_from_start = before
-	    e.quantize_to(6)
-	    assert_equal(after, e.time_from_start)
-	}
-    end
-
-    def test_to_s
-	e = MIDI::NoteOn.new
-	assert_equal("0: ch 00 on 40 40", e.to_s)
-	e.print_decimal_numbers = true
-	assert_equal("0: ch 0 on 64 64", e.to_s)
-	e.print_note_names = true
-	assert_equal("0: ch 0 on E4 64", e.to_s)
-	e.print_decimal_numbers = false
-	assert_equal("0: ch 00 on E4 40", e.to_s)
-    end
-
-    def test_pitch_bend
-      e = MIDI::PitchBend.new(0, 128)
-      b = e.data_as_bytes
-      assert_equal(0, b[1])	# lsb, 7 bits
-      assert_equal(1, b[2])	# msb, 7 bits
-
-      e.value = (3 << 7) + 42
-      b = e.data_as_bytes
-      assert_equal(42, b[1])	# lsb, 7 bits
-      assert_equal(3, b[2])	# msb, 7 bits
-    end
-
-    def test_quantize
-	e = MIDI::NoteOn.new(0, 64, 64, 0)
-	e.quantize_to(80)
-	assert_equal(0, e.time_from_start)
-
-	e.time_from_start = 1
-	e.quantize_to(80)
-	assert_equal(0, e.time_from_start)
-
-	e.time_from_start = 70
-	e.quantize_to(80)
-	assert_equal(80, e.time_from_start)
-
-	e.time_from_start = 100
-	e.quantize_to(80)
-	assert_equal(80, e.time_from_start)
-
-	e.time_from_start = 398
-	e.quantize_to(80)
-	assert_equal(400, e.time_from_start)
-
-	e.time_from_start = 405
-	e.quantize_to(80)
-	assert_equal(400, e.time_from_start)
-
-	e.time_from_start = 439
-	e.quantize_to(80)
-	assert_equal(400, e.time_from_start)
-
-	e.time_from_start = 440
-	e.quantize_to(80)
-	assert_equal(480, e.time_from_start)
-
-	e.time_from_start = 441
-	e.quantize_to(80)
-	assert_equal(480, e.time_from_start)
-    end
-
-    def test_meta_strings
-	e = MIDI::MetaEvent.new(MIDI::META_TEXT, [97, 98, 99])
-	assert_equal([97, 98, 99], e.data)
-	assert_equal('abc', e.data_as_str)
-
-        assert_equal([MIDI::META_EVENT, MIDI::META_TEXT, 3, 97, 98, 99], e.data_as_bytes)
-    end
-
-    def test_meta_event_string_in_ctor
-	e = MIDI::MetaEvent.new(MIDI::META_TEXT, 'abc')
-	assert_equal([97, 98, 99], e.data)
-	assert_equal('abc', e.data_as_str)
-        assert_equal([MIDI::META_EVENT, MIDI::META_TEXT, 3, 97, 98, 99], e.data_as_bytes)
-    end
-
-    def test_meta_event_data_assignment
-	foobar_as_array = [102, 111, 111, 98, 97, 114]
-
-	e = MIDI::MetaEvent.new(MIDI::META_TEXT, [97, 98, 99])
-	e.data = 'foobar'
-	assert_equal('foobar', e.data_as_str)
-	assert_equal(foobar_as_array, e.data)
-
-	e.data = nil
-	e.data = foobar_as_array
-	assert_equal('foobar', e.data_as_str)
-	assert_equal(foobar_as_array, e.data)
+    # Test with quantize_to(6)
+    [0, 0, 0, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 12, 12,
+      18, 18, 18, 18, 18, 18, 24].each_with_index do |after, before|
+      e.time_from_start = before
+      e.quantize_to(6)
+      assert_equal(after, e.time_from_start)
     end
+  end
+
+  def test_quantize_2
+    e = MIDI::NoteOn.new(0, 64, 64, 0)
+    e.quantize_to(80)
+    assert_equal(0, e.time_from_start)
+
+    e.time_from_start = 1
+    e.quantize_to(80)
+    assert_equal(0, e.time_from_start)
+
+    e.time_from_start = 70
+    e.quantize_to(80)
+    assert_equal(80, e.time_from_start)
+
+    e.time_from_start = 100
+    e.quantize_to(80)
+    assert_equal(80, e.time_from_start)
+
+    e.time_from_start = 398
+    e.quantize_to(80)
+    assert_equal(400, e.time_from_start)
+
+    e.time_from_start = 405
+    e.quantize_to(80)
+    assert_equal(400, e.time_from_start)
+
+    e.time_from_start = 439
+    e.quantize_to(80)
+    assert_equal(400, e.time_from_start)
+
+    e.time_from_start = 440
+    e.quantize_to(80)
+    assert_equal(480, e.time_from_start)
+
+    e.time_from_start = 441
+    e.quantize_to(80)
+    assert_equal(480, e.time_from_start)
+  end
+
+  def test_meta_strings
+    e = MIDI::MetaEvent.new(MIDI::META_TEXT, [97, 98, 99])
+    assert_equal([97, 98, 99], e.data)
+    assert_equal('abc', e.data_as_str)
+
+    assert_equal([MIDI::META_EVENT, MIDI::META_TEXT, 3, 97, 98, 99], e.data_as_bytes)
+  end
+
+  def test_meta_event_string_in_ctor
+    e = MIDI::MetaEvent.new(MIDI::META_TEXT, 'abc')
+    assert_equal([97, 98, 99], e.data)
+    assert_equal('abc', e.data_as_str)
+    assert_equal([MIDI::META_EVENT, MIDI::META_TEXT, 3, 97, 98, 99], e.data_as_bytes)
+  end
+
+  def test_meta_event_data_assignment
+    foobar_as_array = [102, 111, 111, 98, 97, 114]
+
+    e = MIDI::MetaEvent.new(MIDI::META_TEXT, [97, 98, 99])
+    e.data = 'foobar'
+    assert_equal('foobar', e.data_as_str)
+    assert_equal(foobar_as_array, e.data)
+
+    e.data = nil
+    e.data = foobar_as_array
+    assert_equal('foobar', e.data_as_str)
+    assert_equal(foobar_as_array, e.data)
+  end
 
 end

data/test/test_io.rb

@@ -11,53 +11,40 @@ require 'event_equality'
 
 class IOTester < Test::Unit::TestCase
 
-    SEQ_TEST_FILE = File.join(File.dirname(__FILE__), 'test.mid')
-    OUTPUT_FILE = 'testout.mid'
-
-    def compare_tracks(t0, t1)
-	assert_equal(t0.name, t1.name, 'track names differ')
-	assert_equal(t0.events.length, t1.events.length,
-		     'number of track events differ')
-	t0.each_with_index { | ev0, i |
-	    assert_equal(ev0, t1.events[i], 'events differ')
-	}
-	assert_equal(t0.instrument, t1.instrument)
-    end
-
-    def compare_sequences(s0, s1)
-	assert_equal(s0.name, s1.name, 'sequence names differ')
-	assert_equal(s0.tracks.length, s1.tracks.length,
-		     'number of tracks differ')
-	s0.each_with_index { | track0, i |
-	    compare_tracks(track0, s1.tracks[i])
-	}
-    end
-
-    def test_read_and_write
-	seq0 = MIDI::Sequence.new()
-
-	puts if $DEBUG
-	puts '    reading file' if $DEBUG
-	File.open(SEQ_TEST_FILE, 'rb') { | f | seq0.read(f) }
-
-	puts '    writing file' if $DEBUG
-	File.open(OUTPUT_FILE, 'wb') { | f | seq0.write(f) }
-
-	puts '    reading file' if $DEBUG
-	seq1 = MIDI::Sequence.new()
-	File.open(OUTPUT_FILE, 'rb') { | f | seq1.read(f) }
-
-	puts '    comparing sequences' if $DEBUG
-	compare_sequences(seq0, seq1)
-      ensure
-	File.delete(OUTPUT_FILE) if File.exist?(OUTPUT_FILE)
-    end
-
-    def test_read_strings
-	seq = MIDI::Sequence.new
-	File.open(SEQ_TEST_FILE, 'rb') { |f| seq.read(f) }
-	assert_equal('Sequence Name', seq.tracks[0].name)
-	assert_equal(MIDI::GM_PATCH_NAMES[0], seq.tracks[1].instrument)
-    end
+  SEQ_TEST_FILE = File.join(File.dirname(__FILE__), 'test.mid')
+  OUTPUT_FILE = 'testout.mid'
+
+  def compare_tracks(t0, t1)
+    assert_equal(t0.name, t1.name, 'track names differ')
+    assert_equal(t0.events.length, t1.events.length,
+                 'number of track events differ')
+    t0.each_with_index { |ev0, i| assert_equal(ev0, t1.events[i], 'events differ') }
+    assert_equal(t0.instrument, t1.instrument)
+  end
+
+  def compare_sequences(s0, s1)
+    assert_equal(s0.name, s1.name, 'sequence names differ')
+    assert_equal(s0.tracks.length, s1.tracks.length,
+                 'number of tracks differ')
+    s0.each_with_index { |track0, i| compare_tracks(track0, s1.tracks[i]) }
+  end
+
+  def test_read_and_write
+    seq0 = MIDI::Sequence.new()
+    File.open(SEQ_TEST_FILE, 'rb') { |f| seq0.read(f) }
+    File.open(OUTPUT_FILE, 'wb') { |f| seq0.write(f) }
+    seq1 = MIDI::Sequence.new()
+    File.open(OUTPUT_FILE, 'rb') { |f| seq1.read(f) }
+    compare_sequences(seq0, seq1)
+  ensure
+    File.delete(OUTPUT_FILE) if File.exist?(OUTPUT_FILE)
+  end
+
+  def test_read_strings
+    seq = MIDI::Sequence.new
+    File.open(SEQ_TEST_FILE, 'rb') { |f| seq.read(f) }
+    assert_equal('Sequence Name', seq.tracks[0].name)
+    assert_equal(MIDI::GM_PATCH_NAMES[0], seq.tracks[1].instrument)
+  end
 
 end