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

diff --git a/MooTrackTitle.java b/MooTrackTitle.java
index a71b361..d5876c1 100644
--- a/MooTrackTitle.java
+++ b/MooTrackTitle.java
@@ -12,25 +12,25 @@ import javax.sound.midi.*;
  
 public class MooTrackTitle extends JPanel {
 
+	private Track track;
 	private MetaMessage trackNameMessage;
-	private String trackName = "";
 	private ShortMessage programChangeMessage;
-	private int channel = 0;
+
 	private JTextField title;
 	private MooInstrumentList instruments;
 	private JComboBox channelBox;
 	private JCheckBox mute;
 	private JCheckBox solo;
-	private Track track;
-	private int trackNum;
+
+	private String trackName = "";
+	private int channel = 0;
 
 	/** 
 	 * Creates the title bar.
 	 */
-	public MooTrackTitle (Track aTrack, int aTrackNum) {
+	public MooTrackTitle (Track aTrack) {
 		setDoubleBuffered(true);
 		track = aTrack;
-		this.trackNum = aTrackNum;
 
 		// Finds track name, program change and channel.
 		MidiMessage msg;
@@ -89,22 +89,22 @@ public class MooTrackTitle extends JPanel {
 		checkboxes.setLayout(new GridLayout(1,3));
 
 		mute = new JCheckBox("Mute");
-		mute.setSelected(Moosique.getSequencer().getTrackMute(trackNum));
+		mute.setSelected(Moosique.getChannel(channel).getMute());
 		mute.setFont(Moosique.getGUI().FONT);
 		mute.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent event){
 					boolean selected = mute.isSelected();
 					if (selected){
 						solo.setSelected(false);
-						Moosique.getSequencer().setTrackSolo(trackNum, false);
+						Moosique.getChannel(channel).setSolo(false);
 					}
-					Moosique.getSequencer().setTrackMute(trackNum, selected);
+					Moosique.getChannel(channel).setMute(selected);
 
 				}});
 		checkboxes.add(mute);
 
 		solo = new JCheckBox("Solo");
-		solo.setSelected(Moosique.getSequencer().getTrackSolo(trackNum));
+		solo.setSelected(Moosique.getChannel(channel).getSolo());
 		solo.setFont(Moosique.getGUI().FONT);
 		solo.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent event){
@@ -112,9 +112,9 @@ public class MooTrackTitle extends JPanel {
 					boolean selected = solo.isSelected();
 					if (selected){
 						mute.setSelected(false);
-						Moosique.getSequencer().setTrackMute(trackNum, false);
+						Moosique.getChannel(channel).setMute(false);
 					}
-					Moosique.getSequencer().setTrackSolo(trackNum, selected);
+					Moosique.getChannel(channel).setSolo(selected);
 				}});
 		checkboxes.add(solo);
 		add(checkboxes);