From 347729cadd1844ab1de02fff8559119abea2e483 Mon Sep 17 00:00:00 2001 From: Einar Pehrson Date: Fri, 16 May 2003 15:26:49 +0000 Subject: [PATCH] *** empty log message *** --- MooInstrumentList.java | 15 +++++++++++---- MooTrackTitle.java | 7 +++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/MooInstrumentList.java b/MooInstrumentList.java index 7138c37..388a9d6 100644 --- a/MooInstrumentList.java +++ b/MooInstrumentList.java @@ -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; + } + } } diff --git a/MooTrackTitle.java b/MooTrackTitle.java index 545681d..c2f1c0f 100644 --- a/MooTrackTitle.java +++ b/MooTrackTitle.java @@ -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(); -- 2.39.2