midilib 2.0.5 → 3.0.1

data/test/test_io.rb

@@ -7,12 +7,13 @@ $LOAD_PATH[0, 0] = File.dirname(__FILE__)
 
 require 'test/unit'
 require 'midilib'
+require 'midilib/consts'
 require 'event_equality'
 
 class IOTester < Test::Unit::TestCase
-
   SEQ_TEST_FILE = File.join(File.dirname(__FILE__), 'test.mid')
   OUTPUT_FILE = 'testout.mid'
+  TEMPFILE = '/tmp/midilib_test.mid'
 
   def compare_tracks(t0, t1)
     assert_equal(t0.name, t1.name, 'track names differ')
@@ -29,17 +30,70 @@ class IOTester < Test::Unit::TestCase
     s0.each_with_index { |track0, i| compare_tracks(track0, s1.tracks[i]) }
   end
 
+  def compare_sequences_format_0(multitrack_seq, format0_seq)
+    assert_equal(multitrack_seq.name, format0_seq.name, 'sequence names differ')
+    assert_equal(1, format0_seq.tracks.length, 'number of tracks differ')
+    format_1_count = multitrack_seq.tracks.map { |t| t.events.count }.reduce(:+)
+    format_0_count = format0_seq.tracks.map { |t| t.events.count }.reduce(:+)
+    assert_equal(format_1_count, format_0_count, 'same number of total events')
+  end
+
   def test_read_and_write
-    seq0 = MIDI::Sequence.new()
+    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()
+    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_and_write_format_0
+    seq0 = MIDI::Sequence.new
+    File.open(SEQ_TEST_FILE, 'rb') { |f| seq0.read(f) }
+    File.open(OUTPUT_FILE, 'wb') { |f| seq0.write(f, 0) }
+    seq1 = MIDI::Sequence.new
+    File.open(OUTPUT_FILE, 'rb') { |f| seq1.read(f) }
+    compare_sequences_format_0(seq0, seq1)
+  ensure
+    File.delete(OUTPUT_FILE) if File.exist?(OUTPUT_FILE)
+  end
+
+  def test_read_callback
+    seq = MIDI::Sequence.new
+    names = []
+    num_tracks = -1
+    File.open(SEQ_TEST_FILE, 'rb') do |f|
+      seq.read(f) do |track, ntracks, i|
+        names << (track ? track.name : nil)
+        num_tracks = ntracks
+      end
+    end
+    assert_equal(names, [nil, 'Sequence Name', 'My New Track'])
+    assert_equal(num_tracks, 2)
+  ensure
+    File.delete(OUTPUT_FILE) if File.exist?(OUTPUT_FILE)
+  end
+
+  def test_write_callback
+    seq = MIDI::Sequence.new
+    File.open(SEQ_TEST_FILE, 'rb') { |f| seq.read(f) }
+
+    names = []
+    num_tracks = -1
+    File.open(OUTPUT_FILE, 'wb') do |f|
+      seq.write(f) do |track, ntracks, i|
+        names << (track ? track.name : nil)
+        num_tracks = ntracks
+      end
+    end
+    assert_equal(names, [nil, 'Sequence Name', 'My New Track'])
+    assert_equal(num_tracks, 2)
+  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) }
@@ -47,4 +101,30 @@ class IOTester < Test::Unit::TestCase
     assert_equal(MIDI::GM_PATCH_NAMES[0], seq.tracks[1].instrument)
   end
 
+  def test_preserve_meta_deltas
+    out_seq = MIDI::Sequence.new
+    out_track = MIDI::Track.new(out_seq)
+    out_seq.tracks << out_track
+    out_track.events << MIDI::Tempo.new(MIDI::Tempo.bpm_to_mpq(120))
+    # Normally copyright and sequence name events are at time 0, but non-zero
+    # start times are allowed.
+    out_track.events << MIDI::MetaEvent.new(MIDI::META_COPYRIGHT, '(C) 1950 Donald Duck', 100)
+    out_track.events << MIDI::MetaEvent.new(MIDI::META_SEQ_NAME, 'Quack, Track 1', 200)
+    out_track.events << MIDI::NoteOn.new(0, 64, 127, 0)
+    out_track.events << MIDI::NoteOff.new(0, 64, 127, 100)
+    File.open('/tmp/midilib_test.mid', 'wb') { |file| out_seq.write(file) }
+
+    # Although start times are not written out to the MIDI file, we
+    # calculate them because we are about to compare the out events with the
+    # newly-read events which will have their start times set.
+    out_track.recalc_times
+
+    in_seq = MIDI::Sequence.new
+    File.open(TEMPFILE, 'rb') { |file| in_seq.read(file) }
+    in_track = in_seq.tracks[0]
+    assert_equal(out_track.events.length, in_track.events.length)
+    out_track.events.each_with_index do |event, i|
+      assert_equal(event, in_track.events[i])
+    end
+  end
 end

data/test/test_mergesort.rb

@@ -0,0 +1,37 @@
+# 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/mergesort'
+
+class MergesortTester < Test::Unit::TestCase
+  def test_mergesort
+    track = MIDI::Track.new(nil)
+    track.events = []
+
+    # Two events with later start times but earlier in the event list
+    e2 = MIDI::NoteOff.new(0, 64, 64, 100)
+    e2.time_from_start = 100
+    track.events << e2
+
+    e3 = MIDI::NoteOn.new(0, 64, 64, 100)
+    e3.time_from_start = 100
+    track.events << e3
+
+    # Earliest start time, latest in the list of events
+    e1 = MIDI::NoteOn.new(0, 64, 64, 100)
+    e1.time_from_start = 0
+    track.events << e1
+
+    # Recalc sorts. Make sure note off/note on pair at t 100 are in the
+    # correct order.
+    track.recalc_delta_from_times
+
+    # These tests would fail before we moved to mergesort.
+    assert_equal(e1, track.events[0])
+    assert_equal(e2, track.events[1])
+    assert_equal(e3, track.events[2])
+  end
+end

data/test/test_midifile.rb

@@ -8,30 +8,18 @@ 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
+  attr_writer :io
 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()
+    io.write('abcdef')
+    io.rewind
     @m.io = io
     @m.msg_init
     @m.msg_read(6)
@@ -41,9 +29,9 @@ class MIDIFileTester < Test::Unit::TestCase
   def test_read32
     io = StringIO.new
     io.write("\0\0\0\6")
-    io.rewind()
+    io.rewind
     @m.io = io
-    assert_equal 6, @m.read32()
+    assert_equal 6, @m.read32
   end
 
   def test_write32
@@ -52,8 +40,7 @@ class MIDIFileTester < Test::Unit::TestCase
     $stdout = io
     @m.write32(6)
     $stdout = old_stdout
-    io.rewind()
+    io.rewind
     assert_equal "\0\0\0\6", io.string
   end
-
 end

data/test/test_sequence.rb

@@ -7,7 +7,6 @@ require 'test/unit'
 require 'midilib'
 
 class SequenceTester < Test::Unit::TestCase
-
   def setup
     @seq = MIDI::Sequence.new
     @track = MIDI::Track.new(@seq)
@@ -28,10 +27,10 @@ class SequenceTester < Test::Unit::TestCase
     assert_in_delta 0.5, @seq.pulses_to_seconds(480), 0.00001
 
     # A half note should take one second
-    assert_in_delta 1.0, @seq.pulses_to_seconds(480*2), 0.00001
+    assert_in_delta 1.0, @seq.pulses_to_seconds(480 * 2), 0.00001
 
     # An eight note should take 0.25 seconds
-    assert_in_delta 0.25, @seq.pulses_to_seconds(480/2), 0.00001
+    assert_in_delta 0.25, @seq.pulses_to_seconds(480 / 2), 0.00001
   end
 
   def test_length_to_delta
@@ -43,7 +42,9 @@ class SequenceTester < Test::Unit::TestCase
     assert_equal(12, @seq.ppqn)
     assert_equal(12, @seq.length_to_delta(1))
     assert_equal(6, @seq.length_to_delta(0.5))
-    assert_equal(5, @seq.length_to_delta(0.49))
+    # rounding tests
+    assert_equal(6, @seq.length_to_delta(0.49))
+    assert_equal(5, @seq.length_to_delta(0.45))
   end
 
   def test_note_to_length

data/test/test_track.rb

@@ -7,7 +7,6 @@ require 'test/unit'
 require 'midilib'
 
 class TrackTester < Test::Unit::TestCase
-
   def setup
     @seq = MIDI::Sequence.new
     @track = MIDI::Track.new(@seq)
@@ -20,7 +19,7 @@ class TrackTester < Test::Unit::TestCase
     assert_equal(3, @track.events.length)
     3.times do |i|
       assert_equal(100, @track.events[i].delta_time)
-      assert_equal((i+1) * 100, @track.events[i].time_from_start)
+      assert_equal((i + 1) * 100, @track.events[i].time_from_start)
     end
     assert_equal(MIDI::Track::UNNAMED, @track.name)
   end
@@ -30,7 +29,7 @@ class TrackTester < Test::Unit::TestCase
     @track.recalc_times
     assert_equal(4, @track.events.length)
     4.times do |i|
-      assert_equal((i+1) * 100, @track.events[i].time_from_start)
+      assert_equal((i + 1) * 100, @track.events[i].time_from_start)
     end
   end
 
@@ -41,17 +40,17 @@ class TrackTester < Test::Unit::TestCase
 
     3.times do |i|
       assert_equal(100, @track.events[i].delta_time)
-      assert_equal((i+1) * 100, @track.events[i].time_from_start)
+      assert_equal((i + 1) * 100, @track.events[i].time_from_start)
     end
     12.times do |i|
       assert_equal(3, @track.events[3 + i].delta_time)
-      assert_equal(300 + ((i+1) * 3),
+      assert_equal(300 + ((i + 1) * 3),
                    @track.events[3 + i].time_from_start)
     end
   end
 
   def test_insert
-    @track.events[1,0] = MIDI::NoteOn.new(0, 64, 64, 3)
+    @track.events[1, 0] = MIDI::NoteOn.new(0, 64, 64, 3)
     @track.recalc_times
     assert_equal(100, @track.events[0].time_from_start)
     assert_equal(103, @track.events[1].time_from_start)
@@ -124,8 +123,8 @@ class TrackTester < Test::Unit::TestCase
   def test_quantize
     @seq.ppqn = 80
 
-    @track.quantize(1)	# Quantize to a quarter note
-    assert_equal(80, @track.events[0].time_from_start) # was 100
+    @track.quantize(1) # Quantize to a quarter note
+    assert_equal(80, @track.events[0].time_from_start)  # was 100
     assert_equal(240, @track.events[1].time_from_start) # was 200
     assert_equal(320, @track.events[2].time_from_start) # was 300
   end
@@ -137,36 +136,8 @@ class TrackTester < Test::Unit::TestCase
 
   def test_old_note_class_names
     x = MIDI::NoteOn.new(0, 64, 64, 10)
-    assert(x.kind_of?(MIDI::NoteOnEvent))  # old name
+    assert(x.is_a?(MIDI::NoteOnEvent))  # old name
     x = MIDI::NoteOff.new(0, 64, 64, 10)
-    assert(x.kind_of?(MIDI::NoteOffEvent)) # old name
-  end
-
-  def test_mergesort
-    @track.events = []
-
-    # Two events with later start times but earlier in the event list
-    e2 = MIDI::NoteOff.new(0, 64, 64, 100)
-    e2.time_from_start = 100
-    @track.events << e2
-
-    e3 = MIDI::NoteOn.new(0, 64, 64, 100)
-    e3.time_from_start = 100
-    @track.events << e3
-
-    # Earliest start time, latest in the list of events
-    e1 = MIDI::NoteOn.new(0, 64, 64, 100)
-    e1.time_from_start = 0
-    @track.events << e1
-
-    # Recalc sorts. Make sure note off/note on pair at t 100 are in the
-    # correct order.
-    @track.recalc_delta_from_times
-    
-    # These tests would fail before we moved to mergesort.
-    assert_equal(e1, @track.events[0])
-    assert_equal(e2, @track.events[1])
-    assert_equal(e3, @track.events[2])
-
+    assert(x.is_a?(MIDI::NoteOffEvent)) # old name
   end
 end

data/test/test_varlen.rb

@@ -7,7 +7,6 @@ require 'test/unit'
 require 'midilib'
 
 class VarLenTester < Test::Unit::TestCase
-
   VAR_LEN_TEST_DATA = {
     0x00000000 => 0x00,
     0x00000040 => 0x40,
@@ -20,7 +19,7 @@ class VarLenTester < Test::Unit::TestCase
     0x001FFFFF => 0xFFFF7F,
     0x00200000 => 0x81808000,
     0x08000000 => 0xC0808000,
-    0x0FFFFFFF => 0xFFFFFF7F,
+    0x0FFFFFFF => 0xFFFFFF7F
   }
 
   def num_to_var_len(num, answer)
@@ -34,5 +33,4 @@ class VarLenTester < Test::Unit::TestCase
   def test_num_to_var_len
     VAR_LEN_TEST_DATA.each { |varlen, answer| num_to_var_len(varlen, answer) }
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midilib
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.1
 platform: ruby
 authors:
 - Jim Menard
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2022-09-04 00:00:00.000000000 Z
 dependencies: []
 description: |
   midilib is a pure Ruby MIDI library useful for reading and
@@ -35,94 +35,6 @@ files:
 - examples/split.rb
 - examples/strings.rb
 - examples/transpose.rb
-- html/IO.html
-- html/MIDI.html
-- html/MIDI/ActiveSense.html
-- html/MIDI/ChannelEvent.html
-- html/MIDI/ChannelPressure.html
-- html/MIDI/Clock.html
-- html/MIDI/Continue.html
-- html/MIDI/Controller.html
-- html/MIDI/Event.html
-- html/MIDI/IO.html
-- html/MIDI/IO/MIDIFile.html
-- html/MIDI/IO/SeqReader.html
-- html/MIDI/IO/SeqWriter.html
-- html/MIDI/KeySig.html
-- html/MIDI/MIDI.html
-- html/MIDI/MIDI/MIDI.html
-- html/MIDI/MIDI/MIDI/Array.html
-- html/MIDI/Marker.html
-- html/MIDI/Measure.html
-- html/MIDI/Measures.html
-- html/MIDI/MetaEvent.html
-- html/MIDI/NoteEvent.html
-- html/MIDI/NoteOff.html
-- html/MIDI/NoteOn.html
-- html/MIDI/PitchBend.html
-- html/MIDI/PolyPressure.html
-- html/MIDI/ProgramChange.html
-- html/MIDI/Realtime.html
-- html/MIDI/Sequence.html
-- html/MIDI/SongPointer.html
-- html/MIDI/SongSelect.html
-- html/MIDI/Start.html
-- html/MIDI/Stop.html
-- html/MIDI/SystemCommon.html
-- html/MIDI/SystemExclusive.html
-- html/MIDI/SystemReset.html
-- html/MIDI/Tempo.html
-- html/MIDI/TimeSig.html
-- html/MIDI/Track.html
-- html/MIDI/TuneRequest.html
-- html/MIDI/Utils.html
-- html/README_rdoc.html
-- html/TODO_rdoc.html
-- html/created.rid
-- html/css/fonts.css
-- html/css/rdoc.css
-- html/fonts/Lato-Light.ttf
-- html/fonts/Lato-LightItalic.ttf
-- html/fonts/Lato-Regular.ttf
-- html/fonts/Lato-RegularItalic.ttf
-- html/fonts/SourceCodePro-Bold.ttf
-- html/fonts/SourceCodePro-Regular.ttf
-- html/images/add.png
-- html/images/arrow_up.png
-- html/images/brick.png
-- html/images/brick_link.png
-- html/images/bug.png
-- html/images/bullet_black.png
-- html/images/bullet_toggle_minus.png
-- html/images/bullet_toggle_plus.png
-- html/images/date.png
-- html/images/delete.png
-- html/images/find.png
-- html/images/loadingAnimation.gif
-- html/images/macFFBgHack.png
-- html/images/package.png
-- html/images/page_green.png
-- html/images/page_white_text.png
-- html/images/page_white_width.png
-- html/images/plugin.png
-- html/images/ruby.png
-- html/images/tag_blue.png
-- html/images/tag_green.png
-- html/images/transparent.png
-- html/images/wrench.png
-- html/images/wrench_orange.png
-- html/images/zoom.png
-- html/index.html
-- html/js/darkfish.js
-- html/js/jquery.js
-- html/js/navigation.js
-- html/js/navigation.js.gz
-- html/js/search.js
-- html/js/search_index.js
-- html/js/search_index.js.gz
-- html/js/searcher.js
-- html/js/searcher.js.gz
-- html/table_of_contents.html
 - install.rb
 - lib/midilib.rb
 - lib/midilib/consts.rb
@@ -132,6 +44,7 @@ files:
 - lib/midilib/io/seqreader.rb
 - lib/midilib/io/seqwriter.rb
 - lib/midilib/measure.rb
+- lib/midilib/mergesort.rb
 - lib/midilib/sequence.rb
 - lib/midilib/track.rb
 - lib/midilib/utils.rb
@@ -139,6 +52,7 @@ files:
 - test/test.mid
 - test/test_event.rb
 - test/test_io.rb
+- test/test_mergesort.rb
 - test/test_midifile.rb
 - test/test_sequence.rb
 - test/test_track.rb
@@ -147,7 +61,7 @@ homepage: http://github.com/jimm/midilib
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -165,9 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubyforge_project: midilib
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: MIDI file and event manipulation library
 test_files: []

data/html/IO.html

@@ -1,155 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-<meta charset="UTF-8">
-
-<title>class IO - midilib</title>
-
-<script type="text/javascript">
-  var rdoc_rel_prefix = "./";
-</script>
-
-<script src="./js/jquery.js"></script>
-<script src="./js/darkfish.js"></script>
-
-<link href="./css/fonts.css" rel="stylesheet">
-<link href="./css/rdoc.css" rel="stylesheet">
-
-
-
-<body id="top" role="document" class="class">
-<nav role="navigation">
-  <div id="project-navigation">
-    <div id="home-section" role="region" title="Quick navigation" class="nav-section">
-  <h2>
-    <a href="./index.html" rel="home">Home</a>
-  </h2>
-
-  <div id="table-of-contents-navigation">
-    <a href="./table_of_contents.html#pages">Pages</a>
-    <a href="./table_of_contents.html#classes">Classes</a>
-    <a href="./table_of_contents.html#methods">Methods</a>
-  </div>
-</div>
-
-    <div id="search-section" role="search" class="project-section initially-hidden">
-  <form action="#" method="get" accept-charset="utf-8">
-    <div id="search-field-wrapper">
-      <input id="search-field" role="combobox" aria-label="Search"
-             aria-autocomplete="list" aria-controls="search-results"
-             type="text" name="search" placeholder="Search" spellcheck="false"
-             title="Type to search, Up and Down to navigate, Enter to load">
-    </div>
-
-    <ul id="search-results" aria-label="Search Results"
-        aria-busy="false" aria-expanded="false"
-        aria-atomic="false" class="initially-hidden"></ul>
-  </form>
-</div>
-
-  </div>
-
-  
-
-  <div id="class-metadata">
-    
-    <div id="parent-class-section" class="nav-section">
-  <h3>Parent</h3>
-
-  
-  <p class="link">Object
-  
-</div>
-
-    
-    
-    <!-- Method Quickref -->
-<div id="method-list-section" class="nav-section">
-  <h3>Methods</h3>
-
-  <ul class="link-list" role="directory">
-    
-    <li ><a href="#method-i-readbyte">#readbyte</a>
-    
-  </ul>
-</div>
-
-  </div>
-</nav>
-
-<main role="main" aria-labelledby="class-IO">
-  <h1 id="class-IO" class="class">
-    class IO
-  </h1>
-
-  <section class="description">
-    
-  </section>
-
-  
-  
-  
-  <section id="5Buntitled-5D" class="documentation-section">
-    
-
-    
-
-    
-
-    
-
-    
-     <section id="public-instance-5Buntitled-5D-method-details" class="method-section">
-       <header>
-         <h3>Public Instance Methods</h3>
-       </header>
-
-    
-      <div id="method-i-readbyte" class="method-detail ">
-        
-        <div class="method-heading">
-          <span class="method-name">readbyte</span><span
-            class="method-args">()</span>
-          
-          <span class="method-click-advice">click to toggle source</span>
-          
-        </div>
-        
-
-        <div class="method-description">
-          
-          
-          
-          
-
-          
-          <div class="method-source-code" id="readbyte-source">
-            <pre><span class="ruby-comment"># File lib/midilib/io/midifile.rb, line 5</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier">readbyte</span>
-  <span class="ruby-identifier">c</span> = <span class="ruby-identifier">getc</span>()
-  <span class="ruby-identifier">raise</span> <span class="ruby-string">&#39;unexpected EOF&#39;</span> <span class="ruby-keyword">unless</span> <span class="ruby-identifier">c</span>
-  <span class="ruby-identifier">c</span>
-<span class="ruby-keyword">end</span></pre>
-          </div>
-          
-        </div>
-
-        
-
-        
-      </div>
-
-    
-    </section>
-  
-  </section>
-</main>
-
-
-<footer id="validator-badges" role="contentinfo">
-  <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
-  <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
-</footer>
-