no message

[moosique.git] / MooToolbar.java

diff --git a/MooToolbar.java b/MooToolbar.java
index 5be8fdb77a29d0ddfd251bce0fd60433c9c79333..de416699065e7ba60b327b2c7dddc292f483bfc6 100644 (file)
--- 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));
                }
        }
 
@@ -152,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();