X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNote.java;h=d401aa7de424e51250c95d5ae90b881c33370df8;hb=25c9037957d73abed0be470e7b05a10c1c71e3c3;hp=d942de93a6e1e7c6dd455f153833bfbe73fa5e26;hpb=48b314acf130d347f3c0e01ca7d8e9e90b5eb3b5;p=moosique.git

diff --git a/MooNote.java b/MooNote.java
index d942de9..d401aa7 100644
--- a/MooNote.java
+++ b/MooNote.java
@@ -61,9 +61,8 @@ 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());
-		} catch (Exception e) {}
-		//} catch (InvalidMidiDataException e) {}
+			if(hasNoteOffEvent()) noteOffMsg.setMessage(noteOffMsg.getCommand(), (byte)channel, noteOffMsg.getData1(), noteOffMsg.getData2());
+		} catch (InvalidMidiDataException e) {}
 	}
 
 	/** 
@@ -73,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) {}
 	}
 
@@ -84,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) {}
 	}
 
@@ -145,4 +144,14 @@ public class MooNote extends MidiEvent {
 	public boolean hasNoteOffEvent() {
 		return noteOffEvent != null;
 	}
+
+	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);
+	}
 }