X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooToolbar.java;h=de416699065e7ba60b327b2c7dddc292f483bfc6;hp=bca50efba950d727f80be24e97136d40795fcb17;hb=e49cbedbb512d2cbadb19f9b4b84c1b0ef39ff9c;hpb=22067aec9dd544828d90ff39a3a6d40cdfc7ea9f

diff --git a/MooToolbar.java b/MooToolbar.java
index bca50ef..de41669 100644
--- a/MooToolbar.java
+++ b/MooToolbar.java
@@ -10,7 +10,7 @@ import java.awt.event.*;
  */
 public class MooToolbar extends JToolBar {
 
-	private JButton rewind, playpause, stop, fastforward;
+	private JButton rewind, playpause, stop, fastforward, record;
 	private JLabel measure, beats, ticks, measuresValue, beatsValue, ticksValue;
 	private JPanel progIndPanel;
 	private ImageIcon playIcon, pauseIcon;
@@ -31,6 +31,7 @@ public class MooToolbar extends JToolBar {
 
 		// Creates playback buttons
 		rewind = createButton("images/rewind.gif", "Rewind");
+		record = createButton("images/record.gif", "Record");
 		playpause = createButton("images/play.gif", "Play");
 		stop = createButton("images/stop.gif", "Stop");
 		fastforward = createButton("images/forward.gif", "Fast forward");
@@ -39,6 +40,7 @@ public class MooToolbar extends JToolBar {
 
 		// Adds playback buttons
 		add(rewind);
+		add(record);
 		add(playpause);
 		add(stop);
 		add(fastforward);
@@ -81,10 +83,10 @@ public class MooToolbar extends JToolBar {
 			System.out.println("1:1:1");
 		} else {
 			int[] position = Moosique.getPositionForTicks(tickPosition);
-			System.out.println("" + position[0] + ":" + position[1] + ":" + position[2]);
-			measuresValue.setText(Integer.toString(position[0]));
-			beatsValue.setText(Long.toString(position[1]));
-			ticksValue.setText(Long.toString(position[2]));
+			System.out.println("" + (position[0] + 1) + ":" + (position[1] + 1) + ":" + (position[2] + 1));
+			measuresValue.setText(Integer.toString(position[0] + 1));
+			beatsValue.setText(Long.toString(position[1] + 1));
+			ticksValue.setText(Long.toString(position[2] + 1));
 		}
 	}
 
@@ -151,16 +153,17 @@ public class MooToolbar extends JToolBar {
 				} else if (command == "Resume") {
 					updatePlayButton("Pause", pauseIcon);
 					Moosique.resume();
+				} else if (command == "Stop") {
+					updatePlayButton("Play", playIcon);
+					Moosique.stop();
+				} else if (command == "Record") {
+					MooDialog recordDialog = new MooDialog(MooDialog.RECORD);
 				} else if (command == "Rewind") {
-					System.out.println("Rewound!");
-					// Different implementation, perhaps?
 					updatePlayButton("Play", playIcon);
 					Moosique.setEditPosition(0);
 					Moosique.stop();
 				} else if (command == "Fast forward") {
-				} else if (command == "Stop") {
-					updatePlayButton("Play", playIcon);
-					Moosique.stop();
+
 				}
 			} else if (e.getSource() instanceof JLabel) {
 				long position = Moosique.getEditPosition();