/[svn]/libgig/trunk/src/gig.cpp
ViewVC logotype

Diff of /libgig/trunk/src/gig.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3941 by schoenebeck, Fri Jun 18 14:06:20 2021 UTC revision 3943 by schoenebeck, Fri Jun 18 14:56:53 2021 UTC
# Line 6580  namespace { Line 6580  namespace {
6580       * @param pProgress - optional: callback function for progress notification       * @param pProgress - optional: callback function for progress notification
6581       * @returns  sought instrument or NULL if there's no such instrument       * @returns  sought instrument or NULL if there's no such instrument
6582       */       */
6583      Instrument* File::GetInstrument(uint index, progress_t* pProgress) {      Instrument* File::GetInstrument(size_t index, progress_t* pProgress) {
6584          if (!pInstruments) {          if (!pInstruments) {
6585              // TODO: hack - we simply load ALL samples here, it would have been done in the Region constructor anyway (ATM)              // TODO: hack - we simply load ALL samples here, it would have been done in the Region constructor anyway (ATM)
6586    
# Line 6611  namespace { Line 6611  namespace {
6611              }              }
6612          }          }
6613          if (!pInstruments) return NULL;          if (!pInstruments) return NULL;
6614          InstrumentsIterator = pInstruments->begin();          if (index >= pInstruments->size()) return NULL;
6615          for (uint i = 0; InstrumentsIterator != pInstruments->end(); i++) {          return static_cast<gig::Instrument*>( (*pInstruments)[index] );
             if (i == index) return static_cast<gig::Instrument*>( *InstrumentsIterator );  
             InstrumentsIterator++;  
         }  
         return NULL;  
6616      }      }
6617    
6618      /** @brief Add a new instrument definition.      /** @brief Add a new instrument definition.
Legend:
Removed from v.3941  
changed lines
  Added in v.3943
  ViewVC Help
Powered by ViewVC