no message

[moosique.git] / MooTrackTitle.java

diff --git a/MooTrackTitle.java b/MooTrackTitle.java
index b921926bd8dc9527b99ebe7825fe7816ab981f23..c2f1c0fa20097364e509b16493e548ec7916f250 100644 (file)
--- a/MooTrackTitle.java
+++ b/MooTrackTitle.java
@@ -12,25 +12,26 @@ import javax.sound.midi.*;
  
 public class MooTrackTitle extends JPanel {
 
+       private Track track;
        private MetaMessage trackNameMessage;
-       private String trackName = "";
        private ShortMessage programChangeMessage;
-       private int channel = 0;
+
        private JTextField title;
        private MooInstrumentList instruments;
        private JComboBox channelBox;
        private JCheckBox mute;
        private JCheckBox solo;
-       private Track track;
-       private int trackNum;
+
+       private String trackName = "";
+       private int channel = 0;
 
        /** 
         * Creates the title bar.
+        * @param aTrack the track that this tracktitle is operating on.
         */
-       public MooTrackTitle (Track aTrack, int aTrackNum) {
+       public MooTrackTitle (Track aTrack) {
                setDoubleBuffered(true);
                track = aTrack;
-               this.trackNum = aTrackNum;
 
                // Finds track name, program change and channel.
                MidiMessage msg;
@@ -49,16 +50,6 @@ public class MooTrackTitle extends JPanel {
                        }
                }
 
-/*             // Finds channel number.
-               MidiEvent event;
-               for (int i = 0; i < track.size(); i++) {
-                       event = track.get(i);
-                       if (event instanceof MooNote) {
-                               channel = ((MooNote)event).getChannel();
-                               break;
-                       }
-               }
-*/             
                // Creates and places components.
                setLayout(new GridLayout(4,1));
                setBorder(BorderFactory.createLineBorder(Color.black));
@@ -69,8 +60,11 @@ public class MooTrackTitle extends JPanel {
                title.addFocusListener(new TitleFocusListener());
                add(title);
 
-               instruments = new MooInstrumentList(channel);
-               // instruments = new MooInstrumentList(channel, programChangeMessage);
+               int type;
+               if (channel == 9) type = MooInstrumentList.DRUMS;
+               else type = MooInstrumentList.INSTRUMENTS;
+               instruments = new MooInstrumentList(channel, type);
+               // instruments = new MooInstrumentList(channel, type, programChangeMessage);
                add(instruments);
 
                channelBox = new JComboBox();
@@ -99,22 +93,22 @@ public class MooTrackTitle extends JPanel {
                checkboxes.setLayout(new GridLayout(1,3));
 
                mute = new JCheckBox("Mute");
-               mute.setSelected(Moosique.getSequencer().getTrackMute(trackNum));
+               mute.setSelected(Moosique.getChannel(channel).getMute());
                mute.setFont(Moosique.getGUI().FONT);
                mute.addActionListener(new ActionListener(){
                                public void actionPerformed(ActionEvent event){
                                        boolean selected = mute.isSelected();
                                        if (selected){
                                                solo.setSelected(false);
-                                               Moosique.getSequencer().setTrackSolo(trackNum, false);
+                                               Moosique.getChannel(channel).setSolo(false);
                                        }
-                                       Moosique.getSequencer().setTrackMute(trackNum, selected);
+                                       Moosique.getChannel(channel).setMute(selected);
 
                                }});
                checkboxes.add(mute);
 
                solo = new JCheckBox("Solo");
-               solo.setSelected(Moosique.getSequencer().getTrackSolo(trackNum));
+               solo.setSelected(Moosique.getChannel(channel).getSolo());
                solo.setFont(Moosique.getGUI().FONT);
                solo.addActionListener(new ActionListener(){
                                public void actionPerformed(ActionEvent event){
@@ -122,14 +116,25 @@ public class MooTrackTitle extends JPanel {
                                        boolean selected = solo.isSelected();
                                        if (selected){
                                                mute.setSelected(false);
-                                               Moosique.getSequencer().setTrackMute(trackNum, false);
+                                               Moosique.getChannel(channel).setMute(false);
                                        }
-                                       Moosique.getSequencer().setTrackSolo(trackNum, selected);
+                                       Moosique.getChannel(channel).setSolo(selected);
                                }});
                checkboxes.add(solo);
                add(checkboxes);
        }
+       
+       /** 
+        * Returns the channel of the track that the view is visualising.
+        * @return the chanel of the visualised track
+        */
+       public int getChannel() {
+               return channel;
+       }
 
+       /**
+        * Checks if the focus is lost.
+        */
        class TitleFocusListener extends FocusAdapter {
                public void focusLost(FocusEvent e) {
                        // Update the MidiEvent containing the title of this track