X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNote.java;h=78e1564064161aac20851980d249eb97771efaf5;hb=a8b0b5e27d120df964c5b6d8554a6207951b00d0;hp=77ecd53b3db9dbca92db36cae0f5f48853122658;hpb=fd332c2eb3d8c541c6f8cea225d03e27e42ce21d;p=moosique.git

diff --git a/MooNote.java b/MooNote.java
index 77ecd53..78e1564 100644
--- a/MooNote.java
+++ b/MooNote.java
@@ -36,14 +36,13 @@ public class MooNote extends MidiEvent {
 
 	/** 
 	 * Creates a MooNote of the given pitch, velocity and duration in the current track.
-	 * @param track		the track to which the MooNote was added
 	 * @param channel	the channel of the note (1-16)
 	 * @param pitch		the pitch of the note (0-127)
 	 * @param velocity	the velocity of the note (0-127)
 	 * @param timestamp	the timestamp of the note in ticks (96 per beat)
 	 * @param duration	the duration of the note in ticks (96 per beat)
 	 */
-	public MooNote (int track, int channel, int pitch, int velocity, long timestamp, int duration) {
+	public MooNote (int channel, int pitch, int velocity, long timestamp, int duration) {
 		super(new ShortMessage(), timestamp);
 		noteOffEvent = new MidiEvent(new ShortMessage(), timestamp + duration);
 		noteOnMsg = (ShortMessage)getMessage();
@@ -51,7 +50,7 @@ public class MooNote extends MidiEvent {
 		try {
 			noteOnMsg.setMessage(ShortMessage.NOTE_ON, channel, pitch, velocity);
 			noteOffMsg.setMessage(ShortMessage.NOTE_OFF, channel, pitch, 0);
-		} catch (InvalidMidiDataException e) {}
+		} catch (InvalidMidiDataException e) {System.out.println("Invalid data!");}
 	}
 
 	/** 
@@ -61,9 +60,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,9 +71,16 @@ 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());
-		} catch (Exception e) {}
-		//} catch (InvalidMidiDataException e) {}
+			if(hasNoteOffEvent()) noteOffMsg.setMessage(noteOffMsg.getCommand(), noteOffMsg.getChannel(), (byte)pitch, noteOffMsg.getData2());
+		} catch (InvalidMidiDataException e) {}
+	}
+
+	/** 
+	 * Transposes the current note the given number of halftones.
+	 * @param halftones		the number of halftones to transpose - positive for up, negative for down
+	 */
+	public void transpose(int halftones) {
+		setPitch(getPitch() + halftones);
 	}
 
 	/** 
@@ -85,9 +90,8 @@ 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());
-		} catch (Exception e) {}
-		//} catch (InvalidMidiDataException e) {}
+			if(hasNoteOffEvent()) noteOffMsg.setMessage(noteOffMsg.getCommand(), noteOffMsg.getChannel(), noteOffMsg.getData1(), noteOffMsg.getData2());
+		} catch (InvalidMidiDataException e) {}
 	}
 
 	/** 
@@ -103,7 +107,7 @@ public class MooNote extends MidiEvent {
 	 * @param tick	the timestamp of the note in ticks (96 per beat)
 	 */
 	public void setTick(long tick) {
-		if (hasNoteOffEvent()) noteOffEvent.setTick(tick +  getDuration());
+		if (hasNoteOffEvent()) noteOffEvent.setTick(tick + getDuration());
 		super.setTick(tick);
 	}
 
@@ -147,4 +151,22 @@ public class MooNote extends MidiEvent {
 	public boolean hasNoteOffEvent() {
 		return noteOffEvent != null;
 	}
+
+	/**
+	 * Adds this note (both noteOn and noteOffEvents) to a track.
+	 * @param track the track it'll be added to.
+	 */
+	public void addTo(Track track){
+		track.add(this);
+		if (hasNoteOffEvent()) track.add(noteOffEvent);
+	}
+	
+	/**
+	 * Removes this note (both noteOn and noteOffEvents) from a track.
+	 * @param track the track it'll be removed from.
+	 */
+	public void removeFrom(Track track){
+		track.remove(this);
+		if (hasNoteOffEvent()) track.remove(noteOffEvent);
+	}
 }