diff options
| author | Tim E. Real <termtech@rogers.com> | 2012-12-13 00:18:21 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2012-12-13 00:18:21 +0000 |
| commit | 469316ca9c63006cda58b4b25bd5f6b1f7d67f4b (patch) | |
| tree | da35720b36c94a81a3f72b5cb358d596e304788e /muse2/muse/instruments | |
| parent | 079a13764229873cc395c808a0333674b790edbf (diff) | |
Fixed some vst controls stuck.
Added vst master timebase (sequencers should work now). Not quite finished.
Fixed weird QString bug causing some patch names to appear with garbage characters.
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 b7a2c7bf..c119f0bc 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 //--------------------------------------------------------- -const char* MidiInstrument::getPatchName(int /*channel*/, int prog, bool drum) const +QString MidiInstrument::getPatchName(int /*channel*/, int prog, bool drum) const { int pr = prog & 0xff; if(prog == CTRL_VAL_UNKNOWN || pr == 0xff) @@ -1115,7 +1115,7 @@ const char* MidiInstrument::getPatchName(int /*channel*/, int prog, bool drum) c && (hbank == mp->hbank || !hb || mp->hbank == -1) && (lbank == mp->lbank || !lb || mp->lbank == -1)) - return mp->name.toLatin1().constData(); + return mp->name; } } return "<unknown>"; diff --git a/muse2/muse/instruments/minstrument.h b/muse2/muse/instruments/minstrument.h index 665c2437..5a520e67 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 const char* getPatchName(int,int,bool) const; + virtual QString getPatchName(int,int,bool) const; virtual void populatePatchPopup(MusEGui::PopupMenu*, int, bool); void read(Xml&); void write(int level, Xml&); |