X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooNote.java;fp=MooNote.java;h=34b0f2f25686e58404dea954116036ea482050d1;hp=57cf86c8529c9fef5ce0e59726b6c944f83ebc04;hb=e7289eb46e09ee6ed3bc5bb4a814f59902d885cb;hpb=f7097bc07b6688d1629e6894c1c42dc06485dc12 diff --git a/MooNote.java b/MooNote.java index 57cf86c..34b0f2f 100644 --- a/MooNote.java +++ b/MooNote.java @@ -175,6 +175,8 @@ public class MooNote extends MidiEvent implements Cloneable, Comparable { * @return a negative integer, zero, or a positive integer as this object is less than, equal to, or greater than the specified object */ public int compareTo(Object o) { - return (int)(getTick() - ((MidiEvent)o).getTick()); + int diff = (int)(getTick() - ((MidiEvent)o).getTick()); + if (diff != 0) return diff; + return (noteOnMsg.getData1() - ((ShortMessage)((MidiEvent)o).getMessage()).getData1()); } }