diff options
author | Tim E. Real <termtech@rogers.com> | 2010-12-14 20:06:14 +0000 |
---|---|---|
committer | Tim E. Real <termtech@rogers.com> | 2010-12-14 20:06:14 +0000 |
commit | d3d0a38e8c203d658207fb0c8736c046658ceaaa (patch) | |
tree | e67ca04f64948d96b5f51f91a4b20d23b4093063 /muse2/muse/instruments | |
parent | 37d66824699fad3727f1c035a8ad98dc21782757 (diff) |
Fixed corruption to due latin1() conversions.
Diffstat (limited to 'muse2/muse/instruments')
-rw-r--r-- | muse2/muse/instruments/editinstrument.cpp | 7 | ||||
-rw-r--r-- | muse2/muse/instruments/editinstrument.h | 2 | ||||
-rw-r--r-- | muse2/muse/instruments/minstrument.cpp | 4 | ||||
-rw-r--r-- | muse2/muse/instruments/minstrument.h | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/muse2/muse/instruments/editinstrument.cpp b/muse2/muse/instruments/editinstrument.cpp index a0aba89c..d82dff4f 100644 --- a/muse2/muse/instruments/editinstrument.cpp +++ b/muse2/muse/instruments/editinstrument.cpp @@ -3478,9 +3478,8 @@ void EditInstrument::enableDefaultControls(bool enVal, bool enPatch) void EditInstrument::setDefaultPatchName(int val) { - const char* patchname = getPatchName(val); patchButton->blockSignals(true); - patchButton->setText(QString(patchname)); + patchButton->setText(getPatchName(val)); patchButton->blockSignals(false); } @@ -3553,7 +3552,7 @@ void EditInstrument::setDefaultPatchControls(int val) // getPatchName //--------------------------------------------------------- -const char* EditInstrument::getPatchName(int prog) +QString EditInstrument::getPatchName(int prog) { int pr = prog & 0xff; if(prog == CTRL_VAL_UNKNOWN || pr == 0xff) @@ -3579,7 +3578,7 @@ const char* EditInstrument::getPatchName(int prog) //&& (lbank == mp->lbank || !lb || mp->lbank == -1)) && (hbank == mp->hbank || mp->hbank == -1) && (lbank == mp->lbank || mp->lbank == -1)) - return mp->name.toLatin1().constData(); + return mp->name; } } return "---"; diff --git a/muse2/muse/instruments/editinstrument.h b/muse2/muse/instruments/editinstrument.h index 62ad389e..b3c6b5e0 100644 --- a/muse2/muse/instruments/editinstrument.h +++ b/muse2/muse/instruments/editinstrument.h @@ -42,7 +42,7 @@ class EditInstrument : public QMainWindow, public Ui::EditInstrumentBase { int getDefaultPatchNumber(); void setDefaultPatchNumbers(int); void setDefaultPatchControls(int); - const char* getPatchName(int); + QString getPatchName(int); void deleteInstrument(QListWidgetItem*); ///QMenu* patchpopup; diff --git a/muse2/muse/instruments/minstrument.cpp b/muse2/muse/instruments/minstrument.cpp index a1544d64..db885113 100644 --- a/muse2/muse/instruments/minstrument.cpp +++ b/muse2/muse/instruments/minstrument.cpp @@ -806,7 +806,7 @@ void MidiInstrument::write(int level, Xml& xml) // getPatchName //--------------------------------------------------------- -const char* MidiInstrument::getPatchName(int channel, int prog, MType mode, bool drum) +QString MidiInstrument::getPatchName(int channel, int prog, MType mode, bool drum) { int pr = prog & 0xff; if(prog == CTRL_VAL_UNKNOWN || pr == 0xff) @@ -849,7 +849,7 @@ const char* MidiInstrument::getPatchName(int channel, int prog, MType mode, bool && (hbank == mp->hbank || !hb || mp->hbank == -1) && (lbank == mp->lbank || !lb || mp->lbank == -1)) - return mp->name.toLatin1().constData(); + return mp->name; } } return "<unknown>"; diff --git a/muse2/muse/instruments/minstrument.h b/muse2/muse/instruments/minstrument.h index 3e132633..09bfb9da 100644 --- a/muse2/muse/instruments/minstrument.h +++ b/muse2/muse/instruments/minstrument.h @@ -117,7 +117,7 @@ class MidiInstrument { virtual void writeToGui(const MidiPlayEvent&) {} virtual void reset(int, MType); - virtual const char* getPatchName(int,int,MType,bool); + virtual QString getPatchName(int,int,MType,bool); virtual void populatePatchPopup(QMenu*, int, MType, bool); void read(Xml&); void write(int level, Xml&); |