X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooToolbar.java;h=de416699065e7ba60b327b2c7dddc292f483bfc6;hp=1ea47ab08f5e3af9becb759089bc58889cdda5ef;hb=HEAD;hpb=c31857b9fcb119f0d4c12b96222f66340b3dcc56

diff --git a/MooToolbar.java b/MooToolbar.java
index 1ea47ab..de41669 100644
--- a/MooToolbar.java
+++ b/MooToolbar.java
@@ -1,7 +1,7 @@
+import javax.sound.midi.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import javax.sound.midi.*;
 
 /**
  * The application's toolbar, with the most frequently used commands.
@@ -10,7 +10,7 @@ import javax.sound.midi.*;
  */
 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);
@@ -75,17 +77,16 @@ public class MooToolbar extends JToolBar {
 	 * @param tickPosition	the tick position to visualize
 	 */
 	public void updateProgInd(long tickPosition) {
-		ticksPerBeat = Moosique.getSequence().getResolution();
+		System.out.print("Updating to " + tickPosition + " = ");
 		if (tickPosition == 0) {
 			resetProgInd();
+			System.out.println("1:1:1");
 		} else {
-			// Otherwise, calculates the current song position in measures, beats and ticks.
-			long measures = tickPosition / (beatsPerMeasure * ticksPerBeat);
-			long beats = (tickPosition - measures * beatsPerMeasure * ticksPerBeat) / ticksPerBeat;
-			long ticks = tickPosition - measures * beatsPerMeasure * ticksPerBeat - beats * ticksPerBeat;
-			measuresValue.setText(Long.toString(1 + measures));
-			beatsValue.setText(Long.toString(1 + beats));
-			ticksValue.setText(Long.toString(1 + ticks));
+			int[] position = Moosique.getPositionForTicks(tickPosition);
+			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));
 		}
 	}
 
@@ -93,12 +94,11 @@ public class MooToolbar extends JToolBar {
 	 * Resets the progress indicator.
 	 */
 	public void resetProgInd() {
-			measuresValue.setText("1");
-			beatsValue.setText("1");
-			ticksValue.setText("1");
-			playpause.setIcon(playIcon);
-			playpause.setToolTipText("Play");
-			ticksPerBeat = Moosique.getSequence().getResolution();
+		measuresValue.setText("1");
+		beatsValue.setText("1");
+		ticksValue.setText("1");
+		updatePlayButton("Play", playIcon);
+		ticksPerBeat = Moosique.getSequence().getResolution();
 	}
 
 	/**
@@ -131,33 +131,39 @@ public class MooToolbar extends JToolBar {
 		return label;
 	}
 
+	/**
+	 * Updates the play button with the given command and icon.
+	 */
+	private void updatePlayButton(String command, Icon icon) {
+		playpause.setIcon(icon);
+		playpause.setActionCommand(command);
+		playpause.setToolTipText(command);
+	}
+
 	class MAdapter extends MouseAdapter {
 		public void mouseClicked(MouseEvent e) {
 			if (e.getSource() instanceof JButton) {
 				String command = ((JButton)e.getSource()).getActionCommand();
 				if (command == "Play") {
-					playpause.setIcon(pauseIcon);
-					playpause.setActionCommand("Pause");
-					playpause.setToolTipText("Pause");
+					updatePlayButton("Pause", pauseIcon);
 					Moosique.play();
 				} else if (command == "Pause") {
-					playpause.setIcon(playIcon);
-					playpause.setActionCommand("Resume");
-					playpause.setToolTipText("Resume");
+					updatePlayButton("Resume", playIcon);
 					Moosique.pause();
 				} else if (command == "Resume") {
-					playpause.setIcon(pauseIcon);
-					playpause.setActionCommand("Pause");
-					playpause.setToolTipText("Pause");
+					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") {
-					// Different implementation, perhaps?
+					updatePlayButton("Play", playIcon);
 					Moosique.setEditPosition(0);
 					Moosique.stop();
 				} else if (command == "Fast forward") {
 
-				} else if (command == "Stop") {
-					Moosique.stop();
 				}
 			} else if (e.getSource() instanceof JLabel) {
 				long position = Moosique.getEditPosition();
@@ -185,7 +191,7 @@ public class MooToolbar extends JToolBar {
 			}
 		}
 
-		public void mousePressed(MouseEvent e) {
+/*		public void mousePressed(MouseEvent e) {
 			if (e.getSource() instanceof JButton) {
 				if (((JButton)e.getSource()).getToolTipText() == "Rewind") {
 					Moosique.rewind(beatsPerMeasure * ticksPerBeat);
@@ -196,5 +202,5 @@ public class MooToolbar extends JToolBar {
 		}
 
 		public void mouseReleased(MouseEvent e) {}
-	}
+*/	}
 }