X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooTrackTitle.java;h=e22c3219846e013d6553dbbda8f851c8b65fe250;hp=d5876c1485718a34f6ae3ef940152182d5f2974c;hb=aae2d0b4428236b4147f466b3858a34bb7ed174f;hpb=ce9a16d679f2058454af367e972888ba8e2c34c0

diff --git a/MooTrackTitle.java b/MooTrackTitle.java
index d5876c1..e22c321 100644
--- a/MooTrackTitle.java
+++ b/MooTrackTitle.java
@@ -27,6 +27,7 @@ public class MooTrackTitle extends JPanel {
 
 	/** 
 	 * Creates the title bar.
+	 * @param aTrack the track that this tracktitle is operating on.
 	 */
 	public MooTrackTitle (Track aTrack) {
 		setDoubleBuffered(true);
@@ -59,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();
@@ -72,15 +76,15 @@ public class MooTrackTitle extends JPanel {
 
 		channelBox.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent e){
-					int chan = channelBox.getSelectedIndex();
+					channel = channelBox.getSelectedIndex();
 					MidiEvent me;
 					MooNote mn;
-					instruments.setChannel(channelBox.getSelectedIndex());
+					instruments.setChannel(channel);
 					for (int j = 0; j < track.size(); j++) {
 						me = track.get(j);
    					    if (me instanceof MooNote){
 							mn = (MooNote)me;
-							mn.setChannel(chan);
+							mn.setChannel(channel);
 						}
     				}}});
 		add(channelBox);
@@ -119,7 +123,18 @@ public class MooTrackTitle extends JPanel {
 		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