/[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 1386 by schoenebeck, Fri Oct 5 17:41:49 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                            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 677  bool qsamplerChannel::channelReset (void Line 684  bool qsamplerChannel::channelReset (void
684  bool qsamplerChannel::editChannel (void)  bool qsamplerChannel::editChannel (void)
685  {  {
686  #ifdef CONFIG_EDIT_INSTRUMENT  #ifdef CONFIG_EDIT_INSTRUMENT
687    
688          qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();          qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();
689          if (pMainForm == NULL)          if (pMainForm == NULL)
690                  return false;                  return false;
# Line 688  bool qsamplerChannel::editChannel (void) Line 696  bool qsamplerChannel::editChannel (void)
696                  appendMessagesError(QObject::tr(                  appendMessagesError(QObject::tr(
697                          "Could not launch an appropriate instrument editor "                          "Could not launch an appropriate instrument editor "
698                          "for the given instrument!\n"                          "for the given instrument!\n"
699                          "Make sure you have an appropriate instrument editor like"                          "Make sure you have an appropriate "
700                          "'gigedit' installed and that it placed its mandatory "                          "instrument editor like 'gigedit' installed\n"
701                          "DLL file into the sampler's plugin directory.")                          "and that it placed its mandatory DLL file "
702                            "into the sampler's plugin directory.")
703                  );                  );
704                  return false;                  return false;
705          }          }
# Line 698  bool qsamplerChannel::editChannel (void) Line 707  bool qsamplerChannel::editChannel (void)
707          appendMessages(QObject::tr("edit instrument."));          appendMessages(QObject::tr("edit instrument."));
708    
709          return true;          return true;
710    
711  #else  #else
712    
713          appendMessagesError(QObject::tr(          appendMessagesError(QObject::tr(
714                  "Sorry, QSampler was compiled for a version of liblscp "                  "Sorry, QSampler was compiled for a version of liblscp "
715                  "which lacks this feature.\n"                  "which lacks this feature.\n"
716                  "You may want to update liblscp and recompile QSampler afterwards.")                  "You may want to update liblscp and recompile QSampler afterwards.")
717          );          );
718    
719          return false;          return false;
720    
721  #endif  #endif
722  }  }
723    
Legend:
Removed from v.1367  
changed lines
  Added in v.1386
  ViewVC Help
Powered by ViewVC