X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Moosique.java;h=5d6ed9716b569d472141910edfb0e41358c21d74;hb=c83e74facf762222fe4578f175408cc50d360518;hp=c411cd6f38cf779e74dda15f66bb68a6856a77db;hpb=d7666fadd2f8baca8a03cacae836f2563fe4dd5d;p=moosique.git

diff --git a/Moosique.java b/Moosique.java
index c411cd6..5d6ed97 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -1,6 +1,6 @@
 import javax.sound.midi.*;
-import javax.swing.*;
 import java.io.*;
+import javax.swing.*;
 
 /**
  * Moosique - The MIDI Tracker
@@ -12,22 +12,29 @@ import java.io.*;
  
 public class Moosique {
 
-	protected static MooGUI gui;
-	protected static Sequence seq;
+	private static MooGUI gui;
+	private static Sequence seq;
+	private static Sequencer sequencer;
+	private static Synthesizer synthesizer;
+	private static MidiChannel[] channels;
+	private static MidiChannel activeChannel;
 
-	protected static Sequencer sequencer;
-	protected static Synthesizer synthesizer;
-	protected static MidiChannel[] channels;
-	protected static MidiChannel activeChannel;
-
-	protected static String filename;
-	protected static long position;
+	private static String filename, fileArg;
+	private static long position;
+	private static boolean makeGUI = true;
 
 	/** 
 	 * Starts the application.
 	 */
 	public static void main (String[] args) {
 		System.out.println("\nMoosique version 1.0\n");
+
+		// Parses command-line arguments.
+		for (int i = 0; i < args.length; i++) {
+			if (args[i].equals("-n")) {makeGUI = false;}
+			else if (fileArg == null) {fileArg = args[i];}
+		}
+
 		// Acquires MIDI devices and connects them.
 		System.out.print("Initializing MIDI devices.");
 		try {
@@ -47,23 +54,46 @@ public class Moosique {
 		System.out.println("Done");
 
 		//If a filename is given as the command-line argument, attempts to load a sequence from the file.
-		System.out.print("Loading MIDI sequence...");
-		if (args.length == 1) {
-			if (!load(args[0])) clearSequence();
+		if (fileArg != null) {
+			System.out.print("Loading MIDI sequence from " + fileArg + "...");
+			if (!load(fileArg)) {
+				System.out.println("Failed");
+				clearSequence();
+			} else {
+				System.out.println("Done");
+			}
 		} else {
 			// Otherwise creates a new empty one.
 			clearSequence();
 		}
-		System.out.println("Done");
 
-		// Sets up channels and GUI.
-		System.out.print("Creating GUI...");
-		gui = new MooGUI(seq);
-		System.out.println("Done");
+		// Builds GUI, unless n-flag is set.
+		if (makeGUI) {
+			System.out.print("Building GUI...");
+			try {
+				UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+			} catch (Exception e) {}
+			gui = new MooGUI(seq);
+			System.out.println("Done");
+		} else {
+			System.out.print("Playing...");
+			play();
+			while (sequencer.isRunning()) {}
+			System.out.println("Done");
+			quit();
+		}
+	}
+
+	/** 
+	 * Returns the GUI.
+	 * @return the GUI
+	 */
+	public static MooGUI getGUI() {
+		return gui;
 	}
 
 	/** 
-	 * Returns a pointer to the current sequence.
+	 * Returns the current sequence.
 	 * @return the current sequence
 	 */
 	public static Sequence getSequence() {
@@ -71,7 +101,15 @@ public class Moosique {
 	}
 
 	/** 
-	 * Returns a pointer to the MidiChannels of the selected synthesizer.
+	 * Returns the current sequencer.
+	 * @return the current sequencer
+	 */
+	public static Sequencer getSequencer() {
+		return sequencer;
+	}
+
+	/** 
+	 * Returns the MidiChannels of the selected synthesizer.
 	 * @return the available MidiChannels
 	 */
 	public static MidiChannel[] getChannels() {
@@ -79,7 +117,7 @@ public class Moosique {
 	}
 
 	/** 
-	 * Returns a pointer to the currently active MidiChannel.
+	 * Returns the currently active MidiChannel.
 	 * @return the active MidiChannel
 	 */
 	public static MidiChannel getActiveChannel() {
@@ -98,23 +136,20 @@ public class Moosique {
 	 * Replaces the current sequence with a new one, holding three empty tracks.
 	 */
 	public static void clearSequence() {
-		// Creates sequence.
+		// Creates a new sequence and sends it to the sequencer.
 		try {
 			seq = new Sequence(Sequence.PPQ, 96, 3);
+			sequencer.setSequence(seq);
 		} catch (InvalidMidiDataException e) {}
 		// Sends sequence to GUI.
 		if (gui != null) gui.setSequence(seq);
-	
 	}
 
 	/** 
 	 * Starts playback of the current sequence.
 	 */
 	public static void play() {
-		try {
-			sequencer.setSequence(seq);
-			sequencer.setTickPosition(position);
-		} catch (InvalidMidiDataException e) {}
+		sequencer.setTickPosition(position);
 		sequencer.start();
 	}
 
@@ -161,7 +196,7 @@ public class Moosique {
 	 * @param measures	the number of measures to rewind
 	 */
 	public static void rewind(long ticks) {
-		position -= ticks;
+		setPosition(position - ticks);
 	}
 
 	/** 
@@ -169,7 +204,7 @@ public class Moosique {
 	 * @param measures	the number of measures to fast forward
 	 */
 	public static void forward(long ticks) {
-		position += ticks;
+		setPosition(position + ticks);
 	}
 
 	/** 
@@ -184,12 +219,14 @@ public class Moosique {
 		} catch (InvalidMidiDataException e) {
 			return false;
 		} catch (IOException e) {
-			JOptionPane.showMessageDialog(null, "Error 404", "File Not Found", JOptionPane.ERROR_MESSAGE); 
 			return false;
 		}
 
-		// Sends sequence to GUI
+		// Sends sequence to GUI and sequencer
 		if (gui != null) gui.setSequence(seq);
+		try {
+			sequencer.setSequence(seq);
+		} catch (InvalidMidiDataException e) {}
 
 		// Searches the sequence for NoteOn events
 		Track[] tracks = seq.getTracks();
@@ -229,16 +266,19 @@ public class Moosique {
 
 	/** 
 	 * Saves the current sequence to the given filename
-	 * @param filename	the filename to use
+	 * @param file	the filename to use
 	 */
-	public static void saveAs(String filename) throws IOException {
-		MidiSystem.write(seq, 1, new File(filename));
+	public static void saveAs(String file) {
+		try {
+			MidiSystem.write(seq, 1, new File(filename));
+		} catch (IOException e) {}
+		filename = file;
 	}
 
 	/** 
 	 * Saves the current sequence to the previously given filename.
 	 */
-	public static void save() throws IOException {
+	public static void save() {
 		saveAs(filename);
 	}