diff options
| author | Tim E. Real <termtech@rogers.com> | 2012-12-12 08:28:29 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2012-12-12 08:28:29 +0000 |
| commit | 079a13764229873cc395c808a0333674b790edbf (patch) | |
| tree | 5f3cebb50d315c0b0cddd305df44b0052e7ccd98 /muse2/muse/instruments | |
| parent | bfa869ee23aa5da09f18d930766f1d6321854c1b (diff) | |
Add stdint.h to vestige header.
Some WIP trying to fix odd patch name bug (shows @u@ etc).
Diffstat (limited to 'muse2/muse/instruments')
| -rw-r--r-- | muse2/muse/instruments/minstrument.cpp | 4 | ||||
| -rw-r--r-- | muse2/muse/instruments/minstrument.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/muse2/muse/instruments/minstrument.cpp b/muse2/muse/instruments/minstrument.cpp index e2477e60..b7a2c7bf 100644 --- a/muse2/muse/instruments/minstrument.cpp +++ b/muse2/muse/instruments/minstrument.cpp @@ -1093,7 +1093,7 @@ void MidiInstrument::populatePatchPopup(MusEGui::PopupMenu* menu, int /*chan*/, // getPatchName //--------------------------------------------------------- -QString MidiInstrument::getPatchName(int /*channel*/, int prog, bool drum) +const char* MidiInstrument::getPatchName(int /*channel*/, int prog, bool drum) const { int pr = prog & 0xff; if(prog == CTRL_VAL_UNKNOWN || pr == 0xff) @@ -1115,7 +1115,7 @@ QString MidiInstrument::getPatchName(int /*channel*/, int prog, bool drum) && (hbank == mp->hbank || !hb || mp->hbank == -1) && (lbank == mp->lbank || !lb || mp->lbank == -1)) - return mp->name; + return mp->name.toLatin1().constData(); } } return "<unknown>"; diff --git a/muse2/muse/instruments/minstrument.h b/muse2/muse/instruments/minstrument.h index 7ff6f7d8..665c2437 100644 --- a/muse2/muse/instruments/minstrument.h +++ b/muse2/muse/instruments/minstrument.h @@ -238,7 +238,7 @@ class MidiInstrument { virtual void writeToGui(const MidiPlayEvent&) {} virtual void reset(int); - virtual QString getPatchName(int,int,bool); + virtual const char* getPatchName(int,int,bool) const; virtual void populatePatchPopup(MusEGui::PopupMenu*, int, bool); void read(Xml&); void write(int level, Xml&); |