X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=Moosique.java;h=01b6b7664345685d633f6585aeaace8c8d011fad;hp=c9ed3ae003931b43f74d9c7ad3e7609dd0ca5d0e;hb=e31778837bee5cfbbaf643d17f1eaeb086d8e50c;hpb=9cc9e864bbd9993ba0c8a418b3bf82ef90cc930f

diff --git a/Moosique.java b/Moosique.java
index c9ed3ae..01b6b76 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -19,12 +19,12 @@ public class Moosique {
 	private static Synthesizer synthesizer;
 	private static MidiChannel[] channels;
 	private static MidiChannel activeChannel;
-	private static MetaMessage timeSigMsg;
-	private static MetaMessage[] tempoChgMsgs;
+	private static MidiEvent[] timeSignatures, tempoChanges;
+	private static ArrayList emptyTracks;
 
 	private static String filename, fileArg;
 	private static long editPosition;
-	private static boolean makeGUI = true, isEdited;
+	private static boolean makeGUI = true, isEdited = false, drawEmptyTracks = false;
 	private static Thread player;
 	public static final int DEFAULT_RESOLUTION = 96, DEFAULT_TRACKS = 4;
 
@@ -153,6 +153,7 @@ public class Moosique {
 		try {
 			seq = new Sequence(Sequence.PPQ, DEFAULT_RESOLUTION, DEFAULT_TRACKS);
 			sequencer.setSequence(seq);
+			emptyTracks = new ArrayList();
 		} catch (InvalidMidiDataException e) {}
 		// Sends sequence to GUI.
 		if (gui != null) gui.setSequence(seq);
@@ -186,17 +187,26 @@ public class Moosique {
 		// Disables input to volatile components
 		// gui.disable();
 
-		// Creates the visualization thread and starts it.
+		// Creates the visualisation thread and starts it.
 		player = new Thread () {
 			public void run() {
+				long ticksPerSixteenth = seq.getResolution()/4;
+				System.out.println("Ticks/16: " + ticksPerSixteenth);
+				long position = sequencer.getTickPosition();
 				while(sequencer.isRunning()) {
+					long pos = sequencer.getTickPosition();
+					long tickDiff = pos - position;
+					System.out.print(" ... " + tickDiff);
+					position = pos;
+
 					// Updates the GUI with the current tick position.
 					gui.update(sequencer.getTickPosition());
 
 					// Puts the thread to sleep for as long as it takes
 					// the sequencer to reach the next sixteenth.
 					try {
-						sleep((long)((1000 * 60 * 1) / (getTempo() * 4)));
+						//sleep((long)((15000 / getTempo()) * (tickDiff / ticksPerSixteenth)));
+						sleep (10);
 					} catch (InterruptedException e) {
 						Moosique.stop();
 					}
@@ -223,7 +233,7 @@ public class Moosique {
 	 * Returns the current editing position of the sequencer.
 	 * @return the tick position
 	 */
-	public static long getPosition() {
+	public static long getEditPosition() {
 		return editPosition;
 	}
 
@@ -231,7 +241,7 @@ public class Moosique {
 	 * Sets the current editing position of the sequencer.
 	 * @param ticks		the tick position
 	 */
-	public static void setPosition(long ticks) {
+	public static void setEditPosition(long ticks) {
 		editPosition = ticks;
 	}
 
@@ -301,6 +311,24 @@ public class Moosique {
 		editPosition += ticks;
 	}
 
+	/** 
+	 * Returns whether the given track should be drawn
+	 * @return true if the given track should be drawn
+	 */
+	public static boolean shouldBeDrawn(Track track) {
+		if (drawEmptyTracks) return true;
+		else return (!emptyTracks.contains(track));
+	}
+
+
+	/** 
+	 * Sets whether empty tracks should be drawn
+	 * @param state		true if empty tracks should be drawn
+	 */
+	public static void setDrawEmptyTracks(boolean state) {
+		drawEmptyTracks = state;
+	}
+
 	/** 
 	 * Loads the MooSequence in the given file.
 	 * @param filename	the filename to use
@@ -318,52 +346,78 @@ public class Moosique {
 		isEdited = false;
 
 		Track[] tracks = seq.getTracks();
+		emptyTracks = new ArrayList();
 
-		// Stores tempo and time signature.
-		MidiMessage msg;
+		// Searches track 0 for changes in tempo and time signature.
+		MidiEvent event;
 		MetaMessage metaMsg;
+		ArrayList ts = new ArrayList(), tc = new ArrayList();
 		for (int i = 0; i < tracks[0].size(); i++) {
-			msg = tracks[0].get(i).getMessage();
-			if (msg.getStatus() == MetaMessage.META) {
-				metaMsg = (MetaMessage)msg;
-				if (metaMsg.getType() == 81) {
-// FLERA!!!			tempoMsg = metaMsg;
-				} else if (metaMsg.getType() == 88) {
-					timeSigMsg = (MetaMessage)msg;
+			event = tracks[0].get(i);
+			if (event.getMessage().getStatus() == MetaMessage.META) {
+				metaMsg = (MetaMessage)event.getMessage();
+				switch(metaMsg.getType()) {
+					case 81: tc.add(event); break;
+					case 88: ts.add(event);
 				}
-
 			}
 		}
+//		timeSignatures = ts.toArray(timeSignatures);
+//		tempoChanges = tc.toArray(tempoChanges);
 
-		// Searches the sequence for NoteOn events
-		MidiEvent noteOn, noteOff = null, nextEvent;
-		MidiMessage nextMsg;
-		ShortMessage shortMsg;
+		// Wraps each NoteOn event with its NoteOff event in a MooNote
 		ArrayList noteOns, noteOffs;
 		for (int i = 0; i < tracks.length; i++) {
+			// Searches the sequence for NoteOn and NoteOff events
+			noteOns = new ArrayList(tracks[i].size() / 2);
+			noteOffs = new ArrayList(tracks[i].size() / 2);
 			for (int j = 0; j < tracks[i].size(); j++) {
-				noteOn = tracks[i].get(j);
-				if (noteOn.getMessage().getStatus() == ShortMessage.NOTE_ON) {
-					// Finds the corresponding NoteOff event
-					for (int k = j + 1; k < tracks[i].size(); k++) {
-						nextEvent = tracks[i].get(k);
-						nextMsg = nextEvent.getMessage();
-						if (nextMsg instanceof ShortMessage) {
-							shortMsg = (ShortMessage) nextMsg;
-							if (shortMsg.getCommand() == ShortMessage.NOTE_OFF && shortMsg.getChannel() == ((ShortMessage)noteOn.getMessage()).getChannel() && shortMsg.getData1() == ((ShortMessage)noteOn.getMessage()).getData1()) {
-								noteOff = nextEvent;
-								break;
-							}
-						}
-					}
-					// Replaces the NoteOn event with a MooNote, if possible with the corresponding NoteOff event
-					tracks[i].remove(noteOn);
-					if (noteOff != null) {
-						tracks[i].add(new MooNote(noteOn, noteOff));
-					} else {
-						tracks[i].add(new MooNote(noteOn));
+				event = tracks[i].get(j);
+				if (event.getMessage().getStatus() >= 144 &&
+				    event.getMessage().getStatus() < 160) noteOns.add(event);
+				if (event.getMessage().getStatus() >= 128 &&
+				    event.getMessage().getStatus() < 144) noteOffs.add(event);
+			}
+			noteOns.trimToSize();
+			noteOffs.trimToSize();
+			if (noteOns.size() == 0) emptyTracks.add(tracks[i]);
+			
+			// Sorts the note lists by tick position.
+			Comparator c = new Comparator() {
+				public int compare(Object o1, Object o2) {
+					return (int)(((MidiEvent)o1).getTick() - ((MidiEvent)o2).getTick());
+				}
+			};
+			Collections.sort(noteOns, c);
+			Collections.sort(noteOffs, c);
+
+			// For each NoteOn event, finds its NoteOff event and replaces it with a MooNote.
+			Iterator iOn = noteOns.iterator(), iOff;
+			MidiEvent on, off = null, nextOff;
+			ShortMessage onMsg, nextOffMsg;
+			while(iOn.hasNext()) {
+				on = (MidiEvent)iOn.next();
+				onMsg = (ShortMessage)on.getMessage();
+				iOff = noteOffs.iterator();
+				while(iOff.hasNext()) {
+					nextOff = (MidiEvent)iOff.next();
+					nextOffMsg = (ShortMessage)nextOff.getMessage();
+					if(onMsg.getChannel() == nextOffMsg.getChannel() &&
+					   onMsg.getData1() == nextOffMsg.getData1() &&
+					   c.compare(nextOff, on) > 0) {
+						off = nextOff;
+						iOff.remove();
+						break;
 					}
+					   	
+				}
+				tracks[i].remove(on);
+				if (off != null) {
+					tracks[i].add(new MooNote(on, off));
+				} else {
+					tracks[i].add(new MooNote(on));
 				}
+				iOn.remove();
 			}
 		}
 
@@ -402,4 +456,4 @@ public class Moosique {
 		if (synthesizer.isOpen()) synthesizer.close();
 		System.exit(0);
 	}
-}
+}
\ No newline at end of file