X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Moosique.java;h=dd0b8a44f267ca8eb8794662c738ebacbac6472d;hb=0134cec9be53b5d24c5a14136befb293d29357b9;hp=0a148b60a3acf0ae2422d98f902f22947cb3b26d;hpb=867eb267809ea85e6f983b93e5f63ca86150d7bc;p=moosique.git

diff --git a/Moosique.java b/Moosique.java
index 0a148b6..dd0b8a4 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -21,8 +21,11 @@ public class Moosique {
 	private static MidiChannel activeChannel;
 	private static MidiEvent[] timeSignatures, tempoChanges;
 	private static ArrayList emptyTracks;
+	private static Map trackMute = new HashMap();
+	private static Map trackSolo = new HashMap();
 
-	private static String filename, fileArg;
+
+	private static String filename;
 	private static long editPosition;
 	private static boolean makeGUI = true, isEdited = false, drawEmptyTracks = false;
 	private static Thread player;
@@ -35,6 +38,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 +58,6 @@ public class Moosique {
 			setActiveChannel(0);
 		} catch (MidiUnavailableException e) {
 			System.out.println("Failed, quitting.");
-//			System.exit(1);
 		}
 		System.out.println("Done");
 
@@ -62,7 +65,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 +77,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 +156,7 @@ 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.
@@ -182,6 +186,26 @@ public class Moosique {
 	 */
 	public static void resume() {
 		gui.update(0);
+		try {
+			sequencer.setSequence(seq);
+		} catch (InvalidMidiDataException e) {}
+		Track[] tracks = seq.getTracks();
+
+		for (int i = 0; i < tracks.length; i++) {
+
+			Object ob = trackSolo.get(tracks[i]);
+			if(ob instanceof Boolean){
+				System.out.println("Track solo " + i + "= "+ ob);
+				sequencer.setTrackSolo(i,((Boolean)ob).booleanValue());
+			}
+
+			ob = trackMute.get(tracks[i]);
+			if(ob instanceof Boolean){
+				System.out.println("Track mute " + i + "= "+ ob);
+				sequencer.setTrackMute(i,((Boolean)ob).booleanValue());
+			}
+		}
+
 		sequencer.start();
 
 		// Disables input to volatile components
@@ -190,15 +214,7 @@ 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());
 
@@ -312,8 +328,8 @@ public class Moosique {
 	}
 
 	/** 
-	 * Shows the given message in the status bar.
-	 * @param text	the message to show
+	 * 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;
@@ -322,8 +338,8 @@ public class Moosique {
 
 
 	/** 
-	 * Shows the given message in the status bar.
-	 * @param text	the message to show
+	 * Sets whether empty tracks should be drawn
+	 * @param state		true if empty tracks should be drawn
 	 */
 	public static void setDrawEmptyTracks(boolean state) {
 		drawEmptyTracks = state;
@@ -347,6 +363,8 @@ public class Moosique {
 
 		Track[] tracks = seq.getTracks();
 		emptyTracks = new ArrayList();
+		trackMute = new HashMap();
+		trackSolo = new HashMap();
 
 		// Searches track 0 for changes in tempo and time signature.
 		MidiEvent event;
@@ -391,7 +409,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;
@@ -420,7 +438,6 @@ public class Moosique {
 				iOn.remove();
 			}
 		}
-
 		// Sends sequence to GUI and sequencer, then returns
 		if (gui != null) gui.setSequence(seq);
 		try {
@@ -433,19 +450,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;
+		}
 	}
 
 	/** 
@@ -456,4 +481,12 @@ public class Moosique {
 		if (synthesizer.isOpen()) synthesizer.close();
 		System.exit(0);
 	}
-}
\ No newline at end of file
+	
+	public static void setTrackSolo(Track track, boolean on){
+		trackSolo.put(track, new Boolean(on));	
+	}
+
+	public static void setTrackMute(Track track, boolean on){
+		trackMute.put(track, new Boolean(on));	
+	}
+}