X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooNote.java;h=d49495fcaafb3693144612b97c9d8e05c5fdb8cb;hp=20047887f107cd03093927f86c2fb8851b37fe27;hb=c3a31c2aa833e2197f0929655c69a2090e8bbecc;hpb=4ac3b6210979ea78dceb609a0501cb0265d00065

diff --git a/MooNote.java b/MooNote.java
index 2004788..d49495f 100644
--- a/MooNote.java
+++ b/MooNote.java
@@ -1,6 +1,6 @@
 import javax.sound.midi.*;
 
-/*
+/**
  * Functional representation of a MIDI note, which adds functionality to the existent MidiEvent class.
  * Also provides a reference to the corresponding NoteOff event.
  * 
@@ -12,7 +12,7 @@ public class MooNote extends MidiEvent {
 	protected MidiEvent noteOffEvent;
 	protected ShortMessage noteOnMsg, noteOffMsg;
 
-	/* 
+	/** 
 	 * Creates a MooNote from the given NoteOn event in the current track.
 	 * @param noteOnEvent	the NoteOn event of the note
 	 */
@@ -21,7 +21,7 @@ public class MooNote extends MidiEvent {
 		noteOnMsg = (ShortMessage)getMessage();
 	}
 
-	/* 
+	/** 
 	 * Creates a MooNote from the given NoteOn event in the current track and creates a reference to
 	 * the corresponding NoteOff event.
 	 * @param noteOnEvent	the NoteOn event of the note
@@ -29,21 +29,20 @@ 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();
 	}
 
-	/* 
+	/** 
 	 * 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();
@@ -54,40 +53,40 @@ public class MooNote extends MidiEvent {
 		} catch (InvalidMidiDataException e) {}
 	}
 
-	/* 
+	/** 
 	 * Sets the channel of the current note.
 	 * @param channel	the channel of the note (1-16)
 	 */
 	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) {}
 	}
 
-	/* 
+	/** 
 	 * Sets the pitch of the current note.
 	 * @param pitch		the pitch of the note (0-127)
 	 */
 	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) {}
 	}
 
-	/* 
+	/** 
 	 * Sets the velocity of the current note.
 	 * @param vel	the velocity of the note (0-127)
 	 */
 	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) {}
 	}
 
-	/* 
+	/** 
 	 * Sets the duration of the current note (or rather moves the note off event).
 	 * @param n	the duration of the note in ticks (96 per beat)
 	 */
@@ -95,7 +94,7 @@ public class MooNote extends MidiEvent {
 		if (hasNoteOffEvent()) noteOffEvent.setTick(getTick() + ticks);
 	}
 
-	/* 
+	/** 
 	 * Sets the timestamp of the current note.
 	 * @param tick	the timestamp of the note in ticks (96 per beat)
 	 */
@@ -104,7 +103,7 @@ public class MooNote extends MidiEvent {
 		super.setTick(tick);
 	}
 
-	/* 
+	/** 
 	 * Returns the channel of the current note.
 	 * @return the channel of the note (1-16)
 	 */
@@ -112,7 +111,7 @@ public class MooNote extends MidiEvent {
 		return noteOnMsg.getChannel();
 	}
 
-	/* 
+	/** 
 	 * Returns the pitch of the current note.
 	 * @return the pitch of the note (0-127)
 	 */
@@ -120,7 +119,7 @@ public class MooNote extends MidiEvent {
 		return noteOnMsg.getData1();
 	}
 
-	/* 
+	/** 
 	 * Returns the velocity of the current note.
 	 * @return the velocity of the note (0-127)
 	 */
@@ -128,20 +127,38 @@ public class MooNote extends MidiEvent {
 		return noteOnMsg.getData2();
 	}
 
-	/* 
+	/** 
 	 * Returns the duration of the current note.
 	 * @return the duration of the note (in ticks)
 	 */
 	public int getDuration() {
 		if (!hasNoteOffEvent()) return 0;
-		return (int)(getTick() - noteOffEvent.getTick());
+		return (int)(noteOffEvent.getTick() - getTick());
 	}
 
-	/* 
+	/** 
 	 * Returns whether the NoteOff event was found.
 	 * @return	the note off MidiEvent
 	 */
 	public boolean hasNoteOffEvent() {
-		return noteOffEvent == null;
+		return noteOffEvent != null;
 	}
-}
\ No newline at end of file
+
+	/**
+	 * 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);
+	}
+}