From 469316ca9c63006cda58b4b25bd5f6b1f7d67f4b Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Thu, 13 Dec 2012 00:18:21 +0000 Subject: 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. --- muse2/synti/deicsonze/deicsonze.cpp | 2 +- muse2/synti/deicsonze/deicsonze.h | 2 +- muse2/synti/fluid/fluid.cpp | 2 +- muse2/synti/fluid/fluid.h | 2 +- muse2/synti/fluidsynth/fluidsynti.cpp | 3 ++- muse2/synti/fluidsynth/fluidsynti.h | 2 +- muse2/synti/libsynti/mess.h | 4 ++-- muse2/synti/simpledrums2/simpledrums.cpp | 4 ++-- muse2/synti/simpledrums2/simpledrums.h | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) (limited to 'muse2/synti') diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp index 61e9b1f3..ef5644fa 100644 --- a/muse2/synti/deicsonze/deicsonze.cpp +++ b/muse2/synti/deicsonze/deicsonze.cpp @@ -3698,7 +3698,7 @@ bool DeicsOnze::setController(int ch, int ctrl, int val, bool fromGui) { // getPatchName //--------------------------------------------------------- -const char* DeicsOnze::getPatchName(int ch, int val, bool) const { +QString DeicsOnze::getPatchName(int ch, int val, bool) const { if(_global.channel[ch].isEnable) { Preset* p_preset; int hbank = (val & 0xff0000) >> 16; diff --git a/muse2/synti/deicsonze/deicsonze.h b/muse2/synti/deicsonze/deicsonze.h index e458b688..2df235e3 100644 --- a/muse2/synti/deicsonze/deicsonze.h +++ b/muse2/synti/deicsonze/deicsonze.h @@ -592,7 +592,7 @@ class DeicsOnze : public Mess { bool sysex(int length, const unsigned char* data, bool fromGui); virtual bool sysex(int l, const unsigned char* d); - virtual const char* getPatchName(int ch, int number, bool) const; + virtual QString getPatchName(int ch, int number, bool) const; virtual const MidiPatch* getPatchInfo(int, const MidiPatch *) const; virtual int getControllerInfo(int arg1, const char** arg2, 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**); 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 #include +#include //#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&); diff --git a/muse2/synti/libsynti/mess.h b/muse2/synti/libsynti/mess.h index 79d3d7e7..db74c1c8 100644 --- a/muse2/synti/libsynti/mess.h +++ b/muse2/synti/libsynti/mess.h @@ -26,10 +26,10 @@ #define MESS_MAJOR_VERSION 1 #define MESS_MINOR_VERSION 1 +#include #include "mpevent.h" class QWidget; -class QString; class MessP; //--------------------------------------------------------- @@ -88,7 +88,7 @@ class Mess { virtual void getInitData(int* n, const unsigned char**) /*const*/ { *n = 0; } // No const: Synths may need to allocate member pointers. p4.0.27 Tim virtual int getControllerInfo(int, const char**, int*, int*, int*, int*) const {return 0;} - virtual const char* getPatchName(int, int, bool) const { return "?"; } + virtual QString getPatchName(int, int, bool) const { return "?"; } virtual const MidiPatch* getPatchInfo(int, const MidiPatch*) const { return 0; } // synthesizer -> host communication diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp index ef626954..2cc42ba6 100644 --- a/muse2/synti/simpledrums2/simpledrums.cpp +++ b/muse2/synti/simpledrums2/simpledrums.cpp @@ -644,10 +644,10 @@ bool SimpleSynth::sysex(int len, const unsigned char* d) \fn SimpleSynth::getPatchName \brief Called from host to get names of patches \param index - which patchnr we're about to deliver - \return const char* with patchname + \return QString with patchname */ //--------------------------------------------------------- -const char* SimpleSynth::getPatchName(int /*index*/, int, bool) const +QString SimpleSynth::getPatchName(int /*index*/, int, bool) const { SS_TRACE_IN SS_TRACE_OUT diff --git a/muse2/synti/simpledrums2/simpledrums.h b/muse2/synti/simpledrums2/simpledrums.h index 8de202ea..5a7e2821 100644 --- a/muse2/synti/simpledrums2/simpledrums.h +++ b/muse2/synti/simpledrums2/simpledrums.h @@ -137,7 +137,7 @@ class SimpleSynth : public Mess virtual bool processEvent(const MusECore::MidiPlayEvent& arg1); virtual bool setController(int arg1, int arg2, int arg3); virtual bool sysex(int arg1, const unsigned char* arg2); - virtual const char* getPatchName(int arg1, int arg2, bool arg3) const; + virtual QString getPatchName(int arg1, int arg2, bool arg3) const; virtual const MidiPatch* getPatchInfo(int arg1, const MidiPatch* arg2) const; virtual int getControllerInfo(int arg1, const char** arg2, int* arg3, int* arg4, int* arg5, int* arg6) const; virtual void processMessages(); -- cgit v1.2.3