X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=Moosique.java;h=09e8395707b175f41a9ab18e94b4a0858c8ef333;hp=e03cca0749a08b9396c7e760c722bb62f698c36a;hb=6154ba318198471a2b94391df6aab6f2b6cd9b29;hpb=8acc1b9983cf0c679fbe556f480a6d7f4d45e518

diff --git a/Moosique.java b/Moosique.java
index e03cca0..09e8395 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -17,19 +17,26 @@ public class Moosique {
 	private static Sequence seq;
 	private static Sequencer sequencer;
 	private static Synthesizer synthesizer;
+	private static Receiver receiver;
 	private static MidiChannel[] channels;
 	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 Thread player;
 
 	private static String filename;
 	private static long editPosition;
-	private static boolean makeGUI = true, isEdited = false, drawEmptyTracks = false;
-	private static Thread player;
+	private static boolean makeGUI = true, initSound = true, edited = false, drawEmptyTracks = false;
 	public static final int DEFAULT_RESOLUTION = 96, DEFAULT_TRACKS = 4;
 
 	/** 
 	 * Starts the application.
+	 * 
+	 * Parses command-line arguments, acquires MIDI devices and connects them,
+	 * loads a sequence and creates the GUI.
 	 */
 	public static void main (String[] args) {
 		System.out.println("\nMoosique version 1.0\n");
@@ -37,8 +44,9 @@ public class Moosique {
 		// 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];}
+			if (args[i].equals("-n")) makeGUI = false;
+			else if (args[i].equals("-m")) initSound = false;
+			else if (fileArg == null) fileArg = args[i];
 		}
 
 		// Acquires MIDI devices and connects them.
@@ -50,11 +58,13 @@ public class Moosique {
 			synthesizer = MidiSystem.getSynthesizer();
 			System.out.print(".");
 			synthesizer.open();
-			sequencer.getTransmitter().setReceiver(synthesizer.getReceiver());
+			receiver = synthesizer.getReceiver();
+			sequencer.getTransmitter().setReceiver(receiver);
 			channels = synthesizer.getChannels();
 			setActiveChannel(0);
 		} catch (MidiUnavailableException e) {
 			System.out.println("Failed, quitting.");
+			System.exit(1);
 		}
 		System.out.println("Done");
 
@@ -89,6 +99,56 @@ public class Moosique {
 		}
 	}
 
+
+
+
+
+
+
+
+	/*				***
+	 **	  ACCESSOR METHODS	 **
+	 ***				  */
+
+
+
+
+
+
+
+
+	/** 
+	 * Returns the currently active MidiChannel.
+	 * @return the active MidiChannel
+	 */
+	public static MidiChannel getActiveChannel() {
+		return activeChannel;
+	}
+
+	/** 
+	 * Returns the MidiChannels of the selected synthesizer.
+	 * @return the available MidiChannels
+	 */
+	public static MidiChannel getChannel(int i) {
+		return channels[i];
+	}
+
+	/** 
+	 * Returns the MidiChannels of the selected synthesizer.
+	 * @return the available MidiChannels
+	 */
+	public static MidiChannel[] getChannels() {
+		return channels;
+	}
+
+	/** 
+	 * Returns the current editing position of the sequencer.
+	 * @return the tick position
+	 */
+	public static long getEditPosition() {
+		return editPosition;
+	}
+
 	/** 
 	 * Returns the GUI.
 	 * @return the GUI
@@ -97,6 +157,30 @@ public class Moosique {
 		return gui;
 	}
 
+	/** 
+	 * Calculates the position (measures, beats, ticks) in the current sequence for the given tick position.
+	 * @return an array of integers where index 0 is measures, 1 is beats and 2 is ticks.
+	 */
+	public static int[] getPositionForTick(long ticks) {
+		/*
+		int measures, beats, ticks;
+		for (int i = 0; i < timeSignatures.length; i++) {
+			long tick = timeSignatures[i].getTick();
+			// Split the ticks in the interval into measures, beats and ticks.
+		}
+		*/
+		int[] pos = {1, 1, 1};
+		return pos;
+	}
+
+	/** 
+	 * Returns the receiver of the current sequencer.
+	 * @return the receiver
+	 */
+	public static Receiver getReceiver() {
+		return receiver;
+	}
+
 	/** 
 	 * Returns the current sequence.
 	 * @return the current sequence
@@ -114,27 +198,88 @@ public class Moosique {
 	}
 
 	/** 
-	 * Returns the MidiChannels of the selected synthesizer.
-	 * @return the available MidiChannels
+	 * Returns the tempo of the current sequence.
+	 * @return the tick position
 	 */
-	public static MidiChannel[] getChannels() {
-		return channels;
+	public static int getTempo() {
+		return 120;
+		// if (tempoMsg == null) return 0;
 	}
 
 	/** 
-	 * Returns the MidiChannels of the selected synthesizer.
-	 * @return the available MidiChannels
+	 * Calculates the tick position in the current sequence for the given position (measures, beats, ticks).
+	 * @return the tick position.
 	 */
-	public static MidiChannel getChannel(int i) {
-		return channels[i];
+	public static long getTicksForPosition(int measures, int beats, int ticks) {
+		long tickPos = 0;
+		/*
+		for (int i = 0; i < timeSignatures.length; i++) {
+			long tick = timeSignatures[i].getTick();
+			// Add the measures, beats and ticks in the interval.
+		}
+		*/
+		return tickPos;
 	}
 
 	/** 
-	 * Returns the currently active MidiChannel.
-	 * @return the active MidiChannel
+	 * Returns the tempo of the current sequence.
+	 * @return the tick position
 	 */
-	public static MidiChannel getActiveChannel() {
-		return activeChannel;
+	public static int[] getTimeSig() {
+		int[] ts = {4, 4};
+		return ts;
+		// if (timeSigMsg == null) return 0;
+	}
+
+	/** 
+	 * Returns true if the current sequence has been edited.
+	 * @return the tick position
+	 */
+	public static boolean isEdited() {
+		return edited;
+	}
+
+	/** 
+	 * 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));
+	}
+
+
+
+
+
+
+
+
+	/*				***
+	 **	  MUTATOR METHODS	 **
+	 ***				  */
+
+
+
+
+
+
+
+
+	/** 
+	 * Fast forwards the current sequence the given number of measures.
+	 * @param measures	the number of measures to fast forward
+	 */
+	public static void forward(long ticks) {
+		editPosition += ticks;
+	}
+
+	/** 
+	 * Rewinds the current sequence the given number of measures.
+	 * @param measures	the number of measures to rewind
+	 */
+	public static void rewind(long ticks) {
+		editPosition -= ticks;
 	}
 
 	/** 
@@ -146,36 +291,76 @@ public class Moosique {
 	}
 
 	/** 
-	 * Replaces the current sequence with a new one, holding three empty tracks.
+	 * Sets whether empty tracks should be drawn
+	 * @param state		true if empty tracks should be drawn
 	 */
-	public static void clearSequence() {
-		// Creates a new sequence and sends it to the sequencer.
-		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);
+	public static void setDrawEmptyTracks(boolean state) {
+		drawEmptyTracks = state;
 	}
 
 	/** 
-	 * Starts playback of the current sequence.
+	 * Sets the current sequence as edited, which implies prompts when loading a new sequence.
 	 */
-	public static void play() {
-		sequencer.setTickPosition(editPosition);
-		resume();
+	public static void setEdited() {
+		edited = true;
 	}
 
 	/** 
-	 * Pauses playback of the current sequence.
+	 * Sets the current editing position of the sequencer.
+	 * @param ticks		the tick position
 	 */
-	public static void pause() {
-		if (sequencer.isRunning()) {
-			sequencer.stop();
-		}
-		if (player != null) player.interrupt();
+	public static void setEditPosition(long ticks) {
+		editPosition = ticks;
+	}
+
+	/** 
+	 * Sets the current editing position of the sequencer.
+	 * @param ticks		the tick position
+	 */
+	public static void setTempo(int bpm) {
+		// tempoMsg
+	}
+
+	/** 
+	 * Sets the current editing position of the sequencer.
+	 * @param ticks		the tick position
+	 */
+	public static void setTimeSig(int bpm) {
+		// timeSigMsg
+	}
+	
+	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));	
+	}
+
+
+
+
+
+
+
+
+	/*				***
+	 **	  PLAYBACK METHODS	 **
+	 ***				  */
+
+
+
+
+
+
+
+
+	/** 
+	 * Starts playback of the current sequence.
+	 */
+	public static void play() {
+		sequencer.setTickPosition(editPosition);
+		resume();
 	}
 
 	/** 
@@ -186,8 +371,24 @@ public class Moosique {
 		try {
 			sequencer.setSequence(seq);
 		} catch (InvalidMidiDataException e) {}
+		Track[] tracks = seq.getTracks();
+
 		sequencer.start();
 
+		for (int i = 0; i < tracks.length; i++) {
+
+			Object ob = trackSolo.get(tracks[i]);
+			if(ob instanceof Boolean){
+				sequencer.setTrackSolo(i,((Boolean)ob).booleanValue());
+			}
+
+			ob = trackMute.get(tracks[i]);
+			if(ob instanceof Boolean){
+				sequencer.setTrackMute(i,((Boolean)ob).booleanValue());
+			}
+		}
+
+
 		// Disables input to volatile components
 		// gui.disable();
 
@@ -213,6 +414,16 @@ public class Moosique {
 		player.start();
 	}
 
+	/** 
+	 * Pauses playback of the current sequence.
+	 */
+	public static void pause() {
+		if (sequencer.isRunning()) {
+			sequencer.stop();
+		}
+		if (player != null) player.interrupt();
+	}
+
 	/** 
 	 * Stops playback of the current sequence.
 	 */
@@ -225,108 +436,43 @@ public class Moosique {
 		gui.update((long)0);
 	}
 
-	/** 
-	 * Returns the current editing position of the sequencer.
-	 * @return the tick position
-	 */
-	public static long getEditPosition() {
-		return editPosition;
-	}
 
-	/** 
-	 * Sets the current editing position of the sequencer.
-	 * @param ticks		the tick position
-	 */
-	public static void setEditPosition(long ticks) {
-		editPosition = ticks;
-	}
 
-	/** 
-	 * Returns the tempo of the current sequence.
-	 * @return the tick position
-	 */
-	public static int getTempo() {
-		return 120;
-		// if (tempoMsg == null) return 0;
-	}
 
-	/** 
-	 * Sets the current editing position of the sequencer.
-	 * @param ticks		the tick position
-	 */
-	public static void setTempo(int bpm) {
-		// tempoMsg
-	}
 
-	/** 
-	 * Returns the tempo of the current sequence.
-	 * @return the tick position
-	 */
-	public static int[] getTimeSig() {
-		int[] ts = {4, 4};
-		return ts;
-		// if (timeSigMsg == null) return 0;
-	}
 
-	/** 
-	 * Sets the current editing position of the sequencer.
-	 * @param ticks		the tick position
-	 */
-	public static void setTimeSig(int bpm) {
-		// timeSigMsg
-	}
 
-	/** 
-	 * Returns true if the current sequence has been edited.
-	 * @return the tick position
-	 */
-	public static boolean isEdited() {
-		return isEdited;
-	}
 
-	/** 
-	 * Sets the current sequence as edited, which implies prompts when loading a new sequence.
-	 */
-	public static void setEdited() {
-		isEdited = true;
-	}
+	/*				***
+	 **	  SYSTEM & IO METHODS	 **
+	 ***				  */
+
+
+
 
-	/** 
-	 * Rewinds the current sequence the given number of measures.
-	 * @param measures	the number of measures to rewind
-	 */
-	public static void rewind(long ticks) {
-		editPosition -= ticks;
-	}
 
-	/** 
-	 * Fast forwards the current sequence the given number of measures.
-	 * @param measures	the number of measures to fast forward
-	 */
-	public static void forward(long ticks) {
-		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
+	 * Replaces the current sequence with a new one, holding three empty tracks.
 	 */
-	public static void setDrawEmptyTracks(boolean state) {
-		drawEmptyTracks = state;
+	public static void clearSequence() {
+		// Creates a new sequence and sends it to the sequencer.
+		try {
+			seq = new Sequence(Sequence.PPQ, DEFAULT_RESOLUTION, DEFAULT_TRACKS);
+			sequencer.setSequence(seq);
+			filename = null;
+			emptyTracks = new ArrayList();
+			trackSolo = new HashMap();
+			trackMute = new HashMap();
+		} catch (InvalidMidiDataException e) {}
+		// Sends sequence to GUI.
+		if (gui != null) gui.setSequence(seq);
 	}
 
 	/** 
-	 * Loads the MooSequence in the given file.
+	 * Loads a MIDI sequence from the given file.
 	 * @param filename	the filename to use
 	 */
 	public static boolean load(String file) {
@@ -339,10 +485,12 @@ public class Moosique {
 		} catch (IOException e) {
 			return false;
 		}
-		isEdited = false;
+		edited = false;
 
 		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;
@@ -358,8 +506,8 @@ public class Moosique {
 				}
 			}
 		}
-//		timeSignatures = ts.toArray(timeSignatures);
-//		tempoChanges = tc.toArray(tempoChanges);
+		// timeSignatures = ts.toArray(timeSignatures);
+		// tempoChanges = tc.toArray(tempoChanges);
 
 		// Wraps each NoteOn event with its NoteOff event in a MooNote
 		ArrayList noteOns, noteOffs;
@@ -379,11 +527,7 @@ public class Moosique {
 			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());
-				}
-			};
+			Comparator c = new NoteComparator();
 			Collections.sort(noteOns, c);
 			Collections.sort(noteOffs, c);
 
@@ -411,7 +555,7 @@ public class Moosique {
 				if (off != null) {
 					tracks[i].add(new MooNote(on, off));
 				} else {
-					tracks[i].add(new MooNote(on));
+					tracks[i].add(new MooNote(on, new MidiEvent((ShortMessage)on.getMessage().clone(), on.getTick() + 48)));
 				}
 				iOn.remove();
 			}
@@ -424,6 +568,31 @@ public class Moosique {
 		return true;
 	}
 
+	/** 
+	 * Prompts the user .
+	 */
+	public static boolean promptOnUnsavedChanges() {
+		if (!edited) return false;
+		int exitOption = JOptionPane.showConfirmDialog(gui,
+			"The current sequence has been edited, but not saved.\nDo you wish to continue anyway?",
+			"File not saved - continue?", 
+			JOptionPane.OK_CANCEL_OPTION, 
+			JOptionPane.WARNING_MESSAGE);
+		if (exitOption == JOptionPane.CANCEL_OPTION || exitOption == JOptionPane.CLOSED_OPTION) return true;
+		return false;
+	}
+
+	/** 
+	 * Saves the current sequence to the previously given filename.
+	 */
+	public static boolean save() {
+		if (filename == null) return false;
+		else {
+			saveAs(filename);
+			return true;
+		}
+	}
+
 	/** 
 	 * Saves the current sequence to the given filename
 	 * @param file	the filename to use
@@ -432,6 +601,7 @@ public class Moosique {
 		try {
 			MidiSystem.write(seq, 1, new File(file));
 			filename = file;
+			edited = false;
 			gui.setStatus("Saved " + file);
 			return true;
 		} catch (IOException e) {
@@ -440,23 +610,24 @@ public class Moosique {
 		}
 	}
 
-	/** 
-	 * Saves the current sequence to the previously given filename.
-	 */
-	public static boolean save() {
-		if (filename == null) return false;
-		else {
-			saveAs(filename);
-			return true;
-		}
-	}
-
 	/** 
 	 * Releases all reserved devices and exits the program.
 	 */
 	public static void quit() {
+		if (gui != null) {
+			if (promptOnUnsavedChanges()) return;
+		}
 		if (sequencer.isOpen()) sequencer.close();
 		if (synthesizer.isOpen()) synthesizer.close();
 		System.exit(0);
 	}
-}
\ No newline at end of file
+	
+	/** 
+	 * A Comparator for sorting lists of MidiEvents.
+	 */
+	public static class NoteComparator implements Comparator {
+		public int compare(Object o1, Object o2) {
+			return (int)(((MidiEvent)o1).getTick() - ((MidiEvent)o2).getTick());
+		}
+	}
+}