Fixed some bugs

[moosique.git] / MooMenu.java

diff --git a/MooMenu.java b/MooMenu.java
index 7a0785b304fcb878d996adfc74e01eaef7b9a920..141fd93f87320054204ea2f486efdebab9542ed0 100644 (file)
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -1,3 +1,4 @@
+import javax.sound.midi.*;
 import javax.swing.*;
 import javax.swing.filechooser.*;
 import java.awt.event.*;
@@ -120,6 +121,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
 
        public void actionPerformed(ActionEvent e) {
                String command = e.getActionCommand();
+               Sequence seq;
                
                if(command == "New") {
                        Moosique.clearSequence();
@@ -139,7 +141,6 @@ public class MooMenu extends JMenuBar implements ActionListener {
                        if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(chooser.getSelectedFile())) {
                                Moosique.saveAs(chooser.getSelectedFile().getAbsolutePath());
                        }
-               
                } else if (command == "Exit") {
                        Moosique.quit();
                } else if (command == "Copy") {
@@ -155,25 +156,20 @@ public class MooMenu extends JMenuBar implements ActionListener {
                } else if (command == "Preferences...") {
 
                } else if (command == "Play") {
-                       if (Moosique.getSequencer().isRunning()) {
-                               Moosique.pause();
-                       } else {
-                               Moosique.play();
-                       }
+                       if (!Moosique.getSequencer().isRunning()) Moosique.play();
                } else if (command == "Pause") {
-                       if (Moosique.getSequencer().isRunning()) {
-                               Moosique.resume();
-                       } else {
-                               Moosique.pause();
-                       }
+                       if (Moosique.getSequencer().isRunning()) Moosique.pause();
                } else if (command == "Stop") {
                        Moosique.stop();
                } else if (command == "Jump...") {
-               
+                       
                } else if (command == "Add track...") {
-               
+                       Moosique.getSequence().createTrack();
                } else if (command == "Delete track...") {
-               
+                       /* Let the user select a track from a list.
+                       seq = Moosique.getSequence();
+                       seq.deleteTrack(seq.getTracks()[NUMBER]);
+                       */
                } else if (command == "Copy track...") {
                
                } else if (command == "Move track...") {
@@ -203,7 +199,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
                        JOptionPane.showMessageDialog(null, "här kommer about att komma");
                }
        }
-       
+
        class MidiFileFilter extends javax.swing.filechooser.FileFilter {
                public boolean accept(File f) {
                        if(f != null) {