different getnote defaults for different formats

Closes #114
JuliaMusic · Nov 7, 2019 · c53e4a6 · c53e4a6 · Datseris · Nov 7, 2019
1 parent a9ac7b7
commit c53e4a6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MIDI"
 uuid = "f57c4921-e30c-5f49-b073-3f2f2ada663e"
 repo = "https://github.com/JuliaMusic/MIDI.jl.git"
-version = "1.5.0"
+version = "1.5.1"
 
 [deps]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

diff --git a/src/midifile.jl b/src/midifile.jl
@@ -161,4 +161,5 @@ on the beats per minute `bpm` and ticks per quarter note `tpq`.
 ms_per_tick(midi::MIDI.MIDIFile, bpm = BPM(midi)) = ms_per_tick(midi.tpq, bpm)
 ms_per_tick(tpq, bpm) = (1000*60)/(bpm*tpq)
 
-getnotes(midi::MIDIFile, trackno = 2) = getnotes(midi.tracks[trackno], midi.tpq)
+getnotes(midi::MIDIFile, trackno = midi.format == 0 ? 1 : 2) = 
+getnotes(midi.tracks[trackno], midi.tpq)
diff --git a/src/miditrack.jl b/src/miditrack.jl
@@ -260,12 +260,13 @@ end
 
 
 """
-    getnotes(midi::MIDIFile, trackno = 2)
+    getnotes(midi::MIDIFile [, trackno])
 
-Find all NOTEON and NOTEOFF midi events in the `trackno` track of a `midi`,
+Find all NOTEON and NOTEOFF midi events in the `trackno` track of a `midi`
+(default 1 or 2),
 that correspond to the same note value (pitch) and convert them into
-the `Note` datatype. There are special cases where NOTEOFF is actually encoded as NOTEON with 0 velocity.
-`getnotes` takes care of this.
+the `Note` datatype. There are special cases where NOTEOFF is actually
+encoded as NOTEON with 0 velocity, but `getnotes` takes care of this.
 
 Notice that the first track of a `midi` typically doesn't have any notes,
 which is why the function defaults to track 2.