setting mute and solo on channel instead..

diff --git a/MooTrackTitle.java b/MooTrackTitle.java
index d3b9a8a754ce06c328d59570b316f2366fd64725..d5876c1485718a34f6ae3ef940152182d5f2974c 100644 (file)
--- a/MooTrackTitle.java
+++ b/MooTrackTitle.java
@@ -23,15 +23,14 @@ public class MooTrackTitle extends JPanel {
        private JCheckBox solo;
 
        private String trackName = "";
-       private int trackNum, channel = 0;
+       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;
@@ -90,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){
@@ -113,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);

diff --git a/MooView.java b/MooView.java
index 836629b74ef3fb970e3b669418253d783a4570cb..ee2880ba01cd1df96b7749445ab7c5f32fbdd7c2 100644 (file)
--- a/MooView.java
+++ b/MooView.java
@@ -51,7 +51,7 @@ public class MooView extends JScrollPane {
                if (numberOfTracks == 1) {
                        // If MIDI file is of type 0, creates a view for the track.
                        trackPanel.setLayout(new FlowLayout());
-                       MooTrackTitle title = new MooTrackTitle(tracks[0],0);
+                       MooTrackTitle title = new MooTrackTitle(tracks[0]);
                        titlePanel.add(title);
                        trackPanel.add(new MooTrackView(tracks[0], title));
                } else {
@@ -71,7 +71,7 @@ public class MooView extends JScrollPane {
                        for (int i = 1; i < tracks.length; i++) {
                                if (Moosique.shouldBeDrawn(tracks[i])) {
                                        System.out.println("Draws track " + i);
-                                       MooTrackTitle title = new MooTrackTitle(tracks[i],i);
+                                       MooTrackTitle title = new MooTrackTitle(tracks[i]);
                                        titlePanel.add(title);
                                        trackPanel.add(new MooTrackView(tracks[i], title));
                                        progressBar.setValue(i);
@@ -116,7 +116,7 @@ public class MooView extends JScrollPane {
        public void addTrackView(Track track, int index) {
                ((GridLayout)trackPanel.getLayout()).setColumns(++numberOfTracks);
                ((GridLayout)titlePanel.getLayout()).setColumns(++numberOfTracks);
-               MooTrackTitle title = new MooTrackTitle(track,index);
+               MooTrackTitle title = new MooTrackTitle(track);
                titlePanel.add(title, index);
                trackPanel.add(new MooTrackView(track, title), index);
                validate();