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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1022 by capela,
Thu Jan 11 16:14:31 2007 UTC
+revision 1402 by schoenebeck,
Fri Oct 12 00:03:27 2007 UTC
 Line 19
  *****************************************************************************/
+ #include "qsamplerUtilities.h"
  #include "qsamplerAbout.h"
  #include "qsamplerChannel.h"
-Line 202 
 bool qsamplerChannel::loadInstrument ( c
+Line 203 
 bool qsamplerChannel::loadInstrument ( c
          if (m_iInstrumentStatus == 100 && m_sInstrumentFile == sInstrumentFile && m_iInstrumentNr == iInstrumentNr)
                  return true;
-         if (::lscp_load_instrument_non_modal(pMainForm->client(), sInstrumentFile.latin1(), iInstrumentNr, m_iChannelID) != LSCP_OK) {
+         if (
+                 ::lscp_load_instrument_non_modal(
+                         pMainForm->client(),
+                         qsamplerUtilities::lscpEscapePath(sInstrumentFile).latin1(),
+                         iInstrumentNr, m_iChannelID
+                 ) != LSCP_OK
+         ) {
                  appendMessagesClient("lscp_load_instrument");
                  return false;
          }
-Line 580 
 bool qsamplerChannel::updateChannelInfo
+Line 587 
 bool qsamplerChannel::updateChannelInfo
  #ifdef CONFIG_INSTRUMENT_NAME
          // We got all actual instrument datum...
-         m_sInstrumentFile = pChannelInfo->instrument_file;
+         m_sInstrumentFile =
+                 qsamplerUtilities::lscpEscapedPathToPosix(pChannelInfo->instrument_file);
          m_iInstrumentNr   = pChannelInfo->instrument_nr;
-         m_sInstrumentName = pChannelInfo->instrument_name;
+         m_sInstrumentName =
+                 qsamplerUtilities::lscpEscapedTextToRaw(pChannelInfo->instrument_name);
  #else
          // First, check if intrument name has changed,
          // taking care that instrument name lookup might be expensive,
-Line 673 
 bool qsamplerChannel::channelReset (void
+Line 682 
 bool qsamplerChannel::channelReset (void
  }
+ // Spawn instrument editor method.
+ bool qsamplerChannel::editChannel (void)
+ {
+ #ifdef CONFIG_EDIT_INSTRUMENT
+         qsamplerMainForm *pMainForm = qsamplerMainForm::getInstance();
+         if (pMainForm == NULL)
+                 return false;
+         if (pMainForm->client() == NULL || m_iChannelID < 0)
+                 return false;
+         if (::lscp_edit_instrument(pMainForm->client(), m_iChannelID) != LSCP_OK) {
+                 appendMessagesClient("lscp_edit_instrument");
+                 appendMessagesError(QObject::tr(
+                         "Could not launch an appropriate instrument editor "
+                         "for the given instrument!\n"
+                         "Make sure you have an appropriate "
+                         "instrument editor like 'gigedit' installed\n"
+                         "and that it placed its mandatory DLL file "
+                         "into the sampler's plugin directory.")
+                 );
+                 return false;
+         }
+         appendMessages(QObject::tr("edit instrument."));
+         return true;
+ #else
+         appendMessagesError(QObject::tr(
+                 "Sorry, QSampler was compiled for a version of liblscp "
+                 "which lacks this feature.\n"
+                 "You may want to update liblscp and recompile QSampler afterwards.")
+         );
+         return false;
+ #endif
+ }
  // Channel setup dialog form.
  bool qsamplerChannel::channelSetup ( QWidget *pParent )
  {

 Legend:



Removed from v.1022
 


changed lines


 
Added in v.1402
 Legend:



Removed from v.1022
 


changed lines


 
Added in v.1402
-Removed from v.1022
+Added in v.1402

	ViewVC Help
Powered by ViewVC