X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooNote.java;h=023de207da3aa053ffafff81f2febabe076ea996;hb=d2e307b3375152f1b47c59bc05210c96dc99f679;hp=6ea6c39b6b6bfb369d6feca755dc194846dc5f06;hpb=d7666fadd2f8baca8a03cacae836f2563fe4dd5d;p=moosique.git

diff --git a/MooNote.java b/MooNote.java
index 6ea6c39..023de20 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 {
 
-	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
@@ -29,21 +20,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();
@@ -51,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!");}
 	}
 
 	/** 
@@ -92,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);
 	}
 
 	/** 
@@ -100,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)
@@ -133,15 +131,34 @@ public class MooNote extends MidiEvent {
 	 * @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
+	/**
+	 * 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);
+		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);
+		track.remove(noteOffEvent);
+	}
+
+	/**
+	 * Returns a clone of this note.
 	 */
-	public boolean hasNoteOffEvent() {
-		return noteOffEvent == null;
+	public Object clone() {
+		return new MooNote(
+			new MidiEvent((ShortMessage)getMessage().clone(), getTick()), 
+			new MidiEvent((ShortMessage)noteOffEvent.getMessage().clone(), noteOffEvent.getTick())
+		);
 	}
-}
\ No newline at end of file
+}