X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooTrackTitle.java;h=d5876c1485718a34f6ae3ef940152182d5f2974c;hp=d3b9a8a754ce06c328d59570b316f2366fd64725;hb=ce9a16d679f2058454af367e972888ba8e2c34c0;hpb=c99008764ab428e3930c82ea90286e37a3ebccbd diff --git a/MooTrackTitle.java b/MooTrackTitle.java index d3b9a8a..d5876c1 100644 --- 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);