diff options
Diffstat (limited to 'muse2/muse/helper.cpp')
-rw-r--r-- | muse2/muse/helper.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/muse2/muse/helper.cpp b/muse2/muse/helper.cpp index 986d38aa..e2186af9 100644 --- a/muse2/muse/helper.cpp +++ b/muse2/muse/helper.cpp @@ -888,7 +888,7 @@ int populateMidiCtrlMenu(PopupMenu* menu, MusECore::PartList* part_list, MusECor int channel = track->outChannel(); MusECore::MidiPort* port = &MusEGlobal::midiPorts[track->outPort()]; bool isDrum = track->type() == MusECore::Track::DRUM; - bool isNewDrum = track->type() == MusECore::Track::NEW_DRUM; + bool isNewDrum = (track->type() == MusECore::Track::NEW_DRUM) || (track->type() == MusECore::Track::MIDI); MusECore::MidiInstrument* instr = port->instrument(); MusECore::MidiControllerList* mcl = instr->controller(); @@ -1030,18 +1030,6 @@ int populateMidiCtrlMenu(PopupMenu* menu, MusECore::PartList* part_list, MusECor est_width = fmw; menu->addAction(stext)->setData(velo); -// stext = QWidget::tr("PolyAftertouch"); -// fmw = menu->fontMetrics().width(stext); -// if(fmw > est_width) -// est_width = fmw; -// menu->addAction(stext)->setData(polyafter); -// -// stext = QWidget::tr("Aftertouch"); -// fmw = menu->fontMetrics().width(stext); -// if(fmw > est_width) -// est_width = fmw; -// menu->addAction(stext)->setData(after); - // Add global default controllers (all controllers not found in instrument). for (isList i = sList.begin(); i != sList.end(); ++i) { |