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

diff --git a/Moosique.java b/Moosique.java
index 5ee3bcc..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
@@ -22,7 +22,6 @@ public class Moosique {
 	private static String filename, fileArg;
 	private static long position;
 	private static boolean makeGUI = true;
-	private static boolean playing = false;
 
 	/** 
 	 * Starts the application.
@@ -68,9 +67,12 @@ public class Moosique {
 			clearSequence();
 		}
 
-		// If n-flag is set, plays song and then exits. Otherwise builds GUI.
+		// 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 {
@@ -147,7 +149,6 @@ public class Moosique {
 	 * Starts playback of the current sequence.
 	 */
 	public static void play() {
-		playing = true;
 		sequencer.setTickPosition(position);
 		sequencer.start();
 	}
@@ -156,7 +157,6 @@ public class Moosique {
 	 * Pauses playback of the current sequence.
 	 */
 	public static void pause() {
-		playing = false;
 		sequencer.stop();
 	}
 
@@ -164,7 +164,6 @@ public class Moosique {
 	 * Resumes playback of the current sequence.
 	 */
 	public static void resume() {
-		playing = true;
 		sequencer.start();
 	}
 
@@ -172,22 +171,10 @@ public class Moosique {
 	 * Stops playback of the current sequence.
 	 */
 	public static void stop() {
-		playing = false;
 		sequencer.stop();
 		sequencer.setTickPosition(position);
 	}
 
-	/**
-	 * Pauses if playing and resumes if stopped.
-	 */
-	public static void resumepause()
-	{
-		if (playing)
-			pause();
-		else
-			resume();
-	}
-
 	/** 
 	 * Rewinds the current sequence the given number of measures.
 	 * @param measures	the number of measures to rewind
@@ -232,7 +219,6 @@ public class Moosique {
 		} catch (InvalidMidiDataException e) {
 			return false;
 		} catch (IOException e) {
-			JOptionPane.showMessageDialog(null, "Error 404", "File Not Found", JOptionPane.ERROR_MESSAGE); 
 			return false;
 		}
 
@@ -304,4 +290,4 @@ public class Moosique {
 		if (synthesizer.isOpen()) synthesizer.close();
 		System.exit(0);
 	}
-}
+}
\ No newline at end of file