206 |
if ( |
if ( |
207 |
::lscp_load_instrument_non_modal( |
::lscp_load_instrument_non_modal( |
208 |
pMainForm->client(), |
pMainForm->client(), |
209 |
lscpEscapePath(sInstrumentFile).latin1(), |
qsamplerUtilities::lscpEscapePath(sInstrumentFile).latin1(), |
210 |
iInstrumentNr, m_iChannelID |
iInstrumentNr, m_iChannelID |
211 |
) != LSCP_OK |
) != LSCP_OK |
212 |
) { |
) { |
587 |
|
|
588 |
#ifdef CONFIG_INSTRUMENT_NAME |
#ifdef CONFIG_INSTRUMENT_NAME |
589 |
// We got all actual instrument datum... |
// We got all actual instrument datum... |
590 |
m_sInstrumentFile = pChannelInfo->instrument_file; |
m_sInstrumentFile = |
591 |
|
qsamplerUtilities::lscpEscapedPathToPosix(pChannelInfo->instrument_file); |
592 |
m_iInstrumentNr = pChannelInfo->instrument_nr; |
m_iInstrumentNr = pChannelInfo->instrument_nr; |
593 |
m_sInstrumentName = pChannelInfo->instrument_name; |
m_sInstrumentName = |
594 |
|
qsamplerUtilities::lscpEscapedTextToRaw(pChannelInfo->instrument_name); |
595 |
#else |
#else |
596 |
// First, check if intrument name has changed, |
// First, check if intrument name has changed, |
597 |
// taking care that instrument name lookup might be expensive, |
// taking care that instrument name lookup might be expensive, |