X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Moosique.java;h=91cf4ff7ddc117a62e7109224e9c66add37ef474;hb=ce9a16d679f2058454af367e972888ba8e2c34c0;hp=89669d37e972d197ffdba584062477e2c6ae5c84;hpb=83ec11f99e143607d057db2a68c262ca9672e524;p=moosique.git

diff --git a/Moosique.java b/Moosique.java
index 89669d3..91cf4ff 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -20,10 +20,11 @@ public class Moosique {
 	private static MidiChannel[] channels;
 	private static MidiChannel activeChannel;
 	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;
 
@@ -152,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);
@@ -185,15 +187,16 @@ public class Moosique {
 		// Disables input to volatile components
 		// gui.disable();
 
-		System.out.println("Ticks/16: " + seq.getResolution()/4);
-
 		// 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();
-					System.out.print(" ... " + (pos - position));
+					long tickDiff = pos - position;
+					System.out.print(" ... " + tickDiff);
 					position = pos;
 
 					// Updates the GUI with the current tick position.
@@ -202,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()));
+						//sleep((long)((15000 / getTempo()) * (tickDiff / ticksPerSixteenth)));
+						sleep (10);
 					} catch (InterruptedException e) {
 						Moosique.stop();
 					}
@@ -307,6 +311,24 @@ public class Moosique {
 		editPosition += ticks;
 	}
 
+	/** 
+	 * Shows the given message in the status bar.
+	 * @param text	the message to show
+	 */
+	public static boolean shouldBeDrawn(Track track) {
+		if (drawEmptyTracks) return true;
+		else return (!emptyTracks.contains(track));
+	}
+
+
+	/** 
+	 * Shows the given message in the status bar.
+	 * @param text	the message to show
+	 */
+	public static void setDrawEmptyTracks(boolean state) {
+		drawEmptyTracks = state;
+	}
+
 	/** 
 	 * Loads the MooSequence in the given file.
 	 * @param filename	the filename to use
@@ -324,6 +346,7 @@ public class Moosique {
 		isEdited = false;
 
 		Track[] tracks = seq.getTracks();
+		emptyTracks = new ArrayList();
 
 		// Searches track 0 for changes in tempo and time signature.
 		MidiEvent event;
@@ -357,6 +380,13 @@ 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 be removed.";
+				emptyTracks.add(tracks[i]);
+			}
+			System.out.println(text);
 			
 			// Sorts the note lists by tick position.
 			Comparator c = new Comparator() {
@@ -397,45 +427,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 {