X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNote.java;h=fb73341e327f969ff51a50c23fbc5387d9f36b2b;hb=4526e51b70110f7272b0c2a3a5f207657d690029;hp=d49495fcaafb3693144612b97c9d8e05c5fdb8cb;hpb=0de7064752a876bb045a6c4069a0891601cf275a;p=moosique.git

diff --git a/MooNote.java b/MooNote.java
index d49495f..fb73341 100644
--- a/MooNote.java
+++ b/MooNote.java
@@ -7,19 +7,10 @@ import javax.sound.midi.*;
  * @author  Einar Pehrson
  */
  
-public class MooNote extends MidiEvent {
+public class MooNote extends MidiEvent implements Cloneable, Comparable {
 
-	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
-	 */
-	public MooNote (MidiEvent noteOnEvent) {
-		super(noteOnEvent.getMessage(), noteOnEvent.getTick());
-		noteOnMsg = (ShortMessage)getMessage();
-	}
+	private MidiEvent noteOffEvent;
+	private ShortMessage noteOnMsg, noteOffMsg;
 
 	/** 
 	 * Creates a MooNote from the given NoteOn event in the current track and creates a reference to
@@ -50,7 +41,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!");}
 	}
 
 	/** 
@@ -60,7 +51,7 @@ public class MooNote extends MidiEvent {
 	public void setChannel(int channel) {
 		try {
 			noteOnMsg.setMessage(noteOnMsg.getCommand(), (byte)channel, noteOnMsg.getData1(), noteOnMsg.getData2());
-			if(hasNoteOffEvent()) noteOffMsg.setMessage(noteOffMsg.getCommand(), (byte)channel, noteOffMsg.getData1(), noteOffMsg.getData2());
+			noteOffMsg.setMessage(noteOffMsg.getCommand(), (byte)channel, noteOffMsg.getData1(), noteOffMsg.getData2());
 		} catch (InvalidMidiDataException e) {}
 	}
 
@@ -71,7 +62,7 @@ public class MooNote extends MidiEvent {
 	public void setPitch(int pitch) {
 		try {
 			noteOnMsg.setMessage(noteOnMsg.getCommand(), noteOnMsg.getChannel(), (byte)pitch, noteOnMsg.getData2());
-			if(hasNoteOffEvent()) noteOffMsg.setMessage(noteOffMsg.getCommand(), noteOffMsg.getChannel(), (byte)pitch, noteOffMsg.getData2());
+			noteOffMsg.setMessage(noteOffMsg.getCommand(), noteOffMsg.getChannel(), (byte)pitch, noteOffMsg.getData2());
 		} catch (InvalidMidiDataException e) {}
 	}
 
@@ -82,7 +73,7 @@ public class MooNote extends MidiEvent {
 	public void setVelocity(int vel) {
 		try {
 			noteOnMsg.setMessage(noteOnMsg.getCommand(), noteOnMsg.getChannel(), noteOnMsg.getData1(), (byte)vel);
-			if(hasNoteOffEvent()) noteOffMsg.setMessage(noteOffMsg.getCommand(), noteOffMsg.getChannel(), noteOffMsg.getData1(), noteOffMsg.getData2());
+			noteOffMsg.setMessage(noteOffMsg.getCommand(), noteOffMsg.getChannel(), noteOffMsg.getData1(), noteOffMsg.getData2());
 		} catch (InvalidMidiDataException e) {}
 	}
 
@@ -91,7 +82,7 @@ public class MooNote extends MidiEvent {
 	 * @param n	the duration of the note in ticks (96 per beat)
 	 */
 	public void setDuration(int ticks) {
-		if (hasNoteOffEvent()) noteOffEvent.setTick(getTick() + ticks);
+		noteOffEvent.setTick(getTick() + ticks);
 	}
 
 	/** 
@@ -99,10 +90,18 @@ 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());
+		noteOffEvent.setTick(tick + getDuration());
 		super.setTick(tick);
 	}
 
+	/** 
+	 * 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);
+	}
+
 	/** 
 	 * Returns the channel of the current note.
 	 * @return the channel of the note (1-16)
@@ -132,33 +131,43 @@ public class MooNote extends MidiEvent {
 	 * @return the duration of the note (in ticks)
 	 */
 	public int getDuration() {
-		if (!hasNoteOffEvent()) return 0;
 		return (int)(noteOffEvent.getTick() - getTick());
 	}
 
-	/** 
-	 * Returns whether the NoteOff event was found.
-	 * @return	the note off 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){
+	public void addTo(Track track) {
 		track.add(this);
-		if (hasNoteOffEvent()) track.add(noteOffEvent);
+		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){
+	public void removeFrom(Track track) {
 		track.remove(this);
-		if (hasNoteOffEvent()) track.remove(noteOffEvent);
+		track.remove(noteOffEvent);
+	}
+
+	/**
+	 * Returns a clone of this note.
+	 */
+	public Object clone() {
+		return new MooNote(
+			new MidiEvent((ShortMessage)getMessage().clone(), getTick()), 
+			new MidiEvent((ShortMessage)noteOffEvent.getMessage().clone(), noteOffEvent.getTick())
+		);
+	}
+
+	/** 
+	 * Compares this note to another note.
+	 * @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)(((MidiEvent)o).getTick() - getTick());
 	}
+
 }