diff options
| author | Tim E. Real <termtech@rogers.com> | 2013-02-02 07:37:31 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2013-02-02 07:37:31 +0000 |
| commit | f118ed0cfca8ab717b87e1f00459199acba80bb9 (patch) | |
| tree | 7a5a46771dcea1a978182d0da0134e6a5d049745 /muse2/muse/helper.cpp | |
| parent | 5d8ab88bd418da3a4047b38707b5a49f32e912ba (diff) | |
Solved: "Old style" Drums: Track channel/port re-enabled, drum list columns default to them.
Required some icon and colour changes. See ChangeLog.
Fixed Old Style Drum lockup: Certain item channel overrides caused infinite loop in Audio::processMidi().
Diffstat (limited to 'muse2/muse/helper.cpp')
| -rw-r--r-- | muse2/muse/helper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/muse2/muse/helper.cpp b/muse2/muse/helper.cpp index 0d9b74bd..2a6992fc 100644 --- a/muse2/muse/helper.cpp +++ b/muse2/muse/helper.cpp @@ -457,7 +457,7 @@ QActionGroup* populateAddTrack(QMenu* addTrack, bool populateAll, bool evenIgnor if (!evenIgnoreDrumPreference && (MusEGlobal::config.drumTrackPreference==MusEGlobal::PREFER_NEW || MusEGlobal::config.drumTrackPreference==MusEGlobal::ONLY_NEW)) { - QAction* newdrum = addTrack->addAction(QIcon(*addtrack_drumtrackIcon), + QAction* newdrum = addTrack->addAction(QIcon(*addtrack_newDrumtrackIcon), qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add Drum Track"))); newdrum->setData(MusECore::Track::NEW_DRUM); grp->addAction(newdrum); @@ -472,7 +472,7 @@ QActionGroup* populateAddTrack(QMenu* addTrack, bool populateAll, bool evenIgnor } if (evenIgnoreDrumPreference || MusEGlobal::config.drumTrackPreference==MusEGlobal::PREFER_OLD) { - QAction* newdrum = addTrack->addAction(QIcon(*addtrack_drumtrackIcon), + QAction* newdrum = addTrack->addAction(QIcon(*addtrack_newDrumtrackIcon), qApp->translate("@default", QT_TRANSLATE_NOOP("@default", "Add New Style Drum Track"))); newdrum->setData(MusECore::Track::NEW_DRUM); grp->addAction(newdrum); |