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

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

Parent Directory | Revision Log | View Patch Patch

-revision 3903 by schoenebeck,
Wed May 12 18:31:25 2021 UTC
+revision 3946 by schoenebeck,
Fri Jun 18 15:51:32 2021 UTC
 Line 2
   *                                                                         *
   *   libgig - C++ cross-platform Gigasampler format file access library    *
   *                                                                         *
-  *   Copyright (C) 2003-2020 by Christian Schoenebeck                      *
+  *   Copyright (C) 2003-2021 by Christian Schoenebeck                      *
   *                              <cuse@users.sourceforge.net>               *
   *                                                                         *
   *   This library is free software; you can redistribute it and/or modify  *
 Line 482 
 namespace {
              ScanCompressedSample();
          }
-         // we use a buffer for decompression and for truncating 24 bit samples to 16 bit
+         // we use a buffer for decompression only
-         if ((Compressed || BitDepth == 24) && !InternalDecompressionBuffer.Size) {
+         if (Compressed && !InternalDecompressionBuffer.Size) {
              InternalDecompressionBuffer.pStart = new unsigned char[INITIAL_SAMPLE_BUFFER_SIZE];
              InternalDecompressionBuffer.Size   = INITIAL_SAMPLE_BUFFER_SIZE;
          }
 Line 609 
 namespace {
          uint16_t iSampleGroup = 0; // 0 refers to default sample group
          File* pFile = static_cast<File*>(pParent);
          if (pFile->pGroups) {
-             std::list<Group*>::iterator iter = pFile->pGroups->begin();
+             std::vector<Group*>::iterator iter = pFile->pGroups->begin();
-             std::list<Group*>::iterator end  = pFile->pGroups->end();
+             std::vector<Group*>::iterator end  = pFile->pGroups->end();
              for (int i = 0; iter != end; i++, iter++) {
                  if (*iter == pGroup) {
                      iSampleGroup = i;
 Line 3498 
 namespace {
          RIFF::List* _3prg = rgn->GetSubList(LIST_TYPE_3PRG);
          if (_3prg) {
              int dimensionRegionNr = 0;
-             RIFF::List* _3ewl = _3prg->GetFirstSubList();
+             size_t i = 0;
-             while (_3ewl) {
+             for (RIFF::List* _3ewl = _3prg->GetSubListAt(i); _3ewl;
+                  _3ewl = _3prg->GetSubListAt(++i))
+             {
                  if (_3ewl->GetListType() == LIST_TYPE_3EWL) {
                      pDimensionRegions[dimensionRegionNr] = new DimensionRegion(this, _3ewl);
                      dimensionRegionNr++;
                  }
-                 _3ewl = _3prg->GetNextSubList();
              }
              if (dimensionRegionNr == 0) throw gig::Exception("No dimension region found.");
          }
-Line 3951 
 namespace {
+Line 3952 
 namespace {
       * @throws gig::Exception if requested zone could not be splitted
       */
      void Region::SplitDimensionZone(dimension_t type, int zone) {
+         if (!Dimensions)
+             throw gig::Exception("Could not split dimension zone, because there is no dimension at all.");
          dimension_def_t* oldDef = GetDimensionDefinition(type);
          if (!oldDef)
              throw gig::Exception("Could not split dimension zone, no such dimension of given type");
-Line 3977 
 namespace {
+Line 3980 
 namespace {
          // requested by the arguments of this method call) to the temporary
          // region, and don't use Region::CopyAssign() here for this task, since
          // it would also alter fast lookup helper variables here and there
-         dimension_def_t newDef;
+         dimension_def_t newDef = {};
          for (int i = 0; i < Dimensions; ++i) {
              dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference
              // is this the dimension requested by the method arguments? ...
-Line 3988 
 namespace {
+Line 3991 
 namespace {
              }
              tempRgn->AddDimension(&def);
          }
+         // silence clang sanitizer warning
+         if (newDef.dimension == dimension_none)
+             throw gig::Exception("Unexpected internal failure resolving dimension in SplitDimensionZone() [this is a bug].");
          // find the dimension index in the tempRegion which is the dimension
          // type passed to this method (paranoidly expecting different order)
-Line 4319 
 namespace {
+Line 4325 
 namespace {
              uint64_t soughtoffset =
                  uint64_t(file->pWavePoolTable[WavePoolTableIndex]) |
                  uint64_t(file->pWavePoolTableHi[WavePoolTableIndex]) << 32;
-             Sample* sample = file->GetFirstSample(pProgress);
+             size_t i = 0;
-             while (sample) {
+             for (Sample* sample = file->GetSample(i, pProgress); sample;
+                          sample = file->GetSample(++i))
+             {
                  if (sample->ullWavePoolOffset == soughtoffset)
-                     return static_cast<gig::Sample*>(sample);
+                     return sample;
-                 sample = file->GetNextSample();
              }
          } else {
              // use extension files and 32 bit wave pool offsets
              file_offset_t soughtoffset = file->pWavePoolTable[WavePoolTableIndex];
              file_offset_t soughtfileno = file->pWavePoolTableHi[WavePoolTableIndex];
-             Sample* sample = file->GetFirstSample(pProgress);
+             size_t i = 0;
-             while (sample) {
+             for (Sample* sample = file->GetSample(i, pProgress); sample;
+                          sample = file->GetSample(++i))
+             {
                  if (sample->ullWavePoolOffset == soughtoffset &&
-                     sample->FileNo == soughtfileno) return static_cast<gig::Sample*>(sample);
+                     sample->FileNo == soughtfileno) return sample;
-                 sample = file->GetNextSample();
              }
          }
          return NULL;
-Line 4901 
 namespace {
+Line 4909 
 namespace {
          pScripts = new std::list<Script*>;
          if (!pList) return;
-         for (RIFF::Chunk* ck = pList->GetFirstSubChunk(); ck;
+         size_t i = 0;
-              ck = pList->GetNextSubChunk())
+         for (RIFF::Chunk* ck = pList->GetSubChunkAt(i); ck;
+              ck = pList->GetSubChunkAt(++i))
          {
              if (ck->GetChunkID() == CHUNK_ID_SCRI) {
                  pScripts->push_back(new Script(this, ck));
-Line 4982 
 namespace {
+Line 4991 
 namespace {
              if (!pRegions) pRegions = new RegionList;
              RIFF::List* lrgn = insList->GetSubList(LIST_TYPE_LRGN);
              if (lrgn) {
-                 RIFF::List* rgn = lrgn->GetFirstSubList();
+                 size_t i = 0;
-                 while (rgn) {
+                 for (RIFF::List* rgn = lrgn->GetSubListAt(i); rgn;
+                      rgn = lrgn->GetSubListAt(++i))
+                 {
                      if (rgn->GetListType() == LIST_TYPE_RGN) {
                          if (pProgress)
                              __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);
                          pRegions->push_back(new Region(this, rgn));
                      }
-                     rgn = lrgn->GetNextSubList();
                  }
                  // Creating Region Key Table for fast lookup
                  UpdateRegionKeyTable();
-Line 5293 
 namespace {
+Line 5303 
 namespace {
      }
      /**
+      * Returns Region at supplied @a pos position within the region list of
+      * this instrument. If supplied @a pos is out of bounds then @c NULL is
+      * returned.
+      *
+      * @param pos - position of sought Region in region list
+      * @returns pointer address to requested region or @c NULL if @a pos is
+      *          out of bounds
+      */
+     Region* Instrument::GetRegionAt(size_t pos) {
+         if (!pRegions) return NULL;
+         if (pos >= pRegions->size()) return NULL;
+         return static_cast<gig::Region*>( (*pRegions)[pos] );
+     }
+     /**
       * Returns the first Region of the instrument. You have to call this
       * method once before you use GetNextRegion().
       *
       * @returns  pointer address to first region or NULL if there is none
       * @see      GetNextRegion()
+      * @deprecated  This method is not reentrant-safe, use GetRegionAt()
+      *              instead.
       */
      Region* Instrument::GetFirstRegion() {
          if (!pRegions) return NULL;
-Line 5312 
 namespace {
+Line 5339 
 namespace {
       *
       * @returns  pointer address to the next region or NULL if end reached
       * @see      GetFirstRegion()
+      * @deprecated  This method is not reentrant-safe, use GetRegionAt()
+      *              instead.
       */
      Region* Instrument::GetNextRegion() {
          if (!pRegions) return NULL;
-Line 5365 
 namespace {
+Line 5394 
 namespace {
       * @param dst - destination instrument at which this instrument will be
       *              moved to, or pass NULL for moving to end of list
       * @throw gig::Exception if this instrument and target instrument are not
-      *                       part of the same file
+      *                       part of the same file, as well as on unexpected
+      *                       internal error
       */
      void Instrument::MoveTo(Instrument* dst) {
          if (dst && GetParent() != dst->GetParent())
-Line 5382 
 namespace {
+Line 5412 
 namespace {
              File::InstrumentList::iterator itFrom =
                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(this));
+             if (itFrom == list.end())
+                 throw Exception(
+                     "gig::Instrument::MoveTo(): unexpected missing membership "
+                     "of this instrument."
+                 );
+             list.erase(itFrom);
              File::InstrumentList::iterator itTo =
                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(dst));
-             list.splice(itTo, list, itFrom);
+             list.insert(itTo, this);
          }
          // move the instrument's actual list RIFF chunk appropriately
-Line 5978 
 namespace {
+Line 6014 
 namespace {
          pMidiRules[0] = NULL;
          // delete all old regions
-         while (Regions) DeleteRegion(GetFirstRegion());
+         while (Regions) DeleteRegion(GetRegionAt(0));
          // create new regions and copy them from original
          {
              RegionList::const_iterator it = orig->pRegions->begin();
-Line 6034 
 namespace {
+Line 6070 
 namespace {
      Group::Group(File* file, RIFF::Chunk* ck3gnm) {
          pFile      = file;
          pNameChunk = ck3gnm;
+         SamplesIterator = 0;
          ::LoadString(pNameChunk, Name);
      }
-Line 6078 
 namespace {
+Line 6115 
 namespace {
          if (!pNameChunk && pFile->pVersion && pFile->pVersion->major > 2) {
              // v3 has a fixed list of 128 strings, find a free one
-             for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {
+             size_t i = 0;
+             for (RIFF::Chunk* ck = _3gnl->GetSubChunkAt(i); ck; ck = _3gnl->GetSubChunkAt(++i)) {
                  if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {
                      pNameChunk = ck;
                      break;
-Line 6091 
 namespace {
+Line 6129 
 namespace {
      }
      /**
+      * Returns Sample object at @a index of this sample group.
+      *
+      * @param index - position of sample in this sample group's sample list
+      *                (0..n)
+      * @returns sample object or NULL if index is out of bounds
+      */
+     Sample* Group::GetSample(size_t index) {
+         if (pFile->pSamples && index >= pFile->pSamples->size()) return NULL;
+         size_t indexInFile = 0;
+         size_t indexInGroup = 0;
+         for (Sample* pSample = pFile->GetSample(indexInFile); pSample;
+                      pSample = pFile->GetSample(++indexInFile))
+         {
+             if (pSample->GetGroup() != this) continue;
+             if (indexInGroup++ == index) return pSample;
+         }
+         return NULL;
+     }
+     /**
       * Returns the first Sample of this Group. You have to call this method
       * once before you use GetNextSample().
       *
-Line 6100 
 namespace {
+Line 6158 
 namespace {
       * @returns  pointer address to first Sample or NULL if there is none
       *           applied to this Group
       * @see      GetNextSample()
+      * @deprecated  This method is not reentrant-safe, use GetSample()
+      *              instead.
       */
      Sample* Group::GetFirstSample() {
-         // FIXME: lazy und unsafe implementation, should be an autonomous iterator
+         size_t& i = this->SamplesIterator;
-         for (Sample* pSample = pFile->GetFirstSample(); pSample; pSample = pFile->GetNextSample()) {
+         i = 0;
-             if (pSample->GetGroup() == this) return pSample;
+         for (Sample* pSample = pFile->GetSample(i); pSample;
+                      pSample = pFile->GetSample(++i))
+         {
+             if (pSample->GetGroup() == this)
+                 return pSample;
          }
          return NULL;
      }
-Line 6118 
 namespace {
+Line 6182 
 namespace {
       * @returns  pointer address to the next Sample of this Group or NULL if
       *           end reached
       * @see      GetFirstSample()
+      * @deprecated  This method is not reentrant-safe, use GetSample()
+      *              instead.
       */
      Sample* Group::GetNextSample() {
-         // FIXME: lazy und unsafe implementation, should be an autonomous iterator
+         size_t& i = this->SamplesIterator;
-         for (Sample* pSample = pFile->GetNextSample(); pSample; pSample = pFile->GetNextSample()) {
+         for (Sample* pSample = pFile->GetSample(++i); pSample;
-             if (pSample->GetGroup() == this) return pSample;
+                      pSample = pFile->GetSample(++i))
+         {
+             if (pSample->GetGroup() == this)
+                 return pSample;
          }
          return NULL;
      }
-Line 6142 
 namespace {
+Line 6211 
 namespace {
       */
      void Group::MoveAll() {
          // get "that" other group first
+         size_t i = 0;
          Group* pOtherGroup = NULL;
-         for (pOtherGroup = pFile->GetFirstGroup(); pOtherGroup; pOtherGroup = pFile->GetNextGroup()) {
+         for (pOtherGroup = pFile->GetGroup(i); pOtherGroup;
+              pOtherGroup = pFile->GetGroup(++i))
+         {
              if (pOtherGroup != this) break;
          }
          if (!pOtherGroup) throw Exception(
-Line 6151 
 namespace {
+Line 6223 
 namespace {
              "other Group. This is a bug, report it!"
          );
          // now move all samples of this group to the other group
-         for (Sample* pSample = GetFirstSample(); pSample; pSample = GetNextSample()) {
+         Sample* pSample;
+         while ((pSample = GetSample(0))) {
              pOtherGroup->AddSample(pSample);
          }
      }
-Line 6223 
 namespace {
+Line 6296 
 namespace {
      File::~File() {
          if (pGroups) {
-             std::list<Group*>::iterator iter = pGroups->begin();
+             std::vector<Group*>::iterator iter = pGroups->begin();
-             std::list<Group*>::iterator end  = pGroups->end();
+             std::vector<Group*>::iterator end  = pGroups->end();
              while (iter != end) {
                  delete *iter;
                  ++iter;
-Line 6242 
 namespace {
+Line 6315 
 namespace {
          }
      }
+     /**
+      * Returns a pointer to the first <i>Sample</i> object of the file,
+      * <i>NULL</i> otherwise.
+      *
+      * @param pProgress - optional: callback function for progress notification
+      * @deprecated  This method is not reentrant-safe, use GetSample()
+      *              instead.
+      */
      Sample* File::GetFirstSample(progress_t* pProgress) {
          if (!pSamples) LoadSamples(pProgress);
          if (!pSamples) return NULL;
-Line 6249 
 namespace {
+Line 6330 
 namespace {
          return static_cast<gig::Sample*>( (SamplesIterator != pSamples->end()) ? *SamplesIterator : NULL );
      }
+     /**
+      * Returns a pointer to the next <i>Sample</i> object of the file,
+      * <i>NULL</i> otherwise.
+      *
+      * @deprecated  This method is not reentrant-safe, use GetSample()
+      *              instead.
+      */
      Sample* File::GetNextSample() {
          if (!pSamples) return NULL;
          SamplesIterator++;
-Line 6258 
 namespace {
+Line 6346 
 namespace {
      /**
       * Returns Sample object of @a index.
       *
+      * @param index - position of sample in sample list (0..n)
+      * @param pProgress - optional: callback function for progress notification
       * @returns sample object or NULL if index is out of bounds
       */
-     Sample* File::GetSample(uint index) {
+     Sample* File::GetSample(size_t index, progress_t* pProgress) {
-         if (!pSamples) LoadSamples();
+         if (!pSamples) LoadSamples(pProgress);
          if (!pSamples) return NULL;
-         DLS::File::SampleList::iterator it = pSamples->begin();
+         if (index >= pSamples->size()) return NULL;
-         for (int i = 0; i < index; ++i) {
+         return static_cast<gig::Sample*>( (*pSamples)[index] );
-             ++it;
-             if (it == pSamples->end()) return NULL;
-         }
-         if (it == pSamples->end()) return NULL;
-         return static_cast<gig::Sample*>( *it );
      }
      /**
-Line 6327 
 namespace {
+Line 6412 
 namespace {
          pSample->DeleteChunks();
          delete pSample;
-         SampleList::iterator tmp = SamplesIterator;
          // remove all references to the sample
-         for (Instrument* instrument = GetFirstInstrument() ; instrument ;
+         size_t iIns = 0;
-              instrument = GetNextInstrument()) {
+         for (Instrument* instrument = GetInstrument(iIns); instrument;
-             for (Region* region = instrument->GetFirstRegion() ; region ;
+                          instrument = GetInstrument(++iIns))
-                  region = instrument->GetNextRegion()) {
+         {
+             size_t iRgn = 0;
+             for (Region* region = instrument->GetRegionAt(iRgn); region;
+                  region = instrument->GetRegionAt(++iRgn))
+             {
                  if (region->GetSample() == pSample) region->SetSample(NULL);
                  for (int i = 0 ; i < region->DimensionRegions ; i++) {
-Line 6342 
 namespace {
+Line 6429 
 namespace {
                  }
              }
          }
-         SamplesIterator = tmp; // restore iterator
      }
      void File::LoadSamples() {
-Line 6356 
 namespace {
+Line 6442 
 namespace {
          if (!pSamples) pSamples = new SampleList;
-         RIFF::File* file = pRIFF;
          // just for progress calculation
          int iSampleIndex  = 0;
          int iTotalSamples = WavePoolCount;
-Line 6438 
 namespace {
+Line 6522 
 namespace {
              if (wvpl) {
                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -
                                                 wvpl->GetPos(); // should be zero, but just to be sure
-                 RIFF::List* wave = wvpl->GetFirstSubList();
+                 size_t i = 0;
-                 while (wave) {
+                 for (RIFF::List* wave = wvpl->GetSubListAt(i); wave;
+                      wave = wvpl->GetSubListAt(++i))
+                 {
                      if (wave->GetListType() == LIST_TYPE_WAVE) {
                          // notify current progress
                          if (pProgress) {
-Line 6452 
 namespace {
+Line 6538 
 namespace {
                          iSampleIndex++;
                      }
-                     wave = wvpl->GetNextSubList();
                  }
              }
          }
-Line 6461 
 namespace {
+Line 6546 
 namespace {
              __notify_progress(pProgress, 1.0); // notify done
      }
+     /**
+      * Returns a pointer to the first <i>Instrument</i> object of the file,
+      * <i>NULL</i> otherwise.
+      *
+      * @deprecated  This method is not reentrant-safe, use GetInstrument()
+      *              instead.
+      */
      Instrument* File::GetFirstInstrument() {
          if (!pInstruments) LoadInstruments();
          if (!pInstruments) return NULL;
-Line 6468 
 namespace {
+Line 6560 
 namespace {
          return static_cast<gig::Instrument*>( (InstrumentsIterator != pInstruments->end()) ? *InstrumentsIterator : NULL );
      }
+     /**
+      * Returns a pointer to the next <i>Instrument</i> object of the file,
+      * <i>NULL</i> otherwise.
+      *
+      * @deprecated  This method is not reentrant-safe, use GetInstrument()
+      *              instead.
+      */
      Instrument* File::GetNextInstrument() {
          if (!pInstruments) return NULL;
          InstrumentsIterator++;
-Line 6495 
 namespace {
+Line 6594 
 namespace {
       * @param pProgress - optional: callback function for progress notification
       * @returns  sought instrument or NULL if there's no such instrument
       */
-     Instrument* File::GetInstrument(uint index, progress_t* pProgress) {
+     Instrument* File::GetInstrument(size_t index, progress_t* pProgress) {
          if (!pInstruments) {
              // TODO: hack - we simply load ALL samples here, it would have been done in the Region constructor anyway (ATM)
-Line 6505 
 namespace {
+Line 6604 
 namespace {
                  __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask
                  __notify_progress(&subprogress, 0.0f);
                  if (GetAutoLoad())
-                     GetFirstSample(&subprogress); // now force all samples to be loaded
+                     GetSample(0, &subprogress); // now force all samples to be loaded
                  __notify_progress(&subprogress, 1.0f);
                  // instrument loading subtask
-Line 6519 
 namespace {
+Line 6618 
 namespace {
              } else {
                  // sample loading subtask
                  if (GetAutoLoad())
-                     GetFirstSample(); // now force all samples to be loaded
+                     GetSample(0); // now force all samples to be loaded
                  // instrument loading subtask
                  LoadInstruments();
              }
          }
          if (!pInstruments) return NULL;
-         InstrumentsIterator = pInstruments->begin();
+         if (index >= pInstruments->size()) return NULL;
-         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;
      }
      /** @brief Add a new instrument definition.
-Line 6685 
 namespace {
+Line 6780 
 namespace {
          RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);
          if (lstInstruments) {
              int iInstrumentIndex = 0;
-             RIFF::List* lstInstr = lstInstruments->GetFirstSubList();
+             size_t i = 0;
-             while (lstInstr) {
+             for (RIFF::List* lstInstr = lstInstruments->GetSubListAt(i);
+                  lstInstr; lstInstr = lstInstruments->GetSubListAt(++i))
+             {
                  if (lstInstr->GetListType() == LIST_TYPE_INS) {
                      if (pProgress) {
                          // notify current progress
-Line 6704 
 namespace {
+Line 6801 
 namespace {
                      iInstrumentIndex++;
                  }
-                 lstInstr = lstInstruments->GetNextSubList();
              }
              if (pProgress)
                  __notify_progress(pProgress, 1.0); // notify done
-Line 6758 
 namespace {
+Line 6854 
 namespace {
      }
      int File::GetWaveTableIndexOf(gig::Sample* pSample) {
-         if (!pSamples) GetFirstSample(); // make sure sample chunks were scanned
+         if (!pSamples) GetSample(0); // make sure sample chunks were scanned
          File::SampleList::iterator iter = pSamples->begin();
          File::SampleList::iterator end  = pSamples->end();
          for (int index = 0; iter != end; ++iter, ++index)
-Line 6778 
 namespace {
+Line 6874 
 namespace {
          if (!_3crc) return false;
          if (_3crc->GetNewSize() <= 0) return false;
          if (_3crc->GetNewSize() % 8) return false;
-         if (!pSamples) GetFirstSample(); // make sure sample chunks were scanned
+         if (!pSamples) GetSample(0); // make sure sample chunks were scanned
          if (_3crc->GetNewSize() != pSamples->size() * 8) return false;
          const file_offset_t n = _3crc->GetNewSize() / 8;
-Line 6812 
 namespace {
+Line 6908 
 namespace {
       */
      bool File::RebuildSampleChecksumTable() {
          // make sure sample chunks were scanned
-         if (!pSamples) GetFirstSample();
+         if (!pSamples) GetSample(0);
          bool bRequiresSave = false;
-Line 6861 
 namespace {
+Line 6957 
 namespace {
          return bRequiresSave;
      }
+     /**
+      * Returns a pointer to the first <i>Group</i> object of the file,
+      * <i>NULL</i> otherwise.
+      *
+      * @deprecated  This method is not reentrant-safe, use GetGroup() instead.
+      */
      Group* File::GetFirstGroup() {
          if (!pGroups) LoadGroups();
          // there must always be at least one group
-Line 6868 
 namespace {
+Line 6970 
 namespace {
          return *GroupsIterator;
      }
+     /**
+      * Returns a pointer to the next <i>Group</i> object of the file,
+      * <i>NULL</i> otherwise.
+      *
+      * @deprecated  This method is not reentrant-safe, use GetGroup() instead.
+      */
      Group* File::GetNextGroup() {
          if (!pGroups) return NULL;
          ++GroupsIterator;
-Line 6880 
 namespace {
+Line 6988 
 namespace {
       * @param index - number of the sought group (0..n)
       * @returns sought group or NULL if there's no such group
       */
-     Group* File::GetGroup(uint index) {
+     Group* File::GetGroup(size_t index) {
          if (!pGroups) LoadGroups();
-         GroupsIterator = pGroups->begin();
+         if (index >= pGroups->size()) return NULL;
-         for (uint i = 0; GroupsIterator != pGroups->end(); i++) {
+         return (*pGroups)[index];
-             if (i == index) return *GroupsIterator;
-             ++GroupsIterator;
-         }
-         return NULL;
      }
      /**
-Line 6902 
 namespace {
+Line 7006 
 namespace {
       */
      Group* File::GetGroup(String name) {
          if (!pGroups) LoadGroups();
-         GroupsIterator = pGroups->begin();
+         size_t i = 0;
-         for (uint i = 0; GroupsIterator != pGroups->end(); ++GroupsIterator, ++i)
+         for (Group* pGroup = GetGroup(i); pGroup; pGroup = GetGroup(++i))
-             if ((*GroupsIterator)->Name == name) return *GroupsIterator;
+             if (pGroup->Name == name) return pGroup;
          return NULL;
      }
-Line 6928 
 namespace {
+Line 7032 
 namespace {
       */
      void File::DeleteGroup(Group* pGroup) {
          if (!pGroups) LoadGroups();
-         std::list<Group*>::iterator iter = find(pGroups->begin(), pGroups->end(), pGroup);
+         std::vector<Group*>::iterator iter =
+             find(pGroups->begin(), pGroups->end(), pGroup);
          if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");
          if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");
          // delete all members of this group
-         for (Sample* pSample = pGroup->GetFirstSample(); pSample; pSample = pGroup->GetNextSample()) {
+         Sample* pSample;
+         while ((pSample = pGroup->GetSample(0))) {
              DeleteSample(pSample);
          }
          // now delete this group object
-Line 6953 
 namespace {
+Line 7059 
 namespace {
       */
      void File::DeleteGroupOnly(Group* pGroup) {
          if (!pGroups) LoadGroups();
-         std::list<Group*>::iterator iter = find(pGroups->begin(), pGroups->end(), pGroup);
+         std::vector<Group*>::iterator iter =
+             find(pGroups->begin(), pGroups->end(), pGroup);
          if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");
          if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");
          // move all members of this group to another group
-Line 6964 
 namespace {
+Line 7071 
 namespace {
      }
      void File::LoadGroups() {
-         if (!pGroups) pGroups = new std::list<Group*>;
+         if (!pGroups) pGroups = new std::vector<Group*>;
          // try to read defined groups from file
          RIFF::List* lst3gri = pRIFF->GetSubList(LIST_TYPE_3GRI);
          if (lst3gri) {
              RIFF::List* lst3gnl = lst3gri->GetSubList(LIST_TYPE_3GNL);
              if (lst3gnl) {
-                 RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();
+                 size_t i = 0;
-                 while (ck) {
+                 for (RIFF::Chunk* ck = lst3gnl->GetSubChunkAt(i); ck;
+                      ck = lst3gnl->GetSubChunkAt(++i))
+                 {
                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {
                          if (pVersion && pVersion->major > 2 &&
                              strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;
                          pGroups->push_back(new Group(this, ck));
                      }
-                     ck = lst3gnl->GetNextSubChunk();
                  }
              }
          }
-Line 7068 
 namespace {
+Line 7176 
 namespace {
          pScriptGroups = new std::list<ScriptGroup*>;
          RIFF::List* lstLS = pRIFF->GetSubList(LIST_TYPE_3LS);
          if (lstLS) {
-             for (RIFF::List* lst = lstLS->GetFirstSubList(); lst;
+             size_t i = 0;
-                  lst = lstLS->GetNextSubList())
+             for (RIFF::List* lst = lstLS->GetSubListAt(i); lst;
+                  lst = lstLS->GetSubListAt(++i))
              {
                  if (lst->GetListType() == LIST_TYPE_RTIS) {
                      pScriptGroups->push_back(new ScriptGroup(this, lst));
-Line 7130 
 namespace {
+Line 7239 
 namespace {
              // INFO was added by Resource::UpdateChunks - make sure it
              // is placed first in file
              RIFF::Chunk* info = pRIFF->GetSubList(LIST_TYPE_INFO);
-             RIFF::Chunk* first = pRIFF->GetFirstSubChunk();
+             RIFF::Chunk* first = pRIFF->GetSubChunkAt(0);
              if (first != info) {
                  pRIFF->MoveSubChunk(info, first);
              }
-Line 7151 
 namespace {
+Line 7260 
 namespace {
              // v3: make sure the file has 128 3gnm chunks
              // (before updating the Group chunks)
              if (pVersion && pVersion->major > 2) {
-                 RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();
+                 size_t i = 0;
-                 for (int i = 0 ; i < 128 ; i++) {
+                 for (RIFF::Chunk* _3gnm = _3gnl->GetSubChunkAt(i); i < 128;
+                      _3gnm = _3gnl->GetSubChunkAt(++i))
+                 {
                      // create 128 empty placeholder strings which will either
                      // be filled by Group::UpdateChunks below or left empty.
                      ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);
-                     if (_3gnm) _3gnm = _3gnl->GetNextSubChunk();
                  }
              }
-             std::list<Group*>::iterator iter = pGroups->begin();
+             std::vector<Group*>::iterator iter = pGroups->begin();
-             std::list<Group*>::iterator end  = pGroups->end();
+             std::vector<Group*>::iterator end  = pGroups->end();
              for (; iter != end; ++iter) {
                  (*iter)->UpdateChunks(pProgress);
              }
-Line 7199 
 namespace {
+Line 7309 
 namespace {
              uint8_t* pData = (uint8_t*) einf->LoadChunkData();
              std::map<gig::Sample*,int> sampleMap;
-             int sampleIdx = 0;
+             size_t sampleIdx = 0;
-             for (Sample* pSample = GetFirstSample(); pSample; pSample = GetNextSample()) {
+             for (Sample* pSample = GetSample(0); pSample;
-                 sampleMap[pSample] = sampleIdx++;
+                          pSample = GetSample(++sampleIdx))
+             {
+                 sampleMap[pSample] = sampleIdx;
              }
              int totnbusedsamples = 0;
-Line 7213 
 namespace {
+Line 7325 
 namespace {
              memset(&pData[48], 0, sublen - 48);
-             for (Instrument* instrument = GetFirstInstrument() ; instrument ;
+             size_t iIns = 0;
-                  instrument = GetNextInstrument()) {
+             for (Instrument* instrument = GetInstrument(iIns); instrument;
+                              instrument = GetInstrument(++iIns))
+             {
                  int nbusedsamples = 0;
                  int nbusedchannels = 0;
                  int nbdimregions = 0;
-Line 7222 
 namespace {
+Line 7336 
 namespace {
                  memset(&pData[(instrumentIdx + 1) * sublen + 48], 0, sublen - 48);
-                 for (Region* region = instrument->GetFirstRegion() ; region ;
+                 size_t iRgn = 0;
-                      region = instrument->GetNextRegion()) {
+                 for (Region* region = instrument->GetRegionAt(iRgn); region;
+                      region = instrument->GetRegionAt(++iRgn))
+                 {
                      for (int i = 0 ; i < region->DimensionRegions ; i++) {
                          gig::DimensionRegion *d = region->pDimensionRegions[i];
                          if (d->pSample) {
-Line 7317 
 namespace {
+Line 7433 
 namespace {
      void File::UpdateFileOffsets() {
          DLS::File::UpdateFileOffsets();
-         for (Instrument* instrument = GetFirstInstrument(); instrument;
+         size_t i = 0;
-              instrument = GetNextInstrument())
+         for (Instrument* instrument = GetInstrument(i); instrument;
+                          instrument = GetInstrument(++i))
          {
              instrument->UpdateScriptFileOffsets();
          }

 Legend:



Removed from v.3903
 


changed lines


 
Added in v.3946
 Legend:



Removed from v.3903
 


changed lines


 
Added in v.3946
-Removed from v.3903
+Added in v.3946

	ViewVC Help
Powered by ViewVC