From d50b6cfbebef6c3f620f916f0d2da838c4de3355 Mon Sep 17 00:00:00 2001
From: Einar Pehrson <einarp@itstud.chalmers.se>
Date: Tue, 13 May 2003 21:54:04 +0000
Subject: [PATCH] Tweaked the progress indicator

---
 MooGUI.java     |  1 -
 MooToolbar.java | 11 ++---------
 Moosique.java   | 18 +++++++++---------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/MooGUI.java b/MooGUI.java
index 21dbdd5..9f171a3 100644
--- a/MooGUI.java
+++ b/MooGUI.java
@@ -25,7 +25,6 @@ public class MooGUI extends JFrame {
 	public MooGUI(Sequence seq) {
 		super("Moosique");
 
-
 		this.seq = seq;
 		
 		Container pane = getContentPane();
diff --git a/MooToolbar.java b/MooToolbar.java
index 08e4a0d..719ced8 100644
--- a/MooToolbar.java
+++ b/MooToolbar.java
@@ -145,37 +145,30 @@ public class MooToolbar extends JToolBar {
 					playpause.setToolTipText("Pause");
 					Moosique.resume();
 				} else if (toolTip == "Stop") {
-					resetProgInd();
 					Moosique.stop();
 				}
 			} else if (e.getSource() instanceof JLabel) {
-				long position = Moosique.getSequencer().getTickPosition();
+				long position = Moosique.getPosition();
 				if (e.getSource().equals(measuresValue)) {
 					if (SwingUtilities.isRightMouseButton(e)) {
-						System.out.println("IncM");
 						position += beatsPerMeasure * ticksPerBeat;
 					} else if (SwingUtilities.isLeftMouseButton(e) && Integer.parseInt(measuresValue.getText()) > 1) {
-						System.out.println("DecM");
 						position -= beatsPerMeasure * ticksPerBeat;
 					}
 				} else if (e.getSource().equals(beatsValue)) {
 					if (SwingUtilities.isRightMouseButton(e)) {
-						System.out.println("IncB");
 						position += ticksPerBeat;
 					} else if (SwingUtilities.isLeftMouseButton(e) && Integer.parseInt(beatsValue.getText()) > 1) {
-						System.out.println("DecB");
 						position -= ticksPerBeat;
 					}
 				} else if (e.getSource().equals(ticksValue)) {
 					if (SwingUtilities.isRightMouseButton(e)) {
-						System.out.println("IncT");
 						position += 1;
 					} else if (SwingUtilities.isLeftMouseButton(e) && Integer.parseInt(ticksValue.getText()) > 1) {
-						System.out.println("DecT");
 						position -= 1;
 					}
 				}
-				Moosique.getSequencer().setTickPosition(position);
+				Moosique.setPosition(position);
 				Moosique.getGUI().update(position);
 			}
 		}
diff --git a/Moosique.java b/Moosique.java
index 3ab7586..edace75 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();
 	}
 
@@ -197,26 +197,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 +239,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 +247,7 @@ public class Moosique {
 	 * @param measures	the number of measures to fast forward
 	 */
 	public static void forward(long ticks) {
-		setPosition(position + ticks);
+		editPosition += ticks;
 	}
 
 	/** 
-- 
2.39.2