/[svn]/qsampler/trunk/src/qsamplerChannel.cpp
ViewVC logotype

Diff of /qsampler/trunk/src/qsamplerChannel.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1386 by schoenebeck, Fri Oct 5 17:41:49 2007 UTC revision 1402 by schoenebeck, Fri Oct 12 00:03:27 2007 UTC
# Line 206  bool qsamplerChannel::loadInstrument ( c Line 206  bool qsamplerChannel::loadInstrument ( c
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          ) {          ) {
# Line 587  bool qsamplerChannel::updateChannelInfo Line 587  bool qsamplerChannel::updateChannelInfo
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,
Legend:
Removed from v.1386  
changed lines
  Added in v.1402
  ViewVC Help
Powered by ViewVC