midilib 0.8.7 → 1.0.0

data/ChangeLog

@@ -1,3 +1,8 @@
+2007-03-17  Jim Menard  <jimm@io.com>
+
+	* Version 1.0.0 released. I will no longer be maintaining this
+	change log; the Subversion comments should be sufficient.
+	
 2006-08-20  Jim Menard  <jimm@io.com>
 
 	* lib/midilib/event.rb (PolyPressure::initialize): Fixed the

data/Credits

@@ -15,3 +15,7 @@ Mike Hall <m3ha11@rcn.com>
 Emanuel Borsboom <emanuel.borsboom@gmail.com>
 
     Found and fixed an error in PitchBend data encoding.
+
+Christopher Rose <cmr@synopsys.com>
+
+    Found bug in Track#recalc_delta_from_times.

data/README

@@ -10,72 +10,6 @@ project page is http://rubyforge.org/projects/midilib, where the latest
 version of midilib may be downloaded. midilib is also available as a RubyGem.
 
 
-=== Recent Changes
-
-==== Changes for 0.8.7:
-
-* Fixed the misspelled POLY_PRESSURE constant, thanks to Mario Pehle.
-
-==== Changes for 0.8.6:
-
-* Added missing test/test.mid.
-
-==== Changes for 0.8.5:
-
-* Fixed bugs in MIDI::PitchBend reading and writing, thanks to Emanuel
-  Borsboom.
-
-* Fixed a bug in MIDI::Track#quantize.
-
-* The argument to MIDI::Track#quantize has changed: it is now either a note
-  name ("sixteenth", "32nd", "8th triplet") or a length (1 = quarter, 0.25 =
-  sixteenth). This is a drastic change that will break all previous calls to
-  quantize. However, since that method was broken already, I don't feel it's
-  a burden to anybody to change the arguments.
-
-==== Changes for 0.8.4:
-
-* Realtime status bytes now set @is_realtime to true and return true when
-  realtime? is called.
-
-* All system common events now set @is_system to true and return true when
-  system? is called, not just system exclusive events.
-
-* Added examples/from_scratch.rb, which shows how to create a sequence
-  manually.
-
-* New MIDI::Sequence methods that turn note length names like "32nd", "dotted
-  quarter", and "16th triplet" into delta times. See the docs below and
-  MIDI::Sequence::length_to_delta, MIDI::Sequence::note_to_length, and
-  MIDI::Sequence::note_to_delta.
-
-
-==== Changes for 0.8.3:
-
-* Added MIDI::NoteEvent.note_to_s, which returns note name as a string like
-  "C4" or "F#6".
-
-* Added new boolean attributes to MIDI::Event: @print_decimal_numbers and
-  @print_note_names. These are used by all Event to_s methods. See
-  examples/seq2text.rb for an example.
-
-==== Changes for 0.8.2:
-
-* Changed MIDI::MetaEvent.type to MIDI::MetaEvent.event_type to avoid
-  runtime complaints about Object#type calls.
-* Added 'b' binary flag to file open modes for Windows.
-* Fixed $LOAD_PATH in example files.
-* Fixed read and write block arguments.
-* Fixed other example script bugs.
-
-==== Changes for 0.8.1:
-
-* Fixed track sorting.
-* Fixed track's recalc_delta_from_times method.
-* Fixed event quantization.
-* More tests and documentation.
-
-
 == Dependencies
 
 midilib does not require any other packages. The test suite in the tests
@@ -379,6 +313,76 @@ Copyright (c) 1992 by Jim Menard (jimm@io.com). It may be freely used for
 non-commercial purposes as long as the author is given credit.
 
 
+=== Recent Changes
+
+==== Changes for 1.0.0:
+
+* Fixed the bug in Track#recalc_delta_from_times found by Christopher Rose.
+
+==== Changes for 0.8.7:
+
+* Fixed the misspelled POLY_PRESSURE constant, thanks to Mario Pehle.
+
+==== Changes for 0.8.6:
+
+* Added missing test/test.mid.
+
+==== Changes for 0.8.5:
+
+* Fixed bugs in MIDI::PitchBend reading and writing, thanks to Emanuel
+  Borsboom.
+
+* Fixed a bug in MIDI::Track#quantize.
+
+* The argument to MIDI::Track#quantize has changed: it is now either a note
+  name ("sixteenth", "32nd", "8th triplet") or a length (1 = quarter, 0.25 =
+  sixteenth). This is a drastic change that will break all previous calls to
+  quantize. However, since that method was broken already, I don't feel it's
+  a burden to anybody to change the arguments.
+
+==== Changes for 0.8.4:
+
+* Realtime status bytes now set @is_realtime to true and return true when
+  realtime? is called.
+
+* All system common events now set @is_system to true and return true when
+  system? is called, not just system exclusive events.
+
+* Added examples/from_scratch.rb, which shows how to create a sequence
+  manually.
+
+* New MIDI::Sequence methods that turn note length names like "32nd", "dotted
+  quarter", and "16th triplet" into delta times. See the docs below and
+  MIDI::Sequence::length_to_delta, MIDI::Sequence::note_to_length, and
+  MIDI::Sequence::note_to_delta.
+
+
+==== Changes for 0.8.3:
+
+* Added MIDI::NoteEvent.note_to_s, which returns note name as a string like
+  "C4" or "F#6".
+
+* Added new boolean attributes to MIDI::Event: @print_decimal_numbers and
+  @print_note_names. These are used by all Event to_s methods. See
+  examples/seq2text.rb for an example.
+
+==== Changes for 0.8.2:
+
+* Changed MIDI::MetaEvent.type to MIDI::MetaEvent.event_type to avoid
+  runtime complaints about Object#type calls.
+* Added 'b' binary flag to file open modes for Windows.
+* Fixed $LOAD_PATH in example files.
+* Fixed read and write block arguments.
+* Fixed other example script bugs.
+
+==== Changes for 0.8.1:
+
+* Fixed track sorting.
+* Fixed track's recalc_delta_from_times method.
+* Fixed event quantization.
+* More tests and documentation.
+
+
 == Warranty
 
 This software is provided "as is" and without any express or implied

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rubygems'
-require_gem 'rake'
+require 'rake'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'

data/lib/midilib/info.rb

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

data/lib/midilib/track.rb

@@ -95,9 +95,14 @@ class Track
 
     # The opposite of recalc_times: recalculates delta_time for each event
     # from each event's time_from_start. This is useful, for example, when
-    # merging two event lists.
+    # merging two event lists. As a side-effect, elements from starting_at
+    # are sorted by time_from_start.
     def recalc_delta_from_times(starting_at=0, list=@events)
 	prev_time_from_start = 0
+	# We need to sort the sublist. sublist.sort! does not do what we want.
+	list[starting_at .. -1] = list[starting_at .. -1].sort { | e1, e2 |
+	    e1.time_from_start <=> e2.time_from_start
+	}
 	list[starting_at .. -1].each { | e |
 	    e.delta_time = e.time_from_start - prev_time_from_start
 	    prev_time_from_start = e.time_from_start

data/test/test_track.rb

@@ -88,6 +88,19 @@ class TrackTester < Test::Unit::TestCase
 	@track.each { | event | assert_equal(100, event.delta_time) }
     end
 
+    def test_recalc_delta_from_times_unsorted
+      @track.events[0].time_from_start = 100
+      @track.events[1].time_from_start = 50
+      @track.events[2].time_from_start = 150
+      @track.recalc_delta_from_times
+      prev_start_time = 0
+      @track.each { | event |
+        assert(prev_start_time <= event.time_from_start)
+        assert(event.delta_time > 0)
+        prev_start_time = event.time_from_start
+      }
+    end
+
     def test_sort
 	e = @track.events[0]
 	e.time_from_start = 300

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
+rubygems_version: 0.9.2
 specification_version: 1
 name: midilib
 version: !ruby/object:Gem::Version 
-  version: 0.8.7
-date: 2007-02-18 00:00:00 -05:00
+  version: 1.0.0
+date: 2007-03-17 00:00:00 -04:00
 summary: MIDI file and event manipulation library
 require_paths: 
 - lib