X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Moosique.java;h=c9ea45644407d55fc9f9e83a5319bc765a738948;hb=31f81450a303d52bf37ec8bcbb12e0f3b3b8b833;hp=3ab75865495ce013afe7c989bb61faa7b4b2ac8a;hpb=a25242af0e55e3db5135b29e2d7e554d5fafaaaa;p=moosique.git

diff --git a/Moosique.java b/Moosique.java
index 3ab7586..c9ea456 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();
 	}
 
@@ -176,6 +176,7 @@ public class Moosique {
 	 * Resumes playback of the current sequence.
 	 */
 	public static void resume() {
+		gui.update(0);
 		sequencer.start();
 
 		// Disables input to volatile components
@@ -197,26 +198,26 @@ public class Moosique {
 	public static void stop() {
 		if (sequencer.isRunning()) {
 			sequencer.stop();
-			sequencer.setTickPosition(position);
+			sequencer.setTickPosition(editPosition);
 			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 sequencer.getTickPosition();
+		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) {
-		sequencer.setTickPosition(ticks);
+		editPosition = ticks;
 	}
 
 	/** 
@@ -239,7 +240,7 @@ public class Moosique {
 	 * @param measures	the number of measures to rewind
 	 */
 	public static void rewind(long ticks) {
-		setPosition(position - ticks);
+		editPosition -= ticks;
 	}
 
 	/** 
@@ -247,7 +248,7 @@ public class Moosique {
 	 * @param measures	the number of measures to fast forward
 	 */
 	public static void forward(long ticks) {
-		setPosition(position + ticks);
+		editPosition += ticks;
 	}
 
 	/**