← Back to branch summary

~teemu-heinamaki/ubuntu/maverick/tuxguitar/merge-from-debian

« back to all changes in this revision

Viewing changes to TuxGuitar/src/org/herac/tuxguitar/gui/mixer/TGMixerTrack.java

  • Committer: teemu.heinamaki at gmail
  • Date: 2010-05-21 18:04:21 UTC
  • mfrom: (5.1.4 sid)
  • Revision ID: teemu.heinamaki@gmail.com-20100521180421-8b3pn1cknq1kn08h
http://bugs.debian.org/405295
http://bugs.debian.org/510742
http://bugs.debian.org/548683
http://bugs.debian.org/564347
http://bugs.debian.org/569910
http://bugs.debian.org/569999
http://bugs.debian.org/570556
http://bugs.debian.org/575898
http://bugs.debian.org/581142
* Merge from Debian, remaining changes (LP: 523196):
  - debian/control
     + Use xulrunner 1.9.2
     + Use jsa-plugin by default
     + Change maintainer to Ubuntu MOTU
  - misc/tuxguitar.sh
     + Search for xulrunner 1.9.2 instead of 1.9.1   
* Address bashism in /usr/bin/tuxguitar (Closes: #581142) 
  (Thank you to Raphael Geissert)
* Switch to dpkg-source 3.0 (quilt) format
  - remove debian/README.source
  - remove patch-related targets in debian/rules
  - remove build-dep on quilt
* debian/compat - upgrade to debhelper 7
* Remove extraneous LICENSE file.
* Modify tuxguitar.sh to find swt-gtk-3.5.1.jar (Closes: #575898)
* Unbuild tuxguitar-gervill (Closes: #570556) :
  - since it depends on unpackaged component
* Added jack plugin (Closes: #569999)
* Merged upstream files in patch (Closes: #569910)
* Non-maintainer upload.
* debian/control:
  - Update swt-gtk dependency to 3.5 to fix FTBFS. (Closes: #564347)
  - Change XS-Vcs-* fields to Vcs-*.
  - Add ${misc:Depends}.
  - Bump Standards-Version to 3.8.4.
* debian/rules: Don't install redundant LICENSE doc.
* New upstream release (Closes: #510742)
* Merged patch : tuxguitar_1.1-1ubuntu1.patch
* Added Makefile : from upstream repo
* debian/* :
  - Migrated to quilt
  - Updated standards
* Non-maintainer upload for transition to xulrunner 1.9.1.
  (Closes: #548683)
* debian/control: Depend on a xulrunner-1.9.1.
* misc/tuxguitar.sh: Detect xulrunner 1.9.1.
* New upstream release (closes: #405295 , #398972)

Show diffs side-by-side

added added

removed removed

Lines of Context:
TuxGuitar/src/org/herac/tuxguitar/gui/mixer/TGMixerTrack.java
20
20
import org.eclipse.swt.widgets.Shell;
21
21
import org.herac.tuxguitar.gui.TuxGuitar;
22
22
import org.herac.tuxguitar.gui.undo.undoables.track.UndoableTrackChannel;
 
23
import org.herac.tuxguitar.gui.undo.undoables.track.UndoableTrackSoloMute;
23
24
import org.herac.tuxguitar.song.models.TGTrack;
24
25
 
25
26
public class TGMixerTrack {
58
59
                this.checkSolo.setSelection(TGMixerTrack.this.track.isSolo());
59
60
                this.checkSolo.addSelectionListener(new SelectionAdapter() {
60
61
                        public void widgetSelected(SelectionEvent e) {
61
 
                                UndoableTrackChannel undoable = UndoableTrackChannel.startUndo();
62
 
                                
63
 
                                TGMixerTrack.this.track.setSolo(TGMixerTrack.this.checkSolo.getSelection());
64
 
                                if(TGMixerTrack.this.track.isSolo()){
65
 
                                        TGMixerTrack.this.track.setMute(false);
66
 
                                }
67
 
                                TGMixerTrack.this.mixer.fireChanges(TGMixerTrack.this.track.getChannel(),TGMixer.SOLO);
68
 
                                
69
 
                                TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 
62
                                TGTrack track = TGMixerTrack.this.track;
 
63
                                
 
64
                                UndoableTrackSoloMute undoable = UndoableTrackSoloMute.startUndo(track);
 
65
                                TuxGuitar.instance().getSongManager().getTrackManager().changeSolo(track,TGMixerTrack.this.checkSolo.getSelection());
 
66
                                TGMixerTrack.this.mixer.fireChanges(track.getChannel(),TGMixer.SOLO);
 
67
                                TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo(track));
70
68
                                TuxGuitar.instance().updateCache(true);
71
69
                        }
72
70
                });
74
72
                this.checkMute.setSelection(TGMixerTrack.this.track.isMute());
75
73
                this.checkMute.addSelectionListener(new SelectionAdapter() {
76
74
                        public void widgetSelected(SelectionEvent e) {
77
 
                                UndoableTrackChannel undoable = UndoableTrackChannel.startUndo();
78
 
                                
79
 
                                TGMixerTrack.this.track.setMute(TGMixerTrack.this.checkMute.getSelection());
80
 
                                if(TGMixerTrack.this.track.isMute()){
81
 
                                        TGMixerTrack.this.track.setSolo(false);
82
 
                                }
83
 
                                TGMixerTrack.this.mixer.fireChanges(TGMixerTrack.this.track.getChannel(),TGMixer.MUTE);
84
 
                                
85
 
                                TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 
75
                                TGTrack track = TGMixerTrack.this.track;
 
76
                                
 
77
                                UndoableTrackSoloMute undoable = UndoableTrackSoloMute.startUndo(track);
 
78
                                TuxGuitar.instance().getSongManager().getTrackManager().changeMute(track,TGMixerTrack.this.checkMute.getSelection());
 
79
                                TGMixerTrack.this.mixer.fireChanges(track.getChannel(),TGMixer.MUTE);
 
80
                                TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo(track));
86
81
                                TuxGuitar.instance().updateCache(true);
87
82
                        }
88
83
                });