/[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 1464 by capela, Thu Nov 1 17:14:21 2007 UTC revision 1509 by capela, Thu Nov 22 11:10:44 2007 UTC
# Line 20  Line 20 
20    
21  *****************************************************************************/  *****************************************************************************/
22    
 #include "qsamplerUtilities.h"  
23  #include "qsamplerAbout.h"  #include "qsamplerAbout.h"
24  #include "qsamplerInstrument.h"  #include "qsamplerInstrument.h"
25    #include "qsamplerUtilities.h"
26    
27  #include "qsamplerMainForm.h"  #include "qsamplerMainForm.h"
28    
29    
30  using namespace QSampler;  using namespace QSampler;
31    
32  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
# Line 193  bool qsamplerInstrument::mapInstrument ( Line 194  bool qsamplerInstrument::mapInstrument (
194          }          }
195    
196          if (::lscp_map_midi_instrument(pMainForm->client(), &instr,          if (::lscp_map_midi_instrument(pMainForm->client(), &instr,
197                          m_sEngineName.latin1(),                          m_sEngineName.toUtf8().constData(),
198                          qsamplerUtilities::lscpEscapePath(m_sInstrumentFile).latin1(),                          qsamplerUtilities::lscpEscapePath(
199                          m_iInstrumentNr,                                  m_sInstrumentFile).toUtf8().constData(),
200                          m_fVolume,                          m_iInstrumentNr, m_fVolume, load_mode,
201                          load_mode,                          m_sName.toUtf8().constData()) != LSCP_OK) {
                         m_sName.latin1()) != LSCP_OK) {  
202                  pMainForm->appendMessagesClient("lscp_map_midi_instrument");                  pMainForm->appendMessagesClient("lscp_map_midi_instrument");
203                  return false;                  return false;
204          }          }
# Line 273  bool qsamplerInstrument::getInstrument ( Line 273  bool qsamplerInstrument::getInstrument (
273                  return false;                  return false;
274          }          }
275    
276          m_sName           = qsamplerUtilities::lscpEscapedTextToRaw(pInstrInfo->name);          m_sName = qsamplerUtilities::lscpEscapedTextToRaw(pInstrInfo->name);
277          m_sEngineName     = pInstrInfo->engine_name;          m_sEngineName = pInstrInfo->engine_name;
278          m_sInstrumentName = qsamplerUtilities::lscpEscapedTextToRaw(pInstrInfo->instrument_name);          m_sInstrumentName = qsamplerUtilities::lscpEscapedTextToRaw(
279          m_sInstrumentFile = qsamplerUtilities::lscpEscapedPathToPosix(pInstrInfo->instrument_file);                  pInstrInfo->instrument_name);
280          m_iInstrumentNr   = pInstrInfo->instrument_nr;          m_sInstrumentFile = qsamplerUtilities::lscpEscapedPathToPosix(
281          m_fVolume         = pInstrInfo->volume;                  pInstrInfo->instrument_file);
282            m_iInstrumentNr = pInstrInfo->instrument_nr;
283            m_fVolume = pInstrInfo->volume;
284    
285          switch (pInstrInfo->load_mode) {          switch (pInstrInfo->load_mode) {
286                  case LSCP_LOAD_PERSISTENT:                  case LSCP_LOAD_PERSISTENT:
# Line 357  QString qsamplerInstrument::getMapName ( Line 359  QString qsamplerInstrument::getMapName (
359                  if (::lscp_client_get_errno(pMainForm->client()))                  if (::lscp_client_get_errno(pMainForm->client()))
360                          pMainForm->appendMessagesClient("lscp_get_midi_instrument_name");                          pMainForm->appendMessagesClient("lscp_get_midi_instrument_name");
361          }          }
362          sMapName = QString("%1 - %2").arg(iMidiMap).arg(qsamplerUtilities::lscpEscapedTextToRaw(pszMapName));          sMapName = QString("%1 - %2").arg(iMidiMap)
363                    .arg(qsamplerUtilities::lscpEscapedTextToRaw(pszMapName));
364  #endif  #endif
365    
366          return sMapName;          return sMapName;
Legend:
Removed from v.1464  
changed lines
  Added in v.1509
  ViewVC Help
Powered by ViewVC