]> ruin.nu Git - moosique.git/commitdiff
*** empty log message ***
authorEinar Pehrson <einarp@itstud.chalmers.se>
Fri, 16 May 2003 15:26:49 +0000 (15:26 +0000)
committerEinar Pehrson <einarp@itstud.chalmers.se>
Fri, 16 May 2003 15:26:49 +0000 (15:26 +0000)
MooInstrumentList.java
MooTrackTitle.java

index 7138c374f2c2e0379eee9907eb5ea0cfa64e70a4..388a9d6b4dc3d3748f82c826eee97428af0fbb93 100644 (file)
@@ -12,13 +12,14 @@ import java.awt.event.*;
 public class MooInstrumentList extends JComboBox implements ActionListener {
 
        protected int channel;
+       public static final int INSTRUMENTS = 0, DRUMS = 1;
        
        /**
         * Creates the instrument list.
         * @param chan The channel it will operate on.
         */
-       public MooInstrumentList(int chan) {
-               super(instruments);
+       public MooInstrumentList(int chan, int listType) {
+               super(instruments[listType]);
                setChannel(chan);       
                setFont(new Font("Helvetica", Font.PLAIN, 10));
                addActionListener(this);
@@ -44,7 +45,7 @@ public class MooInstrumentList extends JComboBox implements ActionListener {
        /**
         * The list with standard midi instruments.
         */
-       public static final String[] instruments = {
+       public static final String[][] instruments = {{
                " 0 Acoustic Grand Piano",
                " 1 Bright Acoustic Piano",
                " 2 Electric Grand Piano",
@@ -173,5 +174,11 @@ public class MooInstrumentList extends JComboBox implements ActionListener {
                " 125 Helicopter",
                " 126 Applause",
                " 127 Gunshot"
-       };
+       }, new String[128]};
+       
+       static {
+               for (int i = 0; i < 128; i++) {
+                       instruments[1][i] = " Program Change " + i;
+               }       
+       }
 }
index 545681d89d53e529cb3053627aed33e7be193264..c2f1c0fa20097364e509b16493e548ec7916f250 100644 (file)
@@ -60,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();