Tweaked the progress indicator

[moosique.git] / MooTrackTitle.java

diff --git a/MooTrackTitle.java b/MooTrackTitle.java
index cc17d170e620995ab22639fbec80b23db9e380a0..a97844b2f208fc755c7f7e89b10cfb307e6dd480 100644 (file)
--- a/MooTrackTitle.java
+++ b/MooTrackTitle.java
@@ -50,7 +50,10 @@ public class MooTrackTitle extends JPanel {
                MidiEvent event;
                for (int i = 0; i < track.size(); i++) {
                        event = track.get(i);
-                       if (event instanceof MooNote) channel = ((MooNote)event).getChannel();
+                       if (event instanceof MooNote) {
+                               channel = ((MooNote)event).getChannel();
+                               break;
+                       }
                }
                
                // Creates and places components.
@@ -63,8 +66,6 @@ public class MooTrackTitle extends JPanel {
                title.addFocusListener(new TitleFocusListener());
                add(title);
 
-               instruments = new MooInstrumentList(programChange);
-               add(instruments);
 
                JPanel checkboxes = new JPanel();
                checkboxes.setLayout(new GridLayout(1,3));
@@ -74,14 +75,9 @@ public class MooTrackTitle extends JPanel {
                for (int i = 1; i <= 16; i++)
                        channelBox.addItem(new Integer(i));
 
-               for (int j = 0; j < track.size(); j++) {
-                       MidiEvent me = track.get(j);
-               if (me instanceof MooNote){
-                               MooNote mn = (MooNote)me;
-                               channelBox.setSelectedIndex(mn.getChannel());
-                               break;
-                       }
-        }
+               channelBox.setSelectedIndex(channel);
+
+               instruments = new MooInstrumentList(channelBox.getSelectedIndex());
 
                instruments = new MooInstrumentList(channelBox.getSelectedIndex());
 
@@ -99,6 +95,8 @@ public class MooTrackTitle extends JPanel {
                                                }
                                }}});
                channelBox.setSelectedIndex(channel);
+
+               add(instruments);
                add(channelBox);
 
                mute = new JCheckBox("Mute");