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 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'muse2/synti/deicsonze') 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, -- cgit v1.2.3