midilib 1.1.4 → 1.2.0

data/lib/midilib/event.rb

@@ -186,11 +186,10 @@ class NoteEvent < ChannelEvent
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << (@status + @channel)
 	data << @note
 	data << @velocity
-	return data
     end
 end
 
@@ -246,11 +245,10 @@ class Controller < ChannelEvent
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << (@status + @channel)
 	data << @controller
 	data << @value
-	return data
     end
 
     def to_s
@@ -268,10 +266,9 @@ class ProgramChange < ChannelEvent
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << (@status + @channel)
 	data << @program
-	return data
     end
 
     def to_s
@@ -288,10 +285,9 @@ class ChannelPressure < ChannelEvent
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << (@status + @channel)
 	data << @pressure
-	return data
     end
 
     def to_s
@@ -308,11 +304,10 @@ class PitchBend < ChannelEvent
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << (@status + @channel)
 	data << (@value & 0x7f) # lsb
 	data << ((@value >> 7) & 0x7f) # msb
-	return data
     end
 
     def to_s
@@ -336,12 +331,12 @@ class SystemExclusive < SystemCommon
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << @status
 	data << Utils.as_var_len(@data.length)
 	data << @data
 	data << EOX
-	return data
+	data.flatten
     end
 
     def to_s
@@ -358,11 +353,10 @@ class SongPointer < SystemCommon
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << @status
 	data << ((@pointer >> 8) & 0xff)
 	data << (@pointer & 0xff)
-	return data
     end
 
     def to_s
@@ -379,10 +373,9 @@ class SongSelect < SystemCommon
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << @status
 	data << @song
-	return data
     end
 
     def to_s
@@ -396,9 +389,8 @@ class TuneRequest < SystemCommon
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << @status
-	return data
     end
 
     def to_s
@@ -413,9 +405,8 @@ class Realtime < Event
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << @status
-	return data
     end
 
     def to_s
@@ -490,12 +481,12 @@ class MetaEvent < Event
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << @status
 	data << @meta_type
 	data << (@data ? Utils.as_var_len(@data.length) : 0)
 	data << @data if @data
-	return data
+	data.flatten
     end
 
     def to_s
@@ -573,14 +564,13 @@ class Tempo < MetaEvent
     end
 
     def data_as_bytes
-	data = ''
+	data = []
 	data << @status
 	data << @meta_type
 	data << 3
 	data << ((@data >> 16) & 0xff)
 	data << ((@data >> 8) & 0xff)
 	data << (@data & 0xff)
-	return data
     end
 
     def to_s
@@ -599,7 +589,7 @@ class TimeSig < MetaEvent
     
     # Returns the complete event as stored in the sequence
     def data_as_bytes
-        data = ''
+        data = []
 	data << @status
 	data << @meta_type
 	data << 4
@@ -649,7 +639,7 @@ class KeySig < MetaEvent
     
     # Returns the complete event as stored in the sequence
     def data_as_bytes
-        data = ''
+        data = []
 	data << @status
 	data << @meta_type
 	data << 2

data/lib/midilib/info.rb

@@ -1,9 +1,9 @@
 module MIDI
 
     VERSION_MAJOR = 1
-    VERSION_MINOR = 1
-    VERSION_TWEAK = 4
+    VERSION_MINOR = 2
+    VERSION_TWEAK = 0
     Version = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_TWEAK}"
-    Copyright = 'Copyright (c) 2003-2008 by Jim Menard <jimm@io.com>'
+    Copyright = 'Copyright (c) 2003-2009 by Jim Menard <jimm@io.com>'
 
 end

data/lib/midilib/io/midifile.rb

@@ -1,5 +1,15 @@
 require 'midilib/consts'
 
+if RUBY_VERSION < '1.9'
+  class IO
+    def readbyte
+      c = getc()
+      raise 'unexpected EOF' unless c
+      c
+    end
+  end
+end
+
 module MIDI
 
 module IO
@@ -13,6 +23,9 @@ module IO
 # objects.
 class MIDIFile
 
+    MThd_BYTE_ARRAY = [77, 84, 104, 100] # "MThd"
+    MTrk_BYTE_ARRAY = [77, 84, 114, 107] # "MTrk"
+
     # This array is indexed by the high half of a status byte. Its
     # value is either the number of bytes needed (1 or 2) for a channel
     # message, or 0 if it's not a channel message.
@@ -53,18 +66,18 @@ class MIDIFile
 	ntrks.times { read_track() }
     end
 
-    # This default getc implementation tries to read a single character
+    # This default getc implementation tries to read a single byte
     # from io and returns it as an integer.
-    if RUBY_VERSION >= '1.9'
-	def getc
-	    @bytes_to_be_read -= 1
-	    @io.getc().bytes.first
-	end
-    else
-	def getc
-	    @bytes_to_be_read -= 1
-            @io.getc()
-	end
+    def getc
+      @bytes_to_be_read -= 1
+      @io.readbyte()
+    end
+
+    # Return the next +n+ bytes from @io as an array.
+    def get_bytes(n)
+	buf = []
+	n.times { buf << getc() }
+	buf
     end
 
     # The default error handler.
@@ -144,31 +157,31 @@ class MIDIFile
 
     # Read through 'MThd' or 'MTrk' header string. If skip is true, attempt
     # to skip initial trash. If there is an error, #error is called.
-    def read_mt_header_string(s, skip)
-	b = ''
+    def read_mt_header_string(bytes, skip)
+	b = []
 	bytes_to_read = 4
 	while true
-	    b << @io.read(bytes_to_read)
+	    data = get_bytes(bytes_to_read)
+	    b += data
 	    if b.length < 4
 		error("unexpected EOF while trying to read header" +
 		      " string #{s}")
 	    end
-	    @bytes_to_be_read -= bytes_to_read
 
-	    # See if we found the string we're looking for
-	    return if b == s
+	    # See if we found the bytes we're looking for
+	    return if b == bytes
 
 	    if skip		# Try again with the next char
-		i = b.index(s[0], 1)
+		i = b[1..-1].index(bytes[0])
 		if i.nil?
-		    b = ''
+		    b = []
 		    bytes_to_read = 4
 		else
 		    b = b[i..-1]
 		    bytes_to_read = 4 - i
 		end
 	    else
-		error("header string #{s} not found")
+		error("header string #{bytes.collect{|b| b.chr}.join} not found")
 	    end
 	end
     end
@@ -176,7 +189,7 @@ class MIDIFile
     # Read a header chunk.
     def read_header
 	@bytes_to_be_read = 0
-	read_mt_header_string('MThd', @skip_init)
+	read_mt_header_string(MThd_BYTE_ARRAY, @skip_init) # "MThd"
 
 	@bytes_to_be_read = read32()
 	format = read16()
@@ -187,7 +200,7 @@ class MIDIFile
 
 	# Flush any extra stuff, in case the length of the header is not 6
 	if @bytes_to_be_read > 0
-	    @io.read(@bytes_to_be_read)
+	    get_bytes(@bytes_to_be_read)
 	    @bytes_to_be_read = 0
 	end
 
@@ -202,7 +215,7 @@ class MIDIFile
 	status = 0		# (Possibly running) status byte
 
 	@bytes_to_be_read = 0
-	read_mt_header_string('MTrk', false)
+	read_mt_header_string(MTrk_BYTE_ARRAY, false)
 
 	@bytes_to_be_read = read32()
 	@curr_ticks = @ticks_so_far = 0
@@ -287,11 +300,12 @@ class MIDIFile
 	m = msg()		# Copy of internal message buffer
 
 	# Create raw data array
-	@raw_data = ''
+	@raw_data = []
 	@raw_data << META_EVENT
 	@raw_data << type
 	@raw_data << @raw_var_num_data
 	@raw_data << m
+	@raw_data.flatten!
 
 	case type
 	when META_SEQ_NUM
@@ -375,7 +389,7 @@ class MIDIFile
 
     # Read a varlen value.
     def read_var_len
-	@raw_var_num_data = ''
+	@raw_var_num_data = []
 	c = getc()
 	@raw_var_num_data << c
 	val = c
@@ -414,7 +428,7 @@ class MIDIFile
 	    return
 	end
 
-	buf = Array.new()
+	buf = []
 
 	buf << (val & 0x7f)
 	while (value >>= 7) > 0
@@ -432,14 +446,14 @@ class MIDIFile
     # Read and add a number of bytes to the message buffer. Return
     # the last byte (so we can see if it's an EOX or not).
     def msg_read(n_bytes)
-	@msg_buf << @io.read(n_bytes)
-	@bytes_to_be_read -= n_bytes
+	@msg_buf += get_bytes(n_bytes)
+	@msg_buf.flatten!
 	return @msg_buf[-1]
     end
 
     # Initialize the internal message buffer.
     def msg_init
-	@msg_buf = ''
+	@msg_buf = []
     end
 
     # Return a copy of the internal message buffer.

data/lib/midilib/io/seqwriter.rb

@@ -56,7 +56,7 @@ class SeqWriter
 	    status = possibly_munge_due_to_running_status_byte(data,
 							       prev_status)
 
-	    @bytes_written += @io.write(data)
+	    @bytes_written += write_bytes(data)
 
 	    prev_event = event
 	    prev_status = status
@@ -65,7 +65,7 @@ class SeqWriter
 	# Write track end event.
 	event = MetaEvent.new(META_TRACK_END)
 	write_var_len(0)
-	@bytes_written += @io.write(event.data_as_bytes())
+	@bytes_written += write_bytes(event.data_as_bytes())
 
 	# Go back to beginning of track data and write number of bytes,
 	# then come back here to end of file.
@@ -91,7 +91,7 @@ class SeqWriter
 	# exactly the same, the rest is trivial. If it's note on/note off,
 	# we can combine those further.
 	if status == prev_status
-	    data[0] = ''	# delete status byte from data
+	    data[0,1] = nil	# delete status byte from data
 	    return status + chan
 	elsif status == NOTE_OFF && data[2] == 64
 	    # If we see a note off and the velocity is 64, we can store
@@ -101,7 +101,7 @@ class SeqWriter
 	    data[2] = 0		# set vel to 0; do before possible shrinking
 	    status = NOTE_ON + chan
 	    if prev_status == NOTE_ON
-		data[0] = ''	# delete status byte
+		data[0,1] = []	# delete status byte
 	    else
 		data[0] = status
 	    end
@@ -116,34 +116,36 @@ class SeqWriter
 	event = MetaEvent.new(META_INSTRUMENT, instrument)
 	write_var_len(0)
 	data = event.data_as_bytes()
-	@bytes_written += @io.write(data)
+	@bytes_written += write_bytes(data)
     end
 
     def write_var_len(val)
 	buffer = Utils.as_var_len(val)
-	@bytes_written += @io.write(buffer)
+	@bytes_written += write_bytes(buffer)
     end
 
     def write16(val)
 	val = (-val | 0x8000) if val < 0
 
-	buffer = ''
-	buffer << ((val >> 8) & 0xff)
-	buffer << (val & 0xff)
-
-	@bytes_written += @io.write(buffer)
+	buffer = []
+	@io.putc((val >> 8) & 0xff)
+	@io.putc(val & 0xff)
+	@bytes_written += 2
     end
 
     def write32(val)
 	val = (-val | 0x80000000) if val < 0
 
-	buffer = ''
-	buffer << ((val >> 24) & 0xff)
-	buffer << ((val >> 16) & 0xff)
-	buffer << ((val >> 8) & 0xff)
-	buffer << (val & 0xff)
+	@io.putc((val >> 24) & 0xff)
+	@io.putc((val >> 16) & 0xff)
+	@io.putc((val >> 8) & 0xff)
+	@io.putc(val & 0xff)
+	@bytes_written += 4
+    end
 
-	@bytes_written += @io.write(buffer)
+    def write_bytes(bytes)
+	bytes.each { |b| @io.putc(b) }
+	bytes.length
     end
 end
 

data/lib/midilib/utils.rb

@@ -22,7 +22,7 @@ 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 = []
 	buffer << (val & 0x7f)
 	val = (val >> 7)
 	while val > 0

data/lib/midilib.rb

@@ -3,7 +3,7 @@
 # This is the top-level include file for midilib. You can require this
 # file or require individual files from the midilib directory.
 #
-# See the README file or http://midilib.rubyforge.org for details.
+# See the README.rdoc file or http://midilib.rubyforge.org for details.
 
 require 'midilib/info'
 require 'midilib/sequence'

data/test/test_io.rb

@@ -49,7 +49,8 @@ class IOTester < Test::Unit::TestCase
 
 	puts '    comparing sequences' if $DEBUG
 	compare_sequences(seq0, seq1)
-	File.delete(OUTPUT_FILE)
+      ensure
+	File.delete(OUTPUT_FILE) if File.exist?(OUTPUT_FILE)
     end
 
 end

data/test/test_midifile.rb

@@ -0,0 +1,59 @@
+# Start looking for MIDI classes in the directory above this one.
+# This forces us to use the local copy of MIDI, even if there is
+# a previously installed version out there somewhere.
+$LOAD_PATH[0, 0] = File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'test/unit'
+require 'stringio'
+require 'midilib'
+
+class MIDI::IO::MIDIFile
+  def io=(io)
+    @io = io
+  end
+end
+if RUBY_VERSION < '1.9'
+  class StringIO
+    def readbyte
+      c = getc()
+      raise 'unexpected EOF' unless c
+      c
+    end
+  end
+end
+
+class MIDIFileTester < Test::Unit::TestCase
+
+  def setup
+    @m = MIDI::IO::MIDIFile.new
+  end
+
+  def test_msg_io
+    io = StringIO.new
+    io.write("abcdef")
+    io.rewind()
+    @m.io = io
+    @m.msg_init
+    @m.msg_read(6)
+    assert_equal [97, 98, 99, 100, 101, 102], @m.msg
+  end
+
+  def test_read32
+    io = StringIO.new
+    io.write("\0\0\0\6")
+    io.rewind()
+    @m.io = io
+    assert_equal 6, @m.read32()
+  end
+
+  def test_write32
+    io = StringIO.new
+    old_stdout = $stdout
+    $stdout = io
+    @m.write32(6)
+    $stdout = old_stdout
+    io.rewind()
+    assert_equal "\0\0\0\6", io.string
+  end
+
+end

data/test/test_varlen.rb

@@ -1,11 +1,11 @@
-require 'midilib'
-require 'test/unit'
-
 # Start looking for MIDI classes in the directory above this one.
 # This forces us to use the local copy of MIDI, even if there is
 # a previously installed version out there somewhere.
 $LOAD_PATH[0, 0] = File.join(File.dirname(__FILE__), '..', 'lib')
 
+require 'test/unit'
+require 'midilib'
+
 class VarLenTester < Test::Unit::TestCase
 
     VAR_LEN_TEST_DATA = {
@@ -25,7 +25,7 @@ class VarLenTester < Test::Unit::TestCase
 
     def num_to_var_len(num, answer)
 	varlen = MIDI::Utils.as_var_len(num)
-	varlen.reverse.each_byte { | b |
+	varlen.reverse.each { | b |
 	    assert_equal(answer & 0xff, b)
 	    answer = answer >> 8
 	}