summaryrefslogtreecommitdiff
path: root/muse2/muse/widgets/mtrackinfo.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-02-29 15:25:27 +0000
committerFlorian Jung <flo@windfisch.org>2012-02-29 15:25:27 +0000
commita5ced1d15d584b2c4f7489f181224582c38da0f4 (patch)
tree98a7e3b8b664cf579a834bf2b2e2e1f25fc2cf90 /muse2/muse/widgets/mtrackinfo.cpp
parent3a26b16556a49196800298ed4219decc134c7061 (diff)
changed custom column for "program" to display and edit real patches
instead of the raw values
Diffstat (limited to 'muse2/muse/widgets/mtrackinfo.cpp')
-rw-r--r--muse2/muse/widgets/mtrackinfo.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/muse2/muse/widgets/mtrackinfo.cpp b/muse2/muse/widgets/mtrackinfo.cpp
index f9d0e5a9..c02bd7f1 100644
--- a/muse2/muse/widgets/mtrackinfo.cpp
+++ b/muse2/muse/widgets/mtrackinfo.cpp
@@ -342,15 +342,9 @@ void MidiTrackInfo::heartBeat()
nprogram = mp->lastValidHWCtrlState(outChannel, MusECore::CTRL_PROGRAM);
if(nprogram == MusECore::CTRL_VAL_UNKNOWN)
{
- //const char* n = "<unknown>";
const QString n(tr("<unknown>"));
- //if(strcmp(iPatch->text().toLatin1().constData(), n) != 0)
if(iPatch->text() != n)
- {
- //printf("Arranger::midiTrackInfoHeartBeat setting patch <unknown>\n");
-
iPatch->setText(n);
- }
}
else
{
@@ -362,13 +356,8 @@ void MidiTrackInfo::heartBeat()
if(iPatch->text() != n)
iPatch->setText(n);
}
- else
- if(iPatch->text() != name)
- {
- //printf("Arranger::midiTrackInfoHeartBeat setting patch name\n");
-
+ else if(iPatch->text() != name)
iPatch->setText(name);
- }
}
}
else
@@ -1101,11 +1090,9 @@ void MidiTrackInfo::instrPopup()
int channel = track->outChannel();
int port = track->outPort();
MusECore::MidiInstrument* instr = MusEGlobal::midiPorts[port].instrument();
- //QMenu* pup = new QMenu;
PopupMenu* pup = new PopupMenu(true);
instr->populatePatchPopup(pup, channel, MusEGlobal::song->mtype(), track->isDrumTrack());
- //populatePatchPopup(instr, pup, channel, MusEGlobal::song->mtype(), track->isDrumTrack());
if(pup->actions().count() == 0)
{