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/synti/fluid | |
| 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/synti/fluid')
| -rw-r--r-- | muse2/synti/fluid/fluid.cpp | 2 | ||||
| -rw-r--r-- | muse2/synti/fluid/fluid.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/muse2/synti/fluid/fluid.cpp b/muse2/synti/fluid/fluid.cpp index fa34d67e..5ee3835f 100644 --- a/muse2/synti/fluid/fluid.cpp +++ b/muse2/synti/fluid/fluid.cpp @@ -405,7 +405,7 @@ bool ISynth::processEvent(const MusECore::MidiPlayEvent& ev) // getPatchName //--------------------------------------------------------- -const char* ISynth::getPatchName(int /*ch*/, int val, bool /*drum*/) const +QString ISynth::getPatchName(int /*ch*/, int val, bool /*drum*/) const { int prog = val & 0xff; if(val == MusECore::CTRL_VAL_UNKNOWN || prog == 0xff) diff --git a/muse2/synti/fluid/fluid.h b/muse2/synti/fluid/fluid.h index 60449568..a9891f3f 100644 --- a/muse2/synti/fluid/fluid.h +++ b/muse2/synti/fluid/fluid.h @@ -76,7 +76,7 @@ class ISynth : public Mess { virtual bool sysex(int len, const unsigned char* p); virtual bool processEvent(const MusECore::MidiPlayEvent&); - virtual const char* getPatchName (int, int, bool) const; + virtual QString getPatchName (int, int, bool) const; virtual const MidiPatch* getPatchInfo(int, const MidiPatch *) const; virtual void getInitData(int*, const unsigned char**); |