summaryrefslogtreecommitdiff
path: root/muse2/synti/simpledrums2
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2012-12-13 00:18:21 +0000
committerTim E. Real <termtech@rogers.com>2012-12-13 00:18:21 +0000
commit469316ca9c63006cda58b4b25bd5f6b1f7d67f4b (patch)
treeda35720b36c94a81a3f72b5cb358d596e304788e /muse2/synti/simpledrums2
parent079a13764229873cc395c808a0333674b790edbf (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/simpledrums2')
-rw-r--r--muse2/synti/simpledrums2/simpledrums.cpp4
-rw-r--r--muse2/synti/simpledrums2/simpledrums.h2
2 files changed, 3 insertions, 3 deletions
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();