/[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 3731 by schoenebeck, Sat Feb 1 15:35:07 2020 UTC revision 3928 by schoenebeck, Tue Jun 15 11:38:38 2021 UTC
# Line 2  Line 2 
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file access library    *   *   libgig - C++ cross-platform Gigasampler format file access library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003-2020 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2021 by Christian Schoenebeck                      *
6   *                              <cuse@users.sourceforge.net>               *   *                              <cuse@users.sourceforge.net>               *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
# Line 482  namespace { Line 482  namespace {
482              ScanCompressedSample();              ScanCompressedSample();
483          }          }
484    
485          // we use a buffer for decompression and for truncating 24 bit samples to 16 bit          // we use a buffer for decompression only
486          if ((Compressed || BitDepth == 24) && !InternalDecompressionBuffer.Size) {          if (Compressed && !InternalDecompressionBuffer.Size) {
487              InternalDecompressionBuffer.pStart = new unsigned char[INITIAL_SAMPLE_BUFFER_SIZE];              InternalDecompressionBuffer.pStart = new unsigned char[INITIAL_SAMPLE_BUFFER_SIZE];
488              InternalDecompressionBuffer.Size   = INITIAL_SAMPLE_BUFFER_SIZE;              InternalDecompressionBuffer.Size   = INITIAL_SAMPLE_BUFFER_SIZE;
489          }          }
# Line 3498  namespace { Line 3498  namespace {
3498          RIFF::List* _3prg = rgn->GetSubList(LIST_TYPE_3PRG);          RIFF::List* _3prg = rgn->GetSubList(LIST_TYPE_3PRG);
3499          if (_3prg) {          if (_3prg) {
3500              int dimensionRegionNr = 0;              int dimensionRegionNr = 0;
3501              RIFF::List* _3ewl = _3prg->GetFirstSubList();              size_t i = 0;
3502              while (_3ewl) {              for (RIFF::List* _3ewl = _3prg->GetSubListAt(i); _3ewl;
3503                     _3ewl = _3prg->GetSubListAt(++i))
3504                {
3505                  if (_3ewl->GetListType() == LIST_TYPE_3EWL) {                  if (_3ewl->GetListType() == LIST_TYPE_3EWL) {
3506                      pDimensionRegions[dimensionRegionNr] = new DimensionRegion(this, _3ewl);                      pDimensionRegions[dimensionRegionNr] = new DimensionRegion(this, _3ewl);
3507                      dimensionRegionNr++;                      dimensionRegionNr++;
3508                  }                  }
                 _3ewl = _3prg->GetNextSubList();  
3509              }              }
3510              if (dimensionRegionNr == 0) throw gig::Exception("No dimension region found.");              if (dimensionRegionNr == 0) throw gig::Exception("No dimension region found.");
3511          }          }
# Line 3807  namespace { Line 3808  namespace {
3808       * @throws gig::Exception if requested zone could not be deleted       * @throws gig::Exception if requested zone could not be deleted
3809       */       */
3810      void Region::DeleteDimensionZone(dimension_t type, int zone) {      void Region::DeleteDimensionZone(dimension_t type, int zone) {
3811            if (!Dimensions)
3812                throw gig::Exception("Could not delete dimension zone, because there is no dimension at all.");
3813          dimension_def_t* oldDef = GetDimensionDefinition(type);          dimension_def_t* oldDef = GetDimensionDefinition(type);
3814          if (!oldDef)          if (!oldDef)
3815              throw gig::Exception("Could not delete dimension zone, no such dimension of given type");              throw gig::Exception("Could not delete dimension zone, no such dimension of given type");
# Line 3835  namespace { Line 3838  namespace {
3838          // requested by the arguments of this method call) to the temporary          // requested by the arguments of this method call) to the temporary
3839          // region, and don't use Region::CopyAssign() here for this task, since          // region, and don't use Region::CopyAssign() here for this task, since
3840          // it would also alter fast lookup helper variables here and there          // it would also alter fast lookup helper variables here and there
3841          dimension_def_t newDef;          dimension_def_t newDef = {};
3842          for (int i = 0; i < Dimensions; ++i) {          for (int i = 0; i < Dimensions; ++i) {
3843              dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference              dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference
3844              // is this the dimension requested by the method arguments? ...              // is this the dimension requested by the method arguments? ...
# Line 3846  namespace { Line 3849  namespace {
3849              }              }
3850              tempRgn->AddDimension(&def);              tempRgn->AddDimension(&def);
3851          }          }
3852            // silence clang sanitizer warning
3853            if (newDef.dimension == dimension_none)
3854                throw gig::Exception("Unexpected internal failure resolving dimension in DeleteDimensionZone() [this is a bug].");
3855    
3856          // find the dimension index in the tempRegion which is the dimension          // find the dimension index in the tempRegion which is the dimension
3857          // type passed to this method (paranoidly expecting different order)          // type passed to this method (paranoidly expecting different order)
# Line 3946  namespace { Line 3952  namespace {
3952       * @throws gig::Exception if requested zone could not be splitted       * @throws gig::Exception if requested zone could not be splitted
3953       */       */
3954      void Region::SplitDimensionZone(dimension_t type, int zone) {      void Region::SplitDimensionZone(dimension_t type, int zone) {
3955            if (!Dimensions)
3956                throw gig::Exception("Could not split dimension zone, because there is no dimension at all.");
3957          dimension_def_t* oldDef = GetDimensionDefinition(type);          dimension_def_t* oldDef = GetDimensionDefinition(type);
3958          if (!oldDef)          if (!oldDef)
3959              throw gig::Exception("Could not split dimension zone, no such dimension of given type");              throw gig::Exception("Could not split dimension zone, no such dimension of given type");
# Line 3972  namespace { Line 3980  namespace {
3980          // requested by the arguments of this method call) to the temporary          // requested by the arguments of this method call) to the temporary
3981          // region, and don't use Region::CopyAssign() here for this task, since          // region, and don't use Region::CopyAssign() here for this task, since
3982          // it would also alter fast lookup helper variables here and there          // it would also alter fast lookup helper variables here and there
3983          dimension_def_t newDef;          dimension_def_t newDef = {};
3984          for (int i = 0; i < Dimensions; ++i) {          for (int i = 0; i < Dimensions; ++i) {
3985              dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference              dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference
3986              // is this the dimension requested by the method arguments? ...              // is this the dimension requested by the method arguments? ...
# Line 3983  namespace { Line 3991  namespace {
3991              }              }
3992              tempRgn->AddDimension(&def);              tempRgn->AddDimension(&def);
3993          }          }
3994            // silence clang sanitizer warning
3995            if (newDef.dimension == dimension_none)
3996                throw gig::Exception("Unexpected internal failure resolving dimension in SplitDimensionZone() [this is a bug].");
3997    
3998          // find the dimension index in the tempRegion which is the dimension          // find the dimension index in the tempRegion which is the dimension
3999          // type passed to this method (paranoidly expecting different order)          // type passed to this method (paranoidly expecting different order)
# Line 4896  namespace { Line 4907  namespace {
4907          pScripts = new std::list<Script*>;          pScripts = new std::list<Script*>;
4908          if (!pList) return;          if (!pList) return;
4909    
4910          for (RIFF::Chunk* ck = pList->GetFirstSubChunk(); ck;          size_t i = 0;
4911               ck = pList->GetNextSubChunk())          for (RIFF::Chunk* ck = pList->GetSubChunkAt(i); ck;
4912                 ck = pList->GetSubChunkAt(++i))
4913          {          {
4914              if (ck->GetChunkID() == CHUNK_ID_SCRI) {              if (ck->GetChunkID() == CHUNK_ID_SCRI) {
4915                  pScripts->push_back(new Script(this, ck));                  pScripts->push_back(new Script(this, ck));
# Line 4977  namespace { Line 4989  namespace {
4989              if (!pRegions) pRegions = new RegionList;              if (!pRegions) pRegions = new RegionList;
4990              RIFF::List* lrgn = insList->GetSubList(LIST_TYPE_LRGN);              RIFF::List* lrgn = insList->GetSubList(LIST_TYPE_LRGN);
4991              if (lrgn) {              if (lrgn) {
4992                  RIFF::List* rgn = lrgn->GetFirstSubList();                  size_t i = 0;
4993                  while (rgn) {                  for (RIFF::List* rgn = lrgn->GetSubListAt(i); rgn;
4994                         rgn = lrgn->GetSubListAt(++i))
4995                    {
4996                      if (rgn->GetListType() == LIST_TYPE_RGN) {                      if (rgn->GetListType() == LIST_TYPE_RGN) {
4997                          if (pProgress)                          if (pProgress)
4998                              __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);                              __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);
4999                          pRegions->push_back(new Region(this, rgn));                          pRegions->push_back(new Region(this, rgn));
5000                      }                      }
                     rgn = lrgn->GetNextSubList();  
5001                  }                  }
5002                  // Creating Region Key Table for fast lookup                  // Creating Region Key Table for fast lookup
5003                  UpdateRegionKeyTable();                  UpdateRegionKeyTable();
# Line 5288  namespace { Line 5301  namespace {
5301      }      }
5302    
5303      /**      /**
5304         * Returns Region at supplied @a pos position within the region list of
5305         * this instrument. If supplied @a pos is out of bounds then @c NULL is
5306         * returned.
5307         *
5308         * @param pos - position of sought Region in region list
5309         * @returns pointer address to requested region or @c NULL if @a pos is
5310         *          out of bounds
5311         */
5312        Region* Instrument::GetRegionAt(size_t pos) {
5313            if (!pRegions) return NULL;
5314            if (pos >= pRegions->size()) return NULL;
5315            return static_cast<gig::Region*>( (*pRegions)[pos] );
5316        }
5317    
5318        /**
5319       * Returns the first Region of the instrument. You have to call this       * Returns the first Region of the instrument. You have to call this
5320       * method once before you use GetNextRegion().       * method once before you use GetNextRegion().
5321       *       *
5322       * @returns  pointer address to first region or NULL if there is none       * @returns  pointer address to first region or NULL if there is none
5323       * @see      GetNextRegion()       * @see      GetNextRegion()
5324         * @deprecated  This method is not reentrant-safe, use GetRegionAt()
5325         *              instead.
5326       */       */
5327      Region* Instrument::GetFirstRegion() {      Region* Instrument::GetFirstRegion() {
5328          if (!pRegions) return NULL;          if (!pRegions) return NULL;
# Line 5307  namespace { Line 5337  namespace {
5337       *       *
5338       * @returns  pointer address to the next region or NULL if end reached       * @returns  pointer address to the next region or NULL if end reached
5339       * @see      GetFirstRegion()       * @see      GetFirstRegion()
5340         * @deprecated  This method is not reentrant-safe, use GetRegionAt()
5341         *              instead.
5342       */       */
5343      Region* Instrument::GetNextRegion() {      Region* Instrument::GetNextRegion() {
5344          if (!pRegions) return NULL;          if (!pRegions) return NULL;
# Line 5696  namespace { Line 5728  namespace {
5728       * still being able to fine tune certain aspects of the script for each       * still being able to fine tune certain aspects of the script for each
5729       * instrument individually.       * instrument individually.
5730       *       *
5731         * @note This is an own format extension which did not exist i.e. in the
5732         * GigaStudio 4 software. It will currently only work with LinuxSampler and
5733         * Gigedit.
5734         *
5735       * @param slot - script slot index of the variable to be retrieved       * @param slot - script slot index of the variable to be retrieved
5736       * @param variable - name of the 'patch' variable in that script       * @param variable - name of the 'patch' variable in that script
5737       */       */
# Line 5727  namespace { Line 5763  namespace {
5763       * still being able to fine tune certain aspects of the script for each       * still being able to fine tune certain aspects of the script for each
5764       * instrument individually.       * instrument individually.
5765       *       *
5766         * @note This is an own format extension which did not exist i.e. in the
5767         * GigaStudio 4 software. It will currently only work with LinuxSampler and
5768         * Gigedit.
5769         *
5770       * @param slot - script slot index of the variable to be retrieved       * @param slot - script slot index of the variable to be retrieved
5771       */       */
5772      std::map<String,String> Instrument::GetScriptPatchVariables(int slot) {      std::map<String,String> Instrument::GetScriptPatchVariables(int slot) {
# Line 5754  namespace { Line 5794  namespace {
5794       * still being able to fine tune certain aspects of the script for each       * still being able to fine tune certain aspects of the script for each
5795       * instrument individually.       * instrument individually.
5796       *       *
5797         * @note This is an own format extension which did not exist i.e. in the
5798         * GigaStudio 4 software. It will currently only work with LinuxSampler and
5799         * Gigedit.
5800         *
5801       * @param slot - script slot index of the variable to be retrieved       * @param slot - script slot index of the variable to be retrieved
5802       * @param variable - name of the 'patch' variable in that script       * @param variable - name of the 'patch' variable in that script
5803       */       */
# Line 5774  namespace { Line 5818  namespace {
5818       * still being able to fine tune certain aspects of the script for each       * still being able to fine tune certain aspects of the script for each
5819       * instrument individually.       * instrument individually.
5820       *       *
5821         * @note This is an own format extension which did not exist i.e. in the
5822         * GigaStudio 4 software. It will currently only work with LinuxSampler and
5823         * Gigedit.
5824         *
5825       * @param slot - script slot index of the variable to be set       * @param slot - script slot index of the variable to be set
5826       * @param variable - name of the 'patch' variable in that script       * @param variable - name of the 'patch' variable in that script
5827       * @param value - overridden initial value for that script variable       * @param value - overridden initial value for that script variable
# Line 5814  namespace { Line 5862  namespace {
5862       * still being able to fine tune certain aspects of the script for each       * still being able to fine tune certain aspects of the script for each
5863       * instrument individually.       * instrument individually.
5864       *       *
5865         * @note This is an own format extension which did not exist i.e. in the
5866         * GigaStudio 4 software. It will currently only work with LinuxSampler and
5867         * Gigedit.
5868         *
5869       * @param slot - script slot index of the variable to be unset       * @param slot - script slot index of the variable to be unset
5870       * @param variable - name of the 'patch' variable in that script       * @param variable - name of the 'patch' variable in that script
5871       */       */
# Line 5938  namespace { Line 5990  namespace {
5990          PianoReleaseMode = orig->PianoReleaseMode;          PianoReleaseMode = orig->PianoReleaseMode;
5991          DimensionKeyRange = orig->DimensionKeyRange;          DimensionKeyRange = orig->DimensionKeyRange;
5992          scriptPoolFileOffsets = orig->scriptPoolFileOffsets;          scriptPoolFileOffsets = orig->scriptPoolFileOffsets;
5993          pScriptRefs = orig->pScriptRefs;          // deep copy of pScriptRefs required (to avoid undefined behaviour)
5994            if (pScriptRefs) delete pScriptRefs;
5995            pScriptRefs = new std::vector<_ScriptPooolRef>;
5996            if (orig->pScriptRefs)
5997                *pScriptRefs = *orig->pScriptRefs;
5998          scriptVars = orig->scriptVars;          scriptVars = orig->scriptVars;
5999                    
6000          // free old midi rules          // free old midi rules
# Line 5949  namespace { Line 6005  namespace {
6005          pMidiRules[0] = NULL;          pMidiRules[0] = NULL;
6006                    
6007          // delete all old regions          // delete all old regions
6008          while (Regions) DeleteRegion(GetFirstRegion());          while (Regions) DeleteRegion(GetRegionAt(0));
6009          // create new regions and copy them from original          // create new regions and copy them from original
6010          {          {
6011              RegionList::const_iterator it = orig->pRegions->begin();              RegionList::const_iterator it = orig->pRegions->begin();
# Line 6049  namespace { Line 6105  namespace {
6105    
6106          if (!pNameChunk && pFile->pVersion && pFile->pVersion->major > 2) {          if (!pNameChunk && pFile->pVersion && pFile->pVersion->major > 2) {
6107              // v3 has a fixed list of 128 strings, find a free one              // v3 has a fixed list of 128 strings, find a free one
6108              for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {              size_t i = 0;
6109                for (RIFF::Chunk* ck = _3gnl->GetSubChunkAt(i); ck; ck = _3gnl->GetSubChunkAt(++i)) {
6110                  if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {                  if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {
6111                      pNameChunk = ck;                      pNameChunk = ck;
6112                      break;                      break;
# Line 6213  namespace { Line 6270  namespace {
6270          }          }
6271      }      }
6272    
6273        /**
6274         * Returns a pointer to the first <i>Sample</i> object of the file,
6275         * <i>NULL</i> otherwise.
6276         *
6277         * @param pProgress - optional: callback function for progress notification
6278         * @deprecated  This method is not reentrant-safe, use GetSample()
6279         *              instead.
6280         */
6281      Sample* File::GetFirstSample(progress_t* pProgress) {      Sample* File::GetFirstSample(progress_t* pProgress) {
6282          if (!pSamples) LoadSamples(pProgress);          if (!pSamples) LoadSamples(pProgress);
6283          if (!pSamples) return NULL;          if (!pSamples) return NULL;
# Line 6220  namespace { Line 6285  namespace {
6285          return static_cast<gig::Sample*>( (SamplesIterator != pSamples->end()) ? *SamplesIterator : NULL );          return static_cast<gig::Sample*>( (SamplesIterator != pSamples->end()) ? *SamplesIterator : NULL );
6286      }      }
6287    
6288        /**
6289         * Returns a pointer to the next <i>Sample</i> object of the file,
6290         * <i>NULL</i> otherwise.
6291         *
6292         * @deprecated  This method is not reentrant-safe, use GetSample()
6293         *              instead.
6294         */
6295      Sample* File::GetNextSample() {      Sample* File::GetNextSample() {
6296          if (!pSamples) return NULL;          if (!pSamples) return NULL;
6297          SamplesIterator++;          SamplesIterator++;
# Line 6229  namespace { Line 6301  namespace {
6301      /**      /**
6302       * Returns Sample object of @a index.       * Returns Sample object of @a index.
6303       *       *
6304         * @param index - position of sample in sample list (0..n)
6305         * @param pProgress - optional: callback function for progress notification
6306       * @returns sample object or NULL if index is out of bounds       * @returns sample object or NULL if index is out of bounds
6307       */       */
6308      Sample* File::GetSample(uint index) {      Sample* File::GetSample(size_t index, progress_t* pProgress) {
6309          if (!pSamples) LoadSamples();          if (!pSamples) LoadSamples(pProgress);
6310          if (!pSamples) return NULL;          if (!pSamples) return NULL;
6311          DLS::File::SampleList::iterator it = pSamples->begin();          if (index >= pSamples->size()) return NULL;
6312          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 );  
6313      }      }
6314    
6315      /**      /**
# Line 6302  namespace { Line 6371  namespace {
6371          // remove all references to the sample          // remove all references to the sample
6372          for (Instrument* instrument = GetFirstInstrument() ; instrument ;          for (Instrument* instrument = GetFirstInstrument() ; instrument ;
6373               instrument = GetNextInstrument()) {               instrument = GetNextInstrument()) {
6374              for (Region* region = instrument->GetFirstRegion() ; region ;              size_t iRgn = 0;
6375                   region = instrument->GetNextRegion()) {              for (Region* region = instrument->GetRegionAt(iRgn); region;
6376                     region = instrument->GetRegionAt(++iRgn))
6377                {
6378                  if (region->GetSample() == pSample) region->SetSample(NULL);                  if (region->GetSample() == pSample) region->SetSample(NULL);
6379    
6380                  for (int i = 0 ; i < region->DimensionRegions ; i++) {                  for (int i = 0 ; i < region->DimensionRegions ; i++) {
# Line 6327  namespace { Line 6397  namespace {
6397    
6398          if (!pSamples) pSamples = new SampleList;          if (!pSamples) pSamples = new SampleList;
6399    
         RIFF::File* file = pRIFF;  
   
6400          // just for progress calculation          // just for progress calculation
6401          int iSampleIndex  = 0;          int iSampleIndex  = 0;
6402          int iTotalSamples = WavePoolCount;          int iTotalSamples = WavePoolCount;
# Line 6409  namespace { Line 6477  namespace {
6477              if (wvpl) {              if (wvpl) {
6478                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -
6479                                                 wvpl->GetPos(); // should be zero, but just to be sure                                                 wvpl->GetPos(); // should be zero, but just to be sure
6480                  RIFF::List* wave = wvpl->GetFirstSubList();                  size_t i = 0;
6481                  while (wave) {                  for (RIFF::List* wave = wvpl->GetSubListAt(i); wave;
6482                         wave = wvpl->GetSubListAt(++i))
6483                    {
6484                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
6485                          // notify current progress                          // notify current progress
6486                          if (pProgress) {                          if (pProgress) {
# Line 6423  namespace { Line 6493  namespace {
6493    
6494                          iSampleIndex++;                          iSampleIndex++;
6495                      }                      }
                     wave = wvpl->GetNextSubList();  
6496                  }                  }
6497              }              }
6498          }          }
# Line 6656  namespace { Line 6725  namespace {
6725          RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);          RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);
6726          if (lstInstruments) {          if (lstInstruments) {
6727              int iInstrumentIndex = 0;              int iInstrumentIndex = 0;
6728              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();              size_t i = 0;
6729              while (lstInstr) {              for (RIFF::List* lstInstr = lstInstruments->GetSubListAt(i);
6730                     lstInstr; lstInstr = lstInstruments->GetSubListAt(++i))
6731                {
6732                  if (lstInstr->GetListType() == LIST_TYPE_INS) {                  if (lstInstr->GetListType() == LIST_TYPE_INS) {
6733                      if (pProgress) {                      if (pProgress) {
6734                          // notify current progress                          // notify current progress
# Line 6675  namespace { Line 6746  namespace {
6746    
6747                      iInstrumentIndex++;                      iInstrumentIndex++;
6748                  }                  }
                 lstInstr = lstInstruments->GetNextSubList();  
6749              }              }
6750              if (pProgress)              if (pProgress)
6751                  __notify_progress(pProgress, 1.0); // notify done                  __notify_progress(pProgress, 1.0); // notify done
# Line 6941  namespace { Line 7011  namespace {
7011          if (lst3gri) {          if (lst3gri) {
7012              RIFF::List* lst3gnl = lst3gri->GetSubList(LIST_TYPE_3GNL);              RIFF::List* lst3gnl = lst3gri->GetSubList(LIST_TYPE_3GNL);
7013              if (lst3gnl) {              if (lst3gnl) {
7014                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();                  size_t i = 0;
7015                  while (ck) {                  for (RIFF::Chunk* ck = lst3gnl->GetSubChunkAt(i); ck;
7016                         ck = lst3gnl->GetSubChunkAt(++i))
7017                    {
7018                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {
7019                          if (pVersion && pVersion->major > 2 &&                          if (pVersion && pVersion->major > 2 &&
7020                              strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;                              strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;
7021    
7022                          pGroups->push_back(new Group(this, ck));                          pGroups->push_back(new Group(this, ck));
7023                      }                      }
                     ck = lst3gnl->GetNextSubChunk();  
7024                  }                  }
7025              }              }
7026          }          }
# Line 7039  namespace { Line 7110  namespace {
7110          pScriptGroups = new std::list<ScriptGroup*>;          pScriptGroups = new std::list<ScriptGroup*>;
7111          RIFF::List* lstLS = pRIFF->GetSubList(LIST_TYPE_3LS);          RIFF::List* lstLS = pRIFF->GetSubList(LIST_TYPE_3LS);
7112          if (lstLS) {          if (lstLS) {
7113              for (RIFF::List* lst = lstLS->GetFirstSubList(); lst;              size_t i = 0;
7114                   lst = lstLS->GetNextSubList())              for (RIFF::List* lst = lstLS->GetSubListAt(i); lst;
7115                     lst = lstLS->GetSubListAt(++i))
7116              {              {
7117                  if (lst->GetListType() == LIST_TYPE_RTIS) {                  if (lst->GetListType() == LIST_TYPE_RTIS) {
7118                      pScriptGroups->push_back(new ScriptGroup(this, lst));                      pScriptGroups->push_back(new ScriptGroup(this, lst));
# Line 7101  namespace { Line 7173  namespace {
7173              // INFO was added by Resource::UpdateChunks - make sure it              // INFO was added by Resource::UpdateChunks - make sure it
7174              // is placed first in file              // is placed first in file
7175              RIFF::Chunk* info = pRIFF->GetSubList(LIST_TYPE_INFO);              RIFF::Chunk* info = pRIFF->GetSubList(LIST_TYPE_INFO);
7176              RIFF::Chunk* first = pRIFF->GetFirstSubChunk();              RIFF::Chunk* first = pRIFF->GetSubChunkAt(0);
7177              if (first != info) {              if (first != info) {
7178                  pRIFF->MoveSubChunk(info, first);                  pRIFF->MoveSubChunk(info, first);
7179              }              }
# Line 7122  namespace { Line 7194  namespace {
7194              // v3: make sure the file has 128 3gnm chunks              // v3: make sure the file has 128 3gnm chunks
7195              // (before updating the Group chunks)              // (before updating the Group chunks)
7196              if (pVersion && pVersion->major > 2) {              if (pVersion && pVersion->major > 2) {
7197                  RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();                  size_t i = 0;
7198                  for (int i = 0 ; i < 128 ; i++) {                  for (RIFF::Chunk* _3gnm = _3gnl->GetSubChunkAt(i); i < 128;
7199                         _3gnm = _3gnl->GetSubChunkAt(++i))
7200                    {
7201                      // create 128 empty placeholder strings which will either                      // create 128 empty placeholder strings which will either
7202                      // be filled by Group::UpdateChunks below or left empty.                      // be filled by Group::UpdateChunks below or left empty.
7203                      ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);                      ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);
                     if (_3gnm) _3gnm = _3gnl->GetNextSubChunk();  
7204                  }                  }
7205              }              }
7206    
# Line 7193  namespace { Line 7266  namespace {
7266    
7267                  memset(&pData[(instrumentIdx + 1) * sublen + 48], 0, sublen - 48);                  memset(&pData[(instrumentIdx + 1) * sublen + 48], 0, sublen - 48);
7268    
7269                  for (Region* region = instrument->GetFirstRegion() ; region ;                  size_t iRgn = 0;
7270                       region = instrument->GetNextRegion()) {                  for (Region* region = instrument->GetRegionAt(iRgn); region;
7271                         region = instrument->GetRegionAt(++iRgn))
7272                    {
7273                      for (int i = 0 ; i < region->DimensionRegions ; i++) {                      for (int i = 0 ; i < region->DimensionRegions ; i++) {
7274                          gig::DimensionRegion *d = region->pDimensionRegions[i];                          gig::DimensionRegion *d = region->pDimensionRegions[i];
7275                          if (d->pSample) {                          if (d->pSample) {
Legend:
Removed from v.3731  
changed lines
  Added in v.3928
  ViewVC Help
Powered by ViewVC