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

diff --git a/Moosique.java b/Moosique.java
index 7eafb6c..e03cca0 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -22,9 +22,9 @@ public class Moosique {
 	private static MidiEvent[] timeSignatures, tempoChanges;
 	private static ArrayList emptyTracks;
 
-	private static String filename, fileArg;
+	private static String filename;
 	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;
 
@@ -35,6 +35,7 @@ public class Moosique {
 		System.out.println("\nMoosique version 1.0\n");
 
 		// Parses command-line arguments.
+		String fileArg = null;
 		for (int i = 0; i < args.length; i++) {
 			if (args[i].equals("-n")) {makeGUI = false;}
 			else if (fileArg == null) {fileArg = args[i];}
@@ -54,7 +55,6 @@ public class Moosique {
 			setActiveChannel(0);
 		} catch (MidiUnavailableException e) {
 			System.out.println("Failed, quitting.");
-//			System.exit(1);
 		}
 		System.out.println("Done");
 
@@ -62,7 +62,7 @@ public class Moosique {
 		if (fileArg != null) {
 			System.out.print("Loading MIDI sequence from " + fileArg + "...");
 			if (!load(fileArg)) {
-				System.out.println("Failed");
+				System.out.println("Failed, creating new sequence");
 				clearSequence();
 			} else {
 				System.out.println("Done");
@@ -74,7 +74,7 @@ public class Moosique {
 
 		// Builds GUI, unless n-flag is set.
 		if (makeGUI) {
-			System.out.print("Building GUI...");
+			System.out.print("Building GUI.");
 			try {
 				UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 			} catch (Exception e) {}
@@ -153,6 +153,8 @@ public class Moosique {
 		try {
 			seq = new Sequence(Sequence.PPQ, DEFAULT_RESOLUTION, DEFAULT_TRACKS);
 			sequencer.setSequence(seq);
+			filename = null;
+			emptyTracks = new ArrayList();
 		} catch (InvalidMidiDataException e) {}
 		// Sends sequence to GUI.
 		if (gui != null) gui.setSequence(seq);
@@ -181,6 +183,9 @@ public class Moosique {
 	 */
 	public static void resume() {
 		gui.update(0);
+		try {
+			sequencer.setSequence(seq);
+		} catch (InvalidMidiDataException e) {}
 		sequencer.start();
 
 		// Disables input to volatile components
@@ -189,22 +194,15 @@ public class Moosique {
 		// 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)((15000 / getTempo()) * (tickDiff / ticksPerSixteenth)));
+						//sleep((long)((15000 / getTempo()) * (tickDiff / ticksPerSixteenth)));
+						sleep (10);
 					} catch (InterruptedException e) {
 						Moosique.stop();
 					}
@@ -309,6 +307,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 +376,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() {
@@ -375,7 +387,7 @@ public class Moosique {
 			Collections.sort(noteOns, c);
 			Collections.sort(noteOffs, c);
 
-			// For each NoteOn event, finds its NoteOff event and replaces it with a MooNote.
+			// Replaces each NoteOn event it with a MooNote containing a reference to the NoteOff event.
 			Iterator iOn = noteOns.iterator(), iOff;
 			MidiEvent on, off = null, nextOff;
 			ShortMessage onMsg, nextOffMsg;
@@ -404,46 +416,6 @@ public class Moosique {
 				iOn.remove();
 			}
 		}
-
-	/*
-		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 {
@@ -456,19 +428,27 @@ public class Moosique {
 	 * Saves the current sequence to the given filename
 	 * @param file	the filename to use
 	 */
-	public static void saveAs(String file) {
+	public static boolean saveAs(String file) {
 		try {
-			MidiSystem.write(seq, 1, new File(filename));
-		} catch (IOException e) {}
-		filename = file;
-		gui.setStatus("Saved " + file);
+			MidiSystem.write(seq, 1, new File(file));
+			filename = file;
+			gui.setStatus("Saved " + file);
+			return true;
+		} catch (IOException e) {
+			gui.setStatus("Failed in saving " + file);
+			return false;
+		}
 	}
 
 	/** 
 	 * Saves the current sequence to the previously given filename.
 	 */
-	public static void save() {
-		saveAs(filename);
+	public static boolean save() {
+		if (filename == null) return false;
+		else {
+			saveAs(filename);
+			return true;
+		}
 	}
 
 	/**