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

Diff of /qsampler/trunk/src/qsamplerInstrument.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 192  bool qsamplerInstrument::mapInstrument ( Line 192  bool qsamplerInstrument::mapInstrument (
192    
193          if (::lscp_map_midi_instrument(pMainForm->client(), &instr,          if (::lscp_map_midi_instrument(pMainForm->client(), &instr,
194                          m_sEngineName.latin1(),                          m_sEngineName.latin1(),
195                          lscpEscapePath(m_sInstrumentFile).latin1(),                          qsamplerUtilities::lscpEscapePath(m_sInstrumentFile).latin1(),
196                          m_iInstrumentNr,                          m_iInstrumentNr,
197                          m_fVolume,                          m_fVolume,
198                          load_mode,                          load_mode,
# Line 271  bool qsamplerInstrument::getInstrument ( Line 271  bool qsamplerInstrument::getInstrument (
271                  return false;                  return false;
272          }          }
273    
274          m_sName           = pInstrInfo->name;          m_sName           = qsamplerUtilities::lscpEscapedTextToRaw(pInstrInfo->name);
275          m_sEngineName     = pInstrInfo->engine_name;          m_sEngineName     = pInstrInfo->engine_name;
276          m_sInstrumentName = pInstrInfo->instrument_name;          m_sInstrumentName = qsamplerUtilities::lscpEscapedTextToRaw(pInstrInfo->instrument_name);
277          m_sInstrumentFile = pInstrInfo->instrument_file;          m_sInstrumentFile = qsamplerUtilities::lscpEscapedPathToPosix(pInstrInfo->instrument_file);
278          m_iInstrumentNr   = pInstrInfo->instrument_nr;          m_iInstrumentNr   = pInstrInfo->instrument_nr;
279          m_fVolume         = pInstrInfo->volume;          m_fVolume         = pInstrInfo->volume;
280    
# Line 355  QString qsamplerInstrument::getMapName ( Line 355  QString qsamplerInstrument::getMapName (
355                  if (::lscp_client_get_errno(pMainForm->client()))                  if (::lscp_client_get_errno(pMainForm->client()))
356                          pMainForm->appendMessagesClient("lscp_get_midi_instrument_name");                          pMainForm->appendMessagesClient("lscp_get_midi_instrument_name");
357          }          }
358          sMapName = QString("%1 - %2").arg(iMidiMap).arg(pszMapName);          sMapName = QString("%1 - %2").arg(iMidiMap).arg(qsamplerUtilities::lscpEscapedTextToRaw(pszMapName));
359  #endif  #endif
360    
361          return sMapName;          return sMapName;
Legend:
Removed from v.1386  
changed lines
  Added in v.1402
  ViewVC Help
Powered by ViewVC