nu är även den fina scale velocity dialogen färdig

[moosique.git] / MooTrackTitle.java

diff --git a/MooTrackTitle.java b/MooTrackTitle.java
index dbf70a1e6cba0884d8ed2c6ec5282971070ee8c2..979aed2139208e234f4124871b34b955fe536aef 100644 (file)
--- a/MooTrackTitle.java
+++ b/MooTrackTitle.java
@@ -25,6 +25,16 @@ public class MooTrackTitle extends JPanel {
        private String trackName = "";
        private int channel = 0;
 
+       /** 
+        * Creates the title bar for an empty track, and therefore an initial channel is required.
+        * @param aTrack the track that this tracktitle is operating on.
+        * @param chan  the initial channel
+        */
+       public MooTrackTitle (Track aTrack, int chan) {
+               this(aTrack);
+               channel = chan;
+       }
+
        /** 
         * Creates the title bar.
         * @param aTrack the track that this tracktitle is operating on.
@@ -93,34 +103,34 @@ public class MooTrackTitle extends JPanel {
                checkboxes.setLayout(new GridLayout(1,3));
 
                mute = new JCheckBox("Mute");
-               mute.setSelected(Moosique.getSequencer().getTrackMute(getTrackNum()));
+               mute.setSelected(false);
+               Moosique.setTrackMute(track, false);
                mute.setFont(Moosique.getGUI().FONT);
                mute.addActionListener(new ActionListener(){
                                public void actionPerformed(ActionEvent event){
                                        boolean selected = mute.isSelected();
-                                       int trackNum = getTrackNum();
                                        if (selected){
                                                solo.setSelected(false);
-                                               Moosique.getSequencer().setTrackSolo(trackNum, false);
+                                               Moosique.setTrackSolo(track, false);
                                        }
-                                       Moosique.getSequencer().setTrackMute(trackNum, selected);
+                                       Moosique.setTrackMute(track, selected);
 
                                }});
                checkboxes.add(mute);
 
                solo = new JCheckBox("Solo");
-               solo.setSelected(Moosique.getSequencer().getTrackSolo(getTrackNum()));
+               solo.setSelected(false);
+               Moosique.setTrackSolo(track, false);
                solo.setFont(Moosique.getGUI().FONT);
                solo.addActionListener(new ActionListener(){
                                public void actionPerformed(ActionEvent event){
                                        //setSolo
                                        boolean selected = solo.isSelected();
-                                       int trackNum = getTrackNum();
                                        if (selected){
                                                mute.setSelected(false);
-                                               Moosique.getSequencer().setTrackMute(trackNum, false);
+                                               Moosique.setTrackMute(track, false);
                                        }
-                                       Moosique.getSequencer().setTrackSolo(trackNum, selected);
+                                       Moosique.setTrackSolo(track, selected);
                                }});
                checkboxes.add(solo);
                add(checkboxes);
@@ -134,16 +144,6 @@ public class MooTrackTitle extends JPanel {
                return channel;
        }
 
-       protected int getTrackNum() {
-               Track[] tracks = Moosique.getSequence().getTracks();
-
-               for (int i = 0; i < tracks.length; i++) {
-                       if (tracks[i] == track)
-                               return i;
-               }
-               System.out.println("Couldn't find track");
-               return 0;
-       }
        /**
         * Checks if the focus is lost.
         */