/[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 344 by capela, Tue Jan 18 13:53:04 2005 UTC revision 371 by capela, Fri Feb 11 15:36:06 2005 UTC
# Line 361  bool qsamplerChannel::setVolume ( float Line 361  bool qsamplerChannel::setVolume ( float
361  }  }
362    
363    
364    // Istrument name remapper.
365    void qsamplerChannel::updateInstrumentName (void)
366    {
367            m_sInstrumentName = getInstrumentName(m_sInstrumentFile,
368                    m_iInstrumentNr, (options() && options()->bInstrumentNames));
369    }
370    
371    
372  // Update whole channel info state.  // Update whole channel info state.
373  bool qsamplerChannel::updateChannelInfo (void)  bool qsamplerChannel::updateChannelInfo (void)
374  {  {
# Line 375  bool qsamplerChannel::updateChannelInfo Line 383  bool qsamplerChannel::updateChannelInfo
383          return false;          return false;
384      }      }
385    
386      // First, check if intrument name has changed,          // First, check if intrument name has changed,
387      // taking care that instrument name lookup might be expensive,          // taking care that instrument name lookup might be expensive,
388      // so we better make it only once and when really needed...          // so we better make it only once and when really needed...
389      if ((m_sInstrumentFile != pChannelInfo->instrument_file) ||          if ((m_sInstrumentFile != pChannelInfo->instrument_file) ||
390          (m_iInstrumentNr   != pChannelInfo->instrument_nr)) {                  (m_iInstrumentNr   != pChannelInfo->instrument_nr)) {
391          m_sInstrumentFile = pChannelInfo->instrument_file;                  m_sInstrumentFile = pChannelInfo->instrument_file;
392          m_iInstrumentNr   = pChannelInfo->instrument_nr;                  m_iInstrumentNr   = pChannelInfo->instrument_nr;
393                  m_sInstrumentName = getInstrumentName(m_sInstrumentFile,                  updateInstrumentName();
                         m_iInstrumentNr, (options() && options()->bInstrumentNames));  
394          }          }
395      // Cache in other channel information.      // Cache in other channel information.
396      m_sEngineName       = pChannelInfo->engine_name;      m_sEngineName       = pChannelInfo->engine_name;

Legend:
Removed from v.344  
changed lines
  Added in v.371

  ViewVC Help
Powered by ViewVC