/[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 1367 by capela, Mon Oct 1 22:03:35 2007 UTC revision 1402 by schoenebeck, Fri Oct 12 00:03:27 2007 UTC
# Line 19  Line 19 
19    
20  *****************************************************************************/  *****************************************************************************/
21    
22    #include "qsamplerUtilities.h"
23  #include "qsamplerAbout.h"  #include "qsamplerAbout.h"
24  #include "qsamplerChannel.h"  #include "qsamplerChannel.h"
25    
# Line 202  bool qsamplerChannel::loadInstrument ( c Line 203  bool qsamplerChannel::loadInstrument ( c
203          if (m_iInstrumentStatus == 100 && m_sInstrumentFile == sInstrumentFile && m_iInstrumentNr == iInstrumentNr)          if (m_iInstrumentStatus == 100 && m_sInstrumentFile == sInstrumentFile && m_iInstrumentNr == iInstrumentNr)
204                  return true;                  return true;
205    
206          if (::lscp_load_instrument_non_modal(pMainForm->client(), sInstrumentFile.latin1(), iInstrumentNr, m_iChannelID) != LSCP_OK) {          if (
207                    ::lscp_load_instrument_non_modal(
208                            pMainForm->client(),
209                            qsamplerUtilities::lscpEscapePath(sInstrumentFile).latin1(),
210                            iInstrumentNr, m_iChannelID
211                    ) != LSCP_OK
212            ) {
213                  appendMessagesClient("lscp_load_instrument");                  appendMessagesClient("lscp_load_instrument");
214                  return false;                  return false;
215          }          }
# Line 580  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,
# Line 677  bool qsamplerChannel::channelReset (void Line 686  bool qsamplerChannel::channelReset (void
686  bool qsamplerChannel::editChannel (void)  bool qsamplerChannel::editChannel (void)
687  {  {
688  #ifdef CONFIG_EDIT_INSTRUMENT  #ifdef CONFIG_EDIT_INSTRUMENT
689    
690          qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();          qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();
691          if (pMainForm == NULL)          if (pMainForm == NULL)
692                  return false;                  return false;
# Line 688  bool qsamplerChannel::editChannel (void) Line 698  bool qsamplerChannel::editChannel (void)
698                  appendMessagesError(QObject::tr(                  appendMessagesError(QObject::tr(
699                          "Could not launch an appropriate instrument editor "                          "Could not launch an appropriate instrument editor "
700                          "for the given instrument!\n"                          "for the given instrument!\n"
701                          "Make sure you have an appropriate instrument editor like"                          "Make sure you have an appropriate "
702                          "'gigedit' installed and that it placed its mandatory "                          "instrument editor like 'gigedit' installed\n"
703                          "DLL file into the sampler's plugin directory.")                          "and that it placed its mandatory DLL file "
704                            "into the sampler's plugin directory.")
705                  );                  );
706                  return false;                  return false;
707          }          }
# Line 698  bool qsamplerChannel::editChannel (void) Line 709  bool qsamplerChannel::editChannel (void)
709          appendMessages(QObject::tr("edit instrument."));          appendMessages(QObject::tr("edit instrument."));
710    
711          return true;          return true;
712    
713  #else  #else
714    
715          appendMessagesError(QObject::tr(          appendMessagesError(QObject::tr(
716                  "Sorry, QSampler was compiled for a version of liblscp "                  "Sorry, QSampler was compiled for a version of liblscp "
717                  "which lacks this feature.\n"                  "which lacks this feature.\n"
718                  "You may want to update liblscp and recompile QSampler afterwards.")                  "You may want to update liblscp and recompile QSampler afterwards.")
719          );          );
720    
721          return false;          return false;
722    
723  #endif  #endif
724  }  }
725    
Legend:
Removed from v.1367  
changed lines
  Added in v.1402
  ViewVC Help
Powered by ViewVC