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

diff --git a/Moosique.java b/Moosique.java
index 7eafb6c..01b6b76 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -24,7 +24,7 @@ public class Moosique {
 
 	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);
@@ -204,7 +205,8 @@ public class Moosique {
 					// Puts the thread to sleep for as long as it takes
 					// the sequencer to reach the next sixteenth.
 					try {
-						sleep((long)((15000 / getTempo()) * (tickDiff / ticksPerSixteenth)));
+						//sleep((long)((15000 / getTempo()) * (tickDiff / ticksPerSixteenth)));
+						sleep (10);
 					} catch (InterruptedException e) {
 						Moosique.stop();
 					}
@@ -309,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
@@ -360,11 +380,7 @@ public class Moosique {
 			}
 			noteOns.trimToSize();
 			noteOffs.trimToSize();
-			boolean isEmpty = (noteOns.size() == 0);
-			String text = "Track " + i + " has " + noteOns.size() + "/" + noteOffs.size() + "/" + tracks[i].size();
-			if (isEmpty) text += " and will not be removed.";
-			System.out.println(text);
-			emptyTracks.add(tracks[i]);
+			if (noteOns.size() == 0) emptyTracks.add(tracks[i]);
 			
 			// Sorts the note lists by tick position.
 			Comparator c = new Comparator() {
@@ -405,45 +421,6 @@ public class Moosique {
 			}
 		}
 
-	/*
-		Collections.sort(track[i].events, new Comparator() {
-			public int compare(Object o1, Object o2) {
-				return ((MidiEvent)o2).getTick() - ((MidiEvent)o1).getTick();
-			}
-	        });
-
-		// Searches the sequence for NoteOn events
-		MidiEvent noteOn, noteOff = null, nextEvent;
-		MidiMessage nextMsg;
-		ShortMessage shortMsg;
-
-		for (int i = 0; i < tracks.length; i++) {
-			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));
-					}
-				}
-			}
-		}
-*/
 		// Sends sequence to GUI and sequencer, then returns
 		if (gui != null) gui.setSequence(seq);
 		try {