inte helt klar

[moosique.git] / MooNote.java

diff --git a/MooNote.java b/MooNote.java
index 6ea6c39b6b6bfb369d6feca755dc194846dc5f06..d401aa7de424e51250c95d5ae90b881c33370df8 100644 (file)
--- a/MooNote.java
+++ b/MooNote.java
@@ -29,7 +29,7 @@ public class MooNote extends MidiEvent {
         */
        public MooNote (MidiEvent noteOnEvent, MidiEvent noteOffEvent) {
                super(noteOnEvent.getMessage(), noteOnEvent.getTick());
-               noteOffEvent = new MidiEvent(noteOffEvent.getMessage(), noteOffEvent.getTick());
+               this.noteOffEvent = noteOffEvent;
                noteOnMsg = (ShortMessage)getMessage();
                noteOffMsg = (ShortMessage)noteOffEvent.getMessage();
        }
@@ -61,7 +61,7 @@ public class MooNote extends MidiEvent {
        public void setChannel(int channel) {
                try {
                        noteOnMsg.setMessage(noteOnMsg.getCommand(), (byte)channel, noteOnMsg.getData1(), noteOnMsg.getData2());
-                       noteOffMsg.setMessage(noteOffMsg.getCommand(), (byte)channel, noteOffMsg.getData1(), noteOffMsg.getData2());
+                       if(hasNoteOffEvent()) noteOffMsg.setMessage(noteOffMsg.getCommand(), (byte)channel, noteOffMsg.getData1(), noteOffMsg.getData2());
                } catch (InvalidMidiDataException e) {}
        }
 
@@ -72,7 +72,7 @@ public class MooNote extends MidiEvent {
        public void setPitch(int pitch) {
                try {
                        noteOnMsg.setMessage(noteOnMsg.getCommand(), noteOnMsg.getChannel(), (byte)pitch, noteOnMsg.getData2());
-                       noteOffMsg.setMessage(noteOffMsg.getCommand(), noteOffMsg.getChannel(), (byte)pitch, noteOffMsg.getData2());
+                       if(hasNoteOffEvent()) noteOffMsg.setMessage(noteOffMsg.getCommand(), noteOffMsg.getChannel(), (byte)pitch, noteOffMsg.getData2());
                } catch (InvalidMidiDataException e) {}
        }
 
@@ -83,7 +83,7 @@ public class MooNote extends MidiEvent {
        public void setVelocity(int vel) {
                try {
                        noteOnMsg.setMessage(noteOnMsg.getCommand(), noteOnMsg.getChannel(), noteOnMsg.getData1(), (byte)vel);
-                       noteOffMsg.setMessage(noteOffMsg.getCommand(), noteOffMsg.getChannel(), noteOffMsg.getData1(), noteOffMsg.getData2());
+                       if(hasNoteOffEvent()) noteOffMsg.setMessage(noteOffMsg.getCommand(), noteOffMsg.getChannel(), noteOffMsg.getData1(), noteOffMsg.getData2());
                } catch (InvalidMidiDataException e) {}
        }
 
@@ -134,7 +134,7 @@ public class MooNote extends MidiEvent {
         */
        public int getDuration() {
                if (!hasNoteOffEvent()) return 0;
-               return (int)(getTick() - noteOffEvent.getTick());
+               return (int)(noteOffEvent.getTick() - getTick());
        }
 
        /** 
@@ -142,6 +142,16 @@ public class MooNote extends MidiEvent {
         * @return      the note off MidiEvent
         */
        public boolean hasNoteOffEvent() {
-               return noteOffEvent == null;
+               return noteOffEvent != null;
        }
-}
\ No newline at end of file
+
+       public void addTo(Track track){
+               track.add(this);
+               if (hasNoteOffEvent()) track.add(noteOffEvent);
+       }
+       
+       public void removeFrom(Track track){
+               track.remove(this);
+               if (hasNoteOffEvent()) track.remove(noteOffEvent);
+       }
+}