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/fluidsynth | |
| 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/fluidsynth')
| -rw-r--r-- | muse2/synti/fluidsynth/fluidsynti.cpp | 3 | ||||
| -rw-r--r-- | muse2/synti/fluidsynth/fluidsynti.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/muse2/synti/fluidsynth/fluidsynti.cpp b/muse2/synti/fluidsynth/fluidsynti.cpp index 3dd45105..d3561fb9 100644 --- a/muse2/synti/fluidsynth/fluidsynti.cpp +++ b/muse2/synti/fluidsynth/fluidsynti.cpp @@ -34,6 +34,7 @@ #include <QFileInfo> #include <QFileDialog> +#include <QString> //#include "common_defs.h" #include "fluidsynti.h" @@ -1220,7 +1221,7 @@ void FluidSynth::rewriteChannelSettings() //--------------------------------------------------------- // getPatchName //--------------------------------------------------------- -const char* FluidSynth::getPatchName(int i, int, bool /*drum*/) const +QString FluidSynth::getPatchName(int i, int, bool /*drum*/) const { if (channels[i].font_intid == FS_UNSPECIFIED_FONT || channels[i].font_intid == FS_UNSPECIFIED_ID) diff --git a/muse2/synti/fluidsynth/fluidsynti.h b/muse2/synti/fluidsynth/fluidsynti.h index 7e448536..ca24f6f8 100644 --- a/muse2/synti/fluidsynth/fluidsynti.h +++ b/muse2/synti/fluidsynth/fluidsynti.h @@ -138,7 +138,7 @@ public: virtual bool setController(int, int, int); void setController(int, int , int, bool); virtual void getInitData(int*, const unsigned char**); - virtual const char* getPatchName(int, int, bool) const; + virtual QString getPatchName(int, int, bool) const; virtual const MidiPatch* getPatchInfo(int i, const MidiPatch* patch) const; virtual int getControllerInfo(int, const char**, int*, int*, int*, int*) const; virtual bool processEvent(const MusECore::MidiPlayEvent&); |