no message

[moosique.git] / MooInstrumentList.java

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 88903e039eb838360a771b3129d3201819052f74..388a9d6b4dc3d3748f82c826eee97428af0fbb93 100644 (file)
--- a/MooInstrumentList.java
+++ b/MooInstrumentList.java
@@ -6,30 +6,46 @@ import java.awt.event.*;
 /**
  * A Combo Box where the instrument of the currently active channel can be selected.
  * 
- * @author  Einar Pehrson
+ * @author  Einar Pehrson, Michael Andreen
  */
  
 public class MooInstrumentList extends JComboBox implements ActionListener {
 
        protected int channel;
-       public MooInstrumentList(int chan) {
-               super(instruments);
-               setChannel(chan);
+       public static final int INSTRUMENTS = 0, DRUMS = 1;
+       
+       /**
+        * Creates the instrument list.
+        * @param chan The channel it will operate on.
+        */
+       public MooInstrumentList(int chan, int listType) {
+               super(instruments[listType]);
+               setChannel(chan);       
                setFont(new Font("Helvetica", Font.PLAIN, 10));
                addActionListener(this);
        }
 
-       public void setChannel(int chan){
+       /**
+        * Sets the channel that it will operate on.
+        */
+       public void setChannel(int chan) {
                channel = chan;
-               setSelectedIndex(Moosique.getChannel(chan).getProgram());
+               setSelectedIndex(Moosique.getChannel(channel).getProgram());
        }
+
+       /**
+        * Sets the instrument on a channel when it's changed in the combobox.
+        */
        public void actionPerformed(ActionEvent e) {
                JComboBox box = (JComboBox)e.getSource();
                int instrument = box.getSelectedIndex();
                Moosique.getChannel(channel).programChange(instrument);
        }
     
-       public static final String[] instruments = {
+       /**
+        * The list with standard midi instruments.
+        */
+       public static final String[][] instruments = {{
                " 0 Acoustic Grand Piano",
                " 1 Bright Acoustic Piano",
                " 2 Electric Grand Piano",
@@ -158,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;
+               }       
+       }
 }