X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Moosique.java;h=df94b478e464f79277871e4d95d80265b03da463;hb=ca56fc1424e8887b09375a52e8e02605d5dff175;hp=c10043616f76d847484e05af0ebb896861f36d70;hpb=f7c0dc0b216c60d93f722b040878a51399679fc2;p=moosique.git

diff --git a/Moosique.java b/Moosique.java
index c100436..df94b47 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -21,7 +21,7 @@ public class Moosique {
 	private static MidiChannel activeChannel;
 
 	private static String filename, fileArg;
-	private static long position;
+	private static long editPosition;
 	private static boolean makeGUI = true, isEdited;
 	private static Thread player;
 	public static final int RESOLUTION = 96, DEFAULT_TRACKS = 4;
@@ -160,7 +160,7 @@ public class Moosique {
 	 * Starts playback of the current sequence.
 	 */
 	public static void play() {
-		sequencer.setTickPosition(position);
+		sequencer.setTickPosition(editPosition);
 		resume();
 	}
 
@@ -168,14 +168,17 @@ public class Moosique {
 	 * Pauses playback of the current sequence.
 	 */
 	public static void pause() {
-		sequencer.stop();
-		player.interrupt();
+		if (sequencer.isRunning()) {
+			sequencer.stop();
+		}
+		if (player != null) player.interrupt();
 	}
 
 	/** 
 	 * Resumes playback of the current sequence.
 	 */
 	public static void resume() {
+		gui.update(0);
 		sequencer.start();
 
 		// Disables input to volatile components
@@ -195,26 +198,28 @@ public class Moosique {
 	 * Stops playback of the current sequence.
 	 */
 	public static void stop() {
-		sequencer.stop();
-		sequencer.setTickPosition(position);
-		player.interrupt();
+		if (sequencer.isRunning()) {
+			sequencer.stop();
+		}
+		sequencer.setTickPosition(editPosition);
+		if (player != null) player.interrupt();
 		gui.update((long)0);
 	}
 
 	/** 
-	 * Returns the current tick position of the sequencer.
+	 * Returns the current editing position of the sequencer.
 	 * @return the tick position
 	 */
 	public static long getPosition() {
-		return position;
+		return editPosition;
 	}
 
 	/** 
-	 * Sets the current tick position of the sequencer.
+	 * Sets the current editing position of the sequencer.
 	 * @param ticks		the tick position
 	 */
 	public static void setPosition(long ticks) {
-		position = ticks;
+		editPosition = ticks;
 	}
 
 	/** 
@@ -237,7 +242,7 @@ public class Moosique {
 	 * @param measures	the number of measures to rewind
 	 */
 	public static void rewind(long ticks) {
-		setPosition(position - ticks);
+		editPosition -= ticks;
 	}
 
 	/** 
@@ -245,7 +250,7 @@ public class Moosique {
 	 * @param measures	the number of measures to fast forward
 	 */
 	public static void forward(long ticks) {
-		setPosition(position + ticks);
+		editPosition += ticks;
 	}
 
 	/**