summaryrefslogtreecommitdiff
path: root/muse2/synti/deicsonze
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/deicsonze
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/deicsonze')
-rw-r--r--muse2/synti/deicsonze/deicsonze.cpp2
-rw-r--r--muse2/synti/deicsonze/deicsonze.h2
2 files changed, 2 insertions, 2 deletions
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,