/[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 3925 by schoenebeck, Mon Jun 14 12:15:51 2021 UTC revision 3977 by schoenebeck, Mon Jul 19 14:31:43 2021 UTC
# Line 609  namespace { Line 609  namespace {
609          uint16_t iSampleGroup = 0; // 0 refers to default sample group          uint16_t iSampleGroup = 0; // 0 refers to default sample group
610          File* pFile = static_cast<File*>(pParent);          File* pFile = static_cast<File*>(pParent);
611          if (pFile->pGroups) {          if (pFile->pGroups) {
612              std::list<Group*>::iterator iter = pFile->pGroups->begin();              std::vector<Group*>::iterator iter = pFile->pGroups->begin();
613              std::list<Group*>::iterator end  = pFile->pGroups->end();              std::vector<Group*>::iterator end  = pFile->pGroups->end();
614              for (int i = 0; iter != end; i++, iter++) {              for (int i = 0; iter != end; i++, iter++) {
615                  if (*iter == pGroup) {                  if (*iter == pGroup) {
616                      iSampleGroup = i;                      iSampleGroup = i;
# Line 1346  namespace { Line 1346  namespace {
1346    
1347          // if this is the last write, update the checksum chunk in the          // if this is the last write, update the checksum chunk in the
1348          // file          // file
1349          if (pCkData->GetPos() == pCkData->GetSize()) {          if (pCkData->GetPos() == std::min(pCkData->GetSize(), pCkData->GetNewSize())) {
1350              __finalizeCRC(crc);              __finalizeCRC(crc);
1351              File* pFile = static_cast<File*>(GetParent());              File* pFile = static_cast<File*>(GetParent());
1352              pFile->SetSampleChecksum(this, crc);              pFile->SetSampleChecksum(this, crc);
# Line 4325  namespace { Line 4325  namespace {
4325              uint64_t soughtoffset =              uint64_t soughtoffset =
4326                  uint64_t(file->pWavePoolTable[WavePoolTableIndex]) |                  uint64_t(file->pWavePoolTable[WavePoolTableIndex]) |
4327                  uint64_t(file->pWavePoolTableHi[WavePoolTableIndex]) << 32;                  uint64_t(file->pWavePoolTableHi[WavePoolTableIndex]) << 32;
4328              Sample* sample = file->GetFirstSample(pProgress);              size_t i = 0;
4329              while (sample) {              for (Sample* sample = file->GetSample(i, pProgress); sample;
4330                             sample = file->GetSample(++i))
4331                {
4332                  if (sample->ullWavePoolOffset == soughtoffset)                  if (sample->ullWavePoolOffset == soughtoffset)
4333                      return static_cast<gig::Sample*>(sample);                      return sample;
                 sample = file->GetNextSample();  
4334              }              }
4335          } else {          } else {
4336              // use extension files and 32 bit wave pool offsets              // use extension files and 32 bit wave pool offsets
4337              file_offset_t soughtoffset = file->pWavePoolTable[WavePoolTableIndex];              file_offset_t soughtoffset = file->pWavePoolTable[WavePoolTableIndex];
4338              file_offset_t soughtfileno = file->pWavePoolTableHi[WavePoolTableIndex];              file_offset_t soughtfileno = file->pWavePoolTableHi[WavePoolTableIndex];
4339              Sample* sample = file->GetFirstSample(pProgress);              size_t i = 0;
4340              while (sample) {              for (Sample* sample = file->GetSample(i, pProgress); sample;
4341                             sample = file->GetSample(++i))
4342                {
4343                  if (sample->ullWavePoolOffset == soughtoffset &&                  if (sample->ullWavePoolOffset == soughtoffset &&
4344                      sample->FileNo == soughtfileno) return static_cast<gig::Sample*>(sample);                      sample->FileNo == soughtfileno) return sample;
                 sample = file->GetNextSample();  
4345              }              }
4346          }          }
4347          return NULL;          return NULL;
# Line 4799  namespace { Line 4801  namespace {
4801    
4802      ScriptGroup::~ScriptGroup() {      ScriptGroup::~ScriptGroup() {
4803          if (pScripts) {          if (pScripts) {
4804              std::list<Script*>::iterator iter = pScripts->begin();              std::vector<Script*>::iterator iter = pScripts->begin();
4805              std::list<Script*>::iterator end  = pScripts->end();              std::vector<Script*>::iterator end  = pScripts->end();
4806              while (iter != end) {              while (iter != end) {
4807                  delete *iter;                  delete *iter;
4808                  ++iter;                  ++iter;
# Line 4838  namespace { Line 4840  namespace {
4840              // now store the name of this group as <LSNM> chunk as subchunk of the <RTIS> list chunk              // now store the name of this group as <LSNM> chunk as subchunk of the <RTIS> list chunk
4841              ::SaveString(CHUNK_ID_LSNM, NULL, pList, Name, String("Unnamed Group"), true, 64);              ::SaveString(CHUNK_ID_LSNM, NULL, pList, Name, String("Unnamed Group"), true, 64);
4842    
4843              for (std::list<Script*>::iterator it = pScripts->begin();              for (std::vector<Script*>::iterator it = pScripts->begin();
4844                   it != pScripts->end(); ++it)                   it != pScripts->end(); ++it)
4845              {              {
4846                  (*it)->UpdateChunks(pProgress);                  (*it)->UpdateChunks(pProgress);
# Line 4853  namespace { Line 4855  namespace {
4855       * @param index - number of the sought script (0..n)       * @param index - number of the sought script (0..n)
4856       * @returns sought script or NULL if there's no such script       * @returns sought script or NULL if there's no such script
4857       */       */
4858      Script* ScriptGroup::GetScript(uint index) {      Script* ScriptGroup::GetScript(size_t index) {
4859          if (!pScripts) LoadScripts();          if (!pScripts) LoadScripts();
4860          std::list<Script*>::iterator it = pScripts->begin();          if (index >= pScripts->size()) return NULL;
4861          for (uint i = 0; it != pScripts->end(); ++i, ++it)          return (*pScripts)[index];
             if (i == index) return *it;  
         return NULL;  
4862      }      }
4863    
4864      /** @brief Add new instrument script.      /** @brief Add new instrument script.
# Line 4891  namespace { Line 4891  namespace {
4891       */       */
4892      void ScriptGroup::DeleteScript(Script* pScript) {      void ScriptGroup::DeleteScript(Script* pScript) {
4893          if (!pScripts) LoadScripts();          if (!pScripts) LoadScripts();
4894          std::list<Script*>::iterator iter =          std::vector<Script*>::iterator iter =
4895              find(pScripts->begin(), pScripts->end(), pScript);              find(pScripts->begin(), pScripts->end(), pScript);
4896          if (iter == pScripts->end())          if (iter == pScripts->end())
4897              throw gig::Exception("Could not delete script, could not find given script");              throw gig::Exception("Could not delete script, could not find given script");
# Line 4904  namespace { Line 4904  namespace {
4904    
4905      void ScriptGroup::LoadScripts() {      void ScriptGroup::LoadScripts() {
4906          if (pScripts) return;          if (pScripts) return;
4907          pScripts = new std::list<Script*>;          pScripts = new std::vector<Script*>;
4908          if (!pList) return;          if (!pList) return;
4909    
4910          size_t i = 0;          size_t i = 0;
# Line 5301  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         * @see CountRegions()
5312         */
5313        Region* Instrument::GetRegionAt(size_t pos) {
5314            if (!pRegions) return NULL;
5315            if (pos >= pRegions->size()) return NULL;
5316            return static_cast<gig::Region*>( (*pRegions)[pos] );
5317        }
5318    
5319        /**
5320       * Returns the first Region of the instrument. You have to call this       * Returns the first Region of the instrument. You have to call this
5321       * method once before you use GetNextRegion().       * method once before you use GetNextRegion().
5322       *       *
5323       * @returns  pointer address to first region or NULL if there is none       * @returns  pointer address to first region or NULL if there is none
5324       * @see      GetNextRegion()       * @see      GetNextRegion()
5325         * @deprecated  This method is not reentrant-safe, use GetRegionAt()
5326         *              instead.
5327       */       */
5328      Region* Instrument::GetFirstRegion() {      Region* Instrument::GetFirstRegion() {
5329          if (!pRegions) return NULL;          if (!pRegions) return NULL;
# Line 5320  namespace { Line 5338  namespace {
5338       *       *
5339       * @returns  pointer address to the next region or NULL if end reached       * @returns  pointer address to the next region or NULL if end reached
5340       * @see      GetFirstRegion()       * @see      GetFirstRegion()
5341         * @deprecated  This method is not reentrant-safe, use GetRegionAt()
5342         *              instead.
5343       */       */
5344      Region* Instrument::GetNextRegion() {      Region* Instrument::GetNextRegion() {
5345          if (!pRegions) return NULL;          if (!pRegions) return NULL;
# Line 5333  namespace { Line 5353  namespace {
5353          if (!lrgn)  lrgn = pCkInstrument->AddSubList(LIST_TYPE_LRGN);          if (!lrgn)  lrgn = pCkInstrument->AddSubList(LIST_TYPE_LRGN);
5354          RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);          RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);
5355          Region* pNewRegion = new Region(this, rgn);          Region* pNewRegion = new Region(this, rgn);
5356            const size_t idxIt = RegionsIterator - pRegions->begin();
5357          pRegions->push_back(pNewRegion);          pRegions->push_back(pNewRegion);
5358            RegionsIterator = pRegions->begin() + std::min(idxIt, pRegions->size()); // avoid iterator invalidation
5359          Regions = (uint32_t) pRegions->size();          Regions = (uint32_t) pRegions->size();
5360          // update Region key table for fast lookup          // update Region key table for fast lookup
5361          UpdateRegionKeyTable();          UpdateRegionKeyTable();
# Line 5373  namespace { Line 5395  namespace {
5395       * @param dst - destination instrument at which this instrument will be       * @param dst - destination instrument at which this instrument will be
5396       *              moved to, or pass NULL for moving to end of list       *              moved to, or pass NULL for moving to end of list
5397       * @throw gig::Exception if this instrument and target instrument are not       * @throw gig::Exception if this instrument and target instrument are not
5398       *                       part of the same file       *                       part of the same file, as well as on unexpected
5399         *                       internal error
5400       */       */
5401      void Instrument::MoveTo(Instrument* dst) {      void Instrument::MoveTo(Instrument* dst) {
5402          if (dst && GetParent() != dst->GetParent())          if (dst && GetParent() != dst->GetParent())
# Line 5390  namespace { Line 5413  namespace {
5413    
5414              File::InstrumentList::iterator itFrom =              File::InstrumentList::iterator itFrom =
5415                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(this));                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(this));
5416                if (itFrom == list.end())
5417                    throw Exception(
5418                        "gig::Instrument::MoveTo(): unexpected missing membership "
5419                        "of this instrument."
5420                    );
5421                list.erase(itFrom);
5422    
5423              File::InstrumentList::iterator itTo =              File::InstrumentList::iterator itTo =
5424                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(dst));                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(dst));
5425    
5426              list.splice(itTo, list, itFrom);              list.insert(itTo, this);
5427          }          }
5428    
5429          // move the instrument's actual list RIFF chunk appropriately          // move the instrument's actual list RIFF chunk appropriately
# Line 5475  namespace { Line 5504  namespace {
5504          File* pFile = (File*) GetParent();          File* pFile = (File*) GetParent();
5505          for (uint k = 0; k < scriptPoolFileOffsets.size(); ++k) {          for (uint k = 0; k < scriptPoolFileOffsets.size(); ++k) {
5506              uint32_t soughtOffset = scriptPoolFileOffsets[k].fileOffset;              uint32_t soughtOffset = scriptPoolFileOffsets[k].fileOffset;
5507              for (uint i = 0; pFile->GetScriptGroup(i); ++i) {              for (size_t i = 0; pFile->GetScriptGroup(i); ++i) {
5508                  ScriptGroup* group = pFile->GetScriptGroup(i);                  ScriptGroup* group = pFile->GetScriptGroup(i);
5509                  for (uint s = 0; group->GetScript(s); ++s) {                  for (uint s = 0; group->GetScript(s); ++s) {
5510                      Script* script = group->GetScript(s);                      Script* script = group->GetScript(s);
# Line 5513  namespace { Line 5542  namespace {
5542       * @param index - instrument script slot index       * @param index - instrument script slot index
5543       * @returns script or NULL if index is out of bounds       * @returns script or NULL if index is out of bounds
5544       */       */
5545      Script* Instrument::GetScriptOfSlot(uint index) {      Script* Instrument::GetScriptOfSlot(size_t index) {
5546          LoadScripts();          LoadScripts();
5547          if (index >= pScriptRefs->size()) return NULL;          if (index >= pScriptRefs->size()) return NULL;
5548          return pScriptRefs->at(index).script;          return pScriptRefs->at(index).script;
# Line 5574  namespace { Line 5603  namespace {
5603       * @param index1 - index of the first script slot to swap       * @param index1 - index of the first script slot to swap
5604       * @param index2 - index of the second script slot to swap       * @param index2 - index of the second script slot to swap
5605       */       */
5606      void Instrument::SwapScriptSlots(uint index1, uint index2) {      void Instrument::SwapScriptSlots(size_t index1, size_t index2) {
5607          LoadScripts();          LoadScripts();
5608          if (index1 >= pScriptRefs->size() || index2 >= pScriptRefs->size())          if (index1 >= pScriptRefs->size() || index2 >= pScriptRefs->size())
5609              return;              return;
# Line 5589  namespace { Line 5618  namespace {
5618       *       *
5619       * @param index - index of script slot to remove       * @param index - index of script slot to remove
5620       */       */
5621      void Instrument::RemoveScriptSlot(uint index) {      void Instrument::RemoveScriptSlot(size_t index) {
5622          LoadScripts();          LoadScripts();
5623          if (index >= pScriptRefs->size()) return;          if (index >= pScriptRefs->size()) return;
5624          pScriptRefs->erase( pScriptRefs->begin() + index );          pScriptRefs->erase( pScriptRefs->begin() + index );
# Line 5630  namespace { Line 5659  namespace {
5659       * GigaStudio 4 software. It will currently only work with LinuxSampler and       * GigaStudio 4 software. It will currently only work with LinuxSampler and
5660       * gigedit.       * gigedit.
5661       */       */
5662      uint Instrument::ScriptSlotCount() const {      size_t Instrument::ScriptSlotCount() const {
5663          return uint(pScriptRefs ? pScriptRefs->size() : scriptPoolFileOffsets.size());          return pScriptRefs ? pScriptRefs->size() : scriptPoolFileOffsets.size();
5664      }      }
5665    
5666      /** @brief Whether script execution shall be skipped.      /** @brief Whether script execution shall be skipped.
# Line 5650  namespace { Line 5679  namespace {
5679       * @param index - index of the script slot on this instrument       * @param index - index of the script slot on this instrument
5680       * @see Script::Bypass       * @see Script::Bypass
5681       */       */
5682      bool Instrument::IsScriptSlotBypassed(uint index) {      bool Instrument::IsScriptSlotBypassed(size_t index) {
5683          if (index >= ScriptSlotCount()) return false;          if (index >= ScriptSlotCount()) return false;
5684          return pScriptRefs ? pScriptRefs->at(index).bypass          return pScriptRefs ? pScriptRefs->at(index).bypass
5685                             : scriptPoolFileOffsets.at(index).bypass;                             : scriptPoolFileOffsets.at(index).bypass;
# Line 5670  namespace { Line 5699  namespace {
5699       * @param bBypass - if true, the script slot will be skipped by the sampler       * @param bBypass - if true, the script slot will be skipped by the sampler
5700       * @see Script::Bypass       * @see Script::Bypass
5701       */       */
5702      void Instrument::SetScriptSlotBypassed(uint index, bool bBypass) {      void Instrument::SetScriptSlotBypassed(size_t index, bool bBypass) {
5703          if (index >= ScriptSlotCount()) return;          if (index >= ScriptSlotCount()) return;
5704          if (pScriptRefs)          if (pScriptRefs)
5705              pScriptRefs->at(index).bypass = bBypass;              pScriptRefs->at(index).bypass = bBypass;
# Line 5690  namespace { Line 5719  namespace {
5719       * the @c Script identified by passed @p uuid.       * the @c Script identified by passed @p uuid.
5720       */       */
5721      bool Instrument::ReferencesScriptWithUuid(const _UUID& uuid) {      bool Instrument::ReferencesScriptWithUuid(const _UUID& uuid) {
5722          const uint nSlots = ScriptSlotCount();          const size_t nSlots = ScriptSlotCount();
5723          for (uint iSlot = 0; iSlot < nSlots; ++iSlot)          for (size_t iSlot = 0; iSlot < nSlots; ++iSlot)
5724              if (_UUIDFromCArray(&GetScriptOfSlot(iSlot)->Uuid[0]) == uuid)              if (_UUIDFromCArray(&GetScriptOfSlot(iSlot)->Uuid[0]) == uuid)
5725                  return true;                  return true;
5726          return false;          return false;
# Line 5716  namespace { Line 5745  namespace {
5745       * @param slot - script slot index of the variable to be retrieved       * @param slot - script slot index of the variable to be retrieved
5746       * @param variable - name of the 'patch' variable in that script       * @param variable - name of the 'patch' variable in that script
5747       */       */
5748      bool Instrument::IsScriptPatchVariableSet(int slot, String variable) {      bool Instrument::IsScriptPatchVariableSet(size_t slot, String variable) {
5749          if (variable.empty()) return false;          if (variable.empty()) return false;
5750          Script* script = GetScriptOfSlot(slot);          Script* script = GetScriptOfSlot(slot);
5751          if (!script) return false;          if (!script) return false;
# Line 5750  namespace { Line 5779  namespace {
5779       *       *
5780       * @param slot - script slot index of the variable to be retrieved       * @param slot - script slot index of the variable to be retrieved
5781       */       */
5782      std::map<String,String> Instrument::GetScriptPatchVariables(int slot) {      std::map<String,String> Instrument::GetScriptPatchVariables(size_t slot) {
5783          Script* script = GetScriptOfSlot(slot);          Script* script = GetScriptOfSlot(slot);
5784          if (!script) return std::map<String,String>();          if (!script) return std::map<String,String>();
5785          const _UUID uuid = _UUIDFromCArray(&script->Uuid[0]);          const _UUID uuid = _UUIDFromCArray(&script->Uuid[0]);
# Line 5782  namespace { Line 5811  namespace {
5811       * @param slot - script slot index of the variable to be retrieved       * @param slot - script slot index of the variable to be retrieved
5812       * @param variable - name of the 'patch' variable in that script       * @param variable - name of the 'patch' variable in that script
5813       */       */
5814      String Instrument::GetScriptPatchVariable(int slot, String variable) {      String Instrument::GetScriptPatchVariable(size_t slot, String variable) {
5815          std::map<String,String> vars = GetScriptPatchVariables(slot);          std::map<String,String> vars = GetScriptPatchVariables(slot);
5816          return (vars.count(variable)) ? vars.find(variable)->second : "";          return (vars.count(variable)) ? vars.find(variable)->second : "";
5817      }      }
# Line 5809  namespace { Line 5838  namespace {
5838       * @throws gig::Exception if given script @p slot index is invalid or given       * @throws gig::Exception if given script @p slot index is invalid or given
5839       *         @p variable name is empty       *         @p variable name is empty
5840       */       */
5841      void Instrument::SetScriptPatchVariable(int slot, String variable, String value) {      void Instrument::SetScriptPatchVariable(size_t slot, String variable, String value) {
5842          if (variable.empty())          if (variable.empty())
5843              throw Exception("Variable name must not be empty");              throw Exception("Variable name must not be empty");
5844          Script* script = GetScriptOfSlot(slot);          Script* script = GetScriptOfSlot(slot);
# Line 5850  namespace { Line 5879  namespace {
5879       * @param slot - script slot index of the variable to be unset       * @param slot - script slot index of the variable to be unset
5880       * @param variable - name of the 'patch' variable in that script       * @param variable - name of the 'patch' variable in that script
5881       */       */
5882      void Instrument::UnsetScriptPatchVariable(int slot, String variable) {      void Instrument::UnsetScriptPatchVariable(ssize_t slot, String variable) {
5883          Script* script = GetScriptOfSlot(slot);          Script* script = GetScriptOfSlot(slot);
5884    
5885          // option 1: unset a particular variable of one particular script slot          // option 1: unset a particular variable of one particular script slot
# Line 5986  namespace { Line 6015  namespace {
6015          pMidiRules[0] = NULL;          pMidiRules[0] = NULL;
6016                    
6017          // delete all old regions          // delete all old regions
6018          while (Regions) DeleteRegion(GetFirstRegion());          while (Regions) DeleteRegion(GetRegionAt(0));
6019          // create new regions and copy them from original          // create new regions and copy them from original
6020          {          {
6021              RegionList::const_iterator it = orig->pRegions->begin();              RegionList::const_iterator it = orig->pRegions->begin();
# Line 6042  namespace { Line 6071  namespace {
6071      Group::Group(File* file, RIFF::Chunk* ck3gnm) {      Group::Group(File* file, RIFF::Chunk* ck3gnm) {
6072          pFile      = file;          pFile      = file;
6073          pNameChunk = ck3gnm;          pNameChunk = ck3gnm;
6074            SamplesIterator = 0;
6075          ::LoadString(pNameChunk, Name);          ::LoadString(pNameChunk, Name);
6076      }      }
6077    
# Line 6100  namespace { Line 6130  namespace {
6130      }      }
6131    
6132      /**      /**
6133         * Returns Sample object at @a index of this sample group.
6134         *
6135         * @param index - position of sample in this sample group's sample list
6136         *                (0..n)
6137         * @returns sample object or NULL if index is out of bounds
6138         */
6139        Sample* Group::GetSample(size_t index) {
6140            if (pFile->pSamples && index >= pFile->pSamples->size()) return NULL;
6141            size_t indexInFile = 0;
6142            size_t indexInGroup = 0;
6143            for (Sample* pSample = pFile->GetSample(indexInFile); pSample;
6144                         pSample = pFile->GetSample(++indexInFile))
6145            {
6146                if (pSample->GetGroup() != this) continue;
6147                if (indexInGroup++ == index) return pSample;
6148            }
6149            return NULL;
6150        }
6151    
6152        /**
6153       * Returns the first Sample of this Group. You have to call this method       * Returns the first Sample of this Group. You have to call this method
6154       * once before you use GetNextSample().       * once before you use GetNextSample().
6155       *       *
# Line 6109  namespace { Line 6159  namespace {
6159       * @returns  pointer address to first Sample or NULL if there is none       * @returns  pointer address to first Sample or NULL if there is none
6160       *           applied to this Group       *           applied to this Group
6161       * @see      GetNextSample()       * @see      GetNextSample()
6162         * @deprecated  This method is not reentrant-safe, use GetSample()
6163         *              instead.
6164       */       */
6165      Sample* Group::GetFirstSample() {      Sample* Group::GetFirstSample() {
6166          // FIXME: lazy und unsafe implementation, should be an autonomous iterator          size_t& i = this->SamplesIterator;
6167          for (Sample* pSample = pFile->GetFirstSample(); pSample; pSample = pFile->GetNextSample()) {          i = 0;
6168              if (pSample->GetGroup() == this) return pSample;          for (Sample* pSample = pFile->GetSample(i); pSample;
6169                         pSample = pFile->GetSample(++i))
6170            {
6171                if (pSample->GetGroup() == this)
6172                    return pSample;
6173          }          }
6174          return NULL;          return NULL;
6175      }      }
# Line 6127  namespace { Line 6183  namespace {
6183       * @returns  pointer address to the next Sample of this Group or NULL if       * @returns  pointer address to the next Sample of this Group or NULL if
6184       *           end reached       *           end reached
6185       * @see      GetFirstSample()       * @see      GetFirstSample()
6186         * @deprecated  This method is not reentrant-safe, use GetSample()
6187         *              instead.
6188       */       */
6189      Sample* Group::GetNextSample() {      Sample* Group::GetNextSample() {
6190          // FIXME: lazy und unsafe implementation, should be an autonomous iterator          size_t& i = this->SamplesIterator;
6191          for (Sample* pSample = pFile->GetNextSample(); pSample; pSample = pFile->GetNextSample()) {          for (Sample* pSample = pFile->GetSample(++i); pSample;
6192              if (pSample->GetGroup() == this) return pSample;                       pSample = pFile->GetSample(++i))
6193            {
6194                if (pSample->GetGroup() == this)
6195                    return pSample;
6196          }          }
6197          return NULL;          return NULL;
6198      }      }
# Line 6151  namespace { Line 6212  namespace {
6212       */       */
6213      void Group::MoveAll() {      void Group::MoveAll() {
6214          // get "that" other group first          // get "that" other group first
6215            size_t i = 0;
6216          Group* pOtherGroup = NULL;          Group* pOtherGroup = NULL;
6217          for (pOtherGroup = pFile->GetFirstGroup(); pOtherGroup; pOtherGroup = pFile->GetNextGroup()) {          for (pOtherGroup = pFile->GetGroup(i); pOtherGroup;
6218                 pOtherGroup = pFile->GetGroup(++i))
6219            {
6220              if (pOtherGroup != this) break;              if (pOtherGroup != this) break;
6221          }          }
6222          if (!pOtherGroup) throw Exception(          if (!pOtherGroup) throw Exception(
# Line 6160  namespace { Line 6224  namespace {
6224              "other Group. This is a bug, report it!"              "other Group. This is a bug, report it!"
6225          );          );
6226          // now move all samples of this group to the other group          // now move all samples of this group to the other group
6227          for (Sample* pSample = GetFirstSample(); pSample; pSample = GetNextSample()) {          Sample* pSample;
6228            while ((pSample = GetSample(0))) {
6229              pOtherGroup->AddSample(pSample);              pOtherGroup->AddSample(pSample);
6230          }          }
6231      }      }
# Line 6232  namespace { Line 6297  namespace {
6297    
6298      File::~File() {      File::~File() {
6299          if (pGroups) {          if (pGroups) {
6300              std::list<Group*>::iterator iter = pGroups->begin();              std::vector<Group*>::iterator iter = pGroups->begin();
6301              std::list<Group*>::iterator end  = pGroups->end();              std::vector<Group*>::iterator end  = pGroups->end();
6302              while (iter != end) {              while (iter != end) {
6303                  delete *iter;                  delete *iter;
6304                  ++iter;                  ++iter;
# Line 6241  namespace { Line 6306  namespace {
6306              delete pGroups;              delete pGroups;
6307          }          }
6308          if (pScriptGroups) {          if (pScriptGroups) {
6309              std::list<ScriptGroup*>::iterator iter = pScriptGroups->begin();              std::vector<ScriptGroup*>::iterator iter = pScriptGroups->begin();
6310              std::list<ScriptGroup*>::iterator end  = pScriptGroups->end();              std::vector<ScriptGroup*>::iterator end  = pScriptGroups->end();
6311              while (iter != end) {              while (iter != end) {
6312                  delete *iter;                  delete *iter;
6313                  ++iter;                  ++iter;
# Line 6251  namespace { Line 6316  namespace {
6316          }          }
6317      }      }
6318    
6319        /**
6320         * Returns a pointer to the first <i>Sample</i> object of the file,
6321         * <i>NULL</i> otherwise.
6322         *
6323         * @param pProgress - optional: callback function for progress notification
6324         * @deprecated  This method is not reentrant-safe, use GetSample()
6325         *              instead.
6326         */
6327      Sample* File::GetFirstSample(progress_t* pProgress) {      Sample* File::GetFirstSample(progress_t* pProgress) {
6328          if (!pSamples) LoadSamples(pProgress);          if (!pSamples) LoadSamples(pProgress);
6329          if (!pSamples) return NULL;          if (!pSamples) return NULL;
# Line 6258  namespace { Line 6331  namespace {
6331          return static_cast<gig::Sample*>( (SamplesIterator != pSamples->end()) ? *SamplesIterator : NULL );          return static_cast<gig::Sample*>( (SamplesIterator != pSamples->end()) ? *SamplesIterator : NULL );
6332      }      }
6333    
6334        /**
6335         * Returns a pointer to the next <i>Sample</i> object of the file,
6336         * <i>NULL</i> otherwise.
6337         *
6338         * @deprecated  This method is not reentrant-safe, use GetSample()
6339         *              instead.
6340         */
6341      Sample* File::GetNextSample() {      Sample* File::GetNextSample() {
6342          if (!pSamples) return NULL;          if (!pSamples) return NULL;
6343          SamplesIterator++;          SamplesIterator++;
# Line 6267  namespace { Line 6347  namespace {
6347      /**      /**
6348       * Returns Sample object of @a index.       * Returns Sample object of @a index.
6349       *       *
6350         * @param index - position of sample in sample list (0..n)
6351         * @param pProgress - optional: callback function for progress notification
6352       * @returns sample object or NULL if index is out of bounds       * @returns sample object or NULL if index is out of bounds
6353       */       */
6354      Sample* File::GetSample(uint index) {      Sample* File::GetSample(size_t index, progress_t* pProgress) {
6355          if (!pSamples) LoadSamples();          if (!pSamples) LoadSamples(pProgress);
6356          if (!pSamples) return NULL;          if (!pSamples) return NULL;
6357          DLS::File::SampleList::iterator it = pSamples->begin();          if (index >= pSamples->size()) return NULL;
6358          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 );  
6359      }      }
6360    
6361      /**      /**
# Line 6314  namespace { Line 6391  namespace {
6391         wave->AddSubChunk(CHUNK_ID_FMT, 16);         wave->AddSubChunk(CHUNK_ID_FMT, 16);
6392         wave->AddSubList(LIST_TYPE_INFO);         wave->AddSubList(LIST_TYPE_INFO);
6393    
6394           const size_t idxIt = SamplesIterator - pSamples->begin();
6395         pSamples->push_back(pSample);         pSamples->push_back(pSample);
6396           SamplesIterator = pSamples->begin() + std::min(idxIt, pSamples->size()); // avoid iterator invalidation
6397         return pSample;         return pSample;
6398      }      }
6399    
# Line 6331  namespace { Line 6410  namespace {
6410          if (!pSamples || !pSamples->size()) throw gig::Exception("Could not delete sample as there are no samples");          if (!pSamples || !pSamples->size()) throw gig::Exception("Could not delete sample as there are no samples");
6411          SampleList::iterator iter = find(pSamples->begin(), pSamples->end(), (DLS::Sample*) pSample);          SampleList::iterator iter = find(pSamples->begin(), pSamples->end(), (DLS::Sample*) pSample);
6412          if (iter == pSamples->end()) throw gig::Exception("Could not delete sample, could not find given sample");          if (iter == pSamples->end()) throw gig::Exception("Could not delete sample, could not find given sample");
6413          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation          const size_t idxIt = SamplesIterator - pSamples->begin();
6414          pSamples->erase(iter);          pSamples->erase(iter);
6415            SamplesIterator = pSamples->begin() + std::min(idxIt, pSamples->size()); // avoid iterator invalidation
6416          pSample->DeleteChunks();          pSample->DeleteChunks();
6417          delete pSample;          delete pSample;
6418    
         SampleList::iterator tmp = SamplesIterator;  
6419          // remove all references to the sample          // remove all references to the sample
6420          for (Instrument* instrument = GetFirstInstrument() ; instrument ;          size_t iIns = 0;
6421               instrument = GetNextInstrument()) {          for (Instrument* instrument = GetInstrument(iIns); instrument;
6422              for (Region* region = instrument->GetFirstRegion() ; region ;                           instrument = GetInstrument(++iIns))
6423                   region = instrument->GetNextRegion()) {          {
6424                size_t iRgn = 0;
6425                for (Region* region = instrument->GetRegionAt(iRgn); region;
6426                     region = instrument->GetRegionAt(++iRgn))
6427                {
6428                  if (region->GetSample() == pSample) region->SetSample(NULL);                  if (region->GetSample() == pSample) region->SetSample(NULL);
6429    
6430                  for (int i = 0 ; i < region->DimensionRegions ; i++) {                  for (int i = 0 ; i < region->DimensionRegions ; i++) {
# Line 6351  namespace { Line 6433  namespace {
6433                  }                  }
6434              }              }
6435          }          }
         SamplesIterator = tmp; // restore iterator  
6436      }      }
6437    
6438      void File::LoadSamples() {      void File::LoadSamples() {
# Line 6438  namespace { Line 6519  namespace {
6519              ExtensionFiles.push_back(pExtFile);              ExtensionFiles.push_back(pExtFile);
6520          }          }
6521    
6522          // load samples from extension files (if required)          // load all samples (both from this/main .gig file as well as from
6523            // extension files if required)
6524          for (int i = 0; i < poolFiles.size(); i++) {          for (int i = 0; i < poolFiles.size(); i++) {
6525              RIFF::File* file = poolFiles[i];              RIFF::File* file = poolFiles[i];
6526              RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);              RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);
6527              if (wvpl) {              if (wvpl) {
6528                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -
6529                                                 wvpl->GetPos(); // should be zero, but just to be sure                                                 wvpl->GetPos(); // should be zero, but just to be sure
6530                  size_t i = 0;                  size_t iWaveCk = 0;
6531                  for (RIFF::List* wave = wvpl->GetSubListAt(i); wave;                  for (RIFF::List* wave = wvpl->GetSubListAt(iWaveCk); wave;
6532                       wave = wvpl->GetSubListAt(++i))                       wave = wvpl->GetSubListAt(++iWaveCk))
6533                  {                  {
6534                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
6535                          // notify current progress                          // notify current progress
# Line 6469  namespace { Line 6551  namespace {
6551              __notify_progress(pProgress, 1.0); // notify done              __notify_progress(pProgress, 1.0); // notify done
6552      }      }
6553    
6554        /**
6555         * Returns a pointer to the first <i>Instrument</i> object of the file,
6556         * <i>NULL</i> otherwise.
6557         *
6558         * @deprecated  This method is not reentrant-safe, use GetInstrument()
6559         *              instead.
6560         */
6561      Instrument* File::GetFirstInstrument() {      Instrument* File::GetFirstInstrument() {
6562          if (!pInstruments) LoadInstruments();          if (!pInstruments) LoadInstruments();
6563          if (!pInstruments) return NULL;          if (!pInstruments) return NULL;
# Line 6476  namespace { Line 6565  namespace {
6565          return static_cast<gig::Instrument*>( (InstrumentsIterator != pInstruments->end()) ? *InstrumentsIterator : NULL );          return static_cast<gig::Instrument*>( (InstrumentsIterator != pInstruments->end()) ? *InstrumentsIterator : NULL );
6566      }      }
6567    
6568        /**
6569         * Returns a pointer to the next <i>Instrument</i> object of the file,
6570         * <i>NULL</i> otherwise.
6571         *
6572         * @deprecated  This method is not reentrant-safe, use GetInstrument()
6573         *              instead.
6574         */
6575      Instrument* File::GetNextInstrument() {      Instrument* File::GetNextInstrument() {
6576          if (!pInstruments) return NULL;          if (!pInstruments) return NULL;
6577          InstrumentsIterator++;          InstrumentsIterator++;
# Line 6503  namespace { Line 6599  namespace {
6599       * @param pProgress - optional: callback function for progress notification       * @param pProgress - optional: callback function for progress notification
6600       * @returns  sought instrument or NULL if there's no such instrument       * @returns  sought instrument or NULL if there's no such instrument
6601       */       */
6602      Instrument* File::GetInstrument(uint index, progress_t* pProgress) {      Instrument* File::GetInstrument(size_t index, progress_t* pProgress) {
6603          if (!pInstruments) {          if (!pInstruments) {
6604              // 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)
6605    
# Line 6513  namespace { Line 6609  namespace {
6609                  __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask                  __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask
6610                  __notify_progress(&subprogress, 0.0f);                  __notify_progress(&subprogress, 0.0f);
6611                  if (GetAutoLoad())                  if (GetAutoLoad())
6612                      GetFirstSample(&subprogress); // now force all samples to be loaded                      GetSample(0, &subprogress); // now force all samples to be loaded
6613                  __notify_progress(&subprogress, 1.0f);                  __notify_progress(&subprogress, 1.0f);
6614    
6615                  // instrument loading subtask                  // instrument loading subtask
# Line 6527  namespace { Line 6623  namespace {
6623              } else {              } else {
6624                  // sample loading subtask                  // sample loading subtask
6625                  if (GetAutoLoad())                  if (GetAutoLoad())
6626                      GetFirstSample(); // now force all samples to be loaded                      GetSample(0); // now force all samples to be loaded
6627    
6628                  // instrument loading subtask                  // instrument loading subtask
6629                  LoadInstruments();                  LoadInstruments();
6630              }              }
6631          }          }
6632          if (!pInstruments) return NULL;          if (!pInstruments) return NULL;
6633          InstrumentsIterator = pInstruments->begin();          if (index >= pInstruments->size()) return NULL;
6634          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;  
6635      }      }
6636    
6637      /** @brief Add a new instrument definition.      /** @brief Add a new instrument definition.
# Line 6626  namespace { Line 6718  namespace {
6718          }          }
6719    
6720          // clone script groups and their scripts          // clone script groups and their scripts
6721          for (int iGroup = 0; pFile->GetScriptGroup(iGroup); ++iGroup) {          for (size_t iGroup = 0; pFile->GetScriptGroup(iGroup); ++iGroup) {
6722              ScriptGroup* sg = pFile->GetScriptGroup(iGroup);              ScriptGroup* sg = pFile->GetScriptGroup(iGroup);
6723              ScriptGroup* dg = AddScriptGroup();              ScriptGroup* dg = AddScriptGroup();
6724              dg->Name = "COPY" + ToString(iCallCount) + "_" + sg->Name;              dg->Name = "COPY" + ToString(iCallCount) + "_" + sg->Name;
# Line 6767  namespace { Line 6859  namespace {
6859      }      }
6860    
6861      int File::GetWaveTableIndexOf(gig::Sample* pSample) {      int File::GetWaveTableIndexOf(gig::Sample* pSample) {
6862          if (!pSamples) GetFirstSample(); // make sure sample chunks were scanned          if (!pSamples) GetSample(0); // make sure sample chunks were scanned
6863          File::SampleList::iterator iter = pSamples->begin();          File::SampleList::iterator iter = pSamples->begin();
6864          File::SampleList::iterator end  = pSamples->end();          File::SampleList::iterator end  = pSamples->end();
6865          for (int index = 0; iter != end; ++iter, ++index)          for (int index = 0; iter != end; ++iter, ++index)
# Line 6787  namespace { Line 6879  namespace {
6879          if (!_3crc) return false;          if (!_3crc) return false;
6880          if (_3crc->GetNewSize() <= 0) return false;          if (_3crc->GetNewSize() <= 0) return false;
6881          if (_3crc->GetNewSize() % 8) return false;          if (_3crc->GetNewSize() % 8) return false;
6882          if (!pSamples) GetFirstSample(); // make sure sample chunks were scanned          if (!pSamples) GetSample(0); // make sure sample chunks were scanned
6883          if (_3crc->GetNewSize() != pSamples->size() * 8) return false;          if (_3crc->GetNewSize() != pSamples->size() * 8) return false;
6884    
6885          const file_offset_t n = _3crc->GetNewSize() / 8;          const file_offset_t n = _3crc->GetNewSize() / 8;
# Line 6821  namespace { Line 6913  namespace {
6913       */       */
6914      bool File::RebuildSampleChecksumTable() {      bool File::RebuildSampleChecksumTable() {
6915          // make sure sample chunks were scanned          // make sure sample chunks were scanned
6916          if (!pSamples) GetFirstSample();          if (!pSamples) GetSample(0);
6917    
6918          bool bRequiresSave = false;          bool bRequiresSave = false;
6919    
# Line 6870  namespace { Line 6962  namespace {
6962          return bRequiresSave;          return bRequiresSave;
6963      }      }
6964    
6965        /**
6966         * Returns a pointer to the first <i>Group</i> object of the file,
6967         * <i>NULL</i> otherwise.
6968         *
6969         * @deprecated  This method is not reentrant-safe, use GetGroup() instead.
6970         */
6971      Group* File::GetFirstGroup() {      Group* File::GetFirstGroup() {
6972          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
6973          // there must always be at least one group          // there must always be at least one group
# Line 6877  namespace { Line 6975  namespace {
6975          return *GroupsIterator;          return *GroupsIterator;
6976      }      }
6977    
6978        /**
6979         * Returns a pointer to the next <i>Group</i> object of the file,
6980         * <i>NULL</i> otherwise.
6981         *
6982         * @deprecated  This method is not reentrant-safe, use GetGroup() instead.
6983         */
6984      Group* File::GetNextGroup() {      Group* File::GetNextGroup() {
6985          if (!pGroups) return NULL;          if (!pGroups) return NULL;
6986          ++GroupsIterator;          ++GroupsIterator;
# Line 6889  namespace { Line 6993  namespace {
6993       * @param index - number of the sought group (0..n)       * @param index - number of the sought group (0..n)
6994       * @returns sought group or NULL if there's no such group       * @returns sought group or NULL if there's no such group
6995       */       */
6996      Group* File::GetGroup(uint index) {      Group* File::GetGroup(size_t index) {
6997          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
6998          GroupsIterator = pGroups->begin();          if (index >= pGroups->size()) return NULL;
6999          for (uint i = 0; GroupsIterator != pGroups->end(); i++) {          return (*pGroups)[index];
             if (i == index) return *GroupsIterator;  
             ++GroupsIterator;  
         }  
         return NULL;  
7000      }      }
7001    
7002      /**      /**
# Line 6911  namespace { Line 7011  namespace {
7011       */       */
7012      Group* File::GetGroup(String name) {      Group* File::GetGroup(String name) {
7013          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
7014          GroupsIterator = pGroups->begin();          size_t i = 0;
7015          for (uint i = 0; GroupsIterator != pGroups->end(); ++GroupsIterator, ++i)          for (Group* pGroup = GetGroup(i); pGroup; pGroup = GetGroup(++i))
7016              if ((*GroupsIterator)->Name == name) return *GroupsIterator;              if (pGroup->Name == name) return pGroup;
7017          return NULL;          return NULL;
7018      }      }
7019    
# Line 6937  namespace { Line 7037  namespace {
7037       */       */
7038      void File::DeleteGroup(Group* pGroup) {      void File::DeleteGroup(Group* pGroup) {
7039          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
7040          std::list<Group*>::iterator iter = find(pGroups->begin(), pGroups->end(), pGroup);          std::vector<Group*>::iterator iter =
7041                find(pGroups->begin(), pGroups->end(), pGroup);
7042          if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");          if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");
7043          if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");          if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");
7044          // delete all members of this group          // delete all members of this group
7045          for (Sample* pSample = pGroup->GetFirstSample(); pSample; pSample = pGroup->GetNextSample()) {          Sample* pSample;
7046            while ((pSample = pGroup->GetSample(0))) {
7047              DeleteSample(pSample);              DeleteSample(pSample);
7048          }          }
7049          // now delete this group object          // now delete this group object
# Line 6962  namespace { Line 7064  namespace {
7064       */       */
7065      void File::DeleteGroupOnly(Group* pGroup) {      void File::DeleteGroupOnly(Group* pGroup) {
7066          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
7067          std::list<Group*>::iterator iter = find(pGroups->begin(), pGroups->end(), pGroup);          std::vector<Group*>::iterator iter =
7068                find(pGroups->begin(), pGroups->end(), pGroup);
7069          if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");          if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");
7070          if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");          if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");
7071          // move all members of this group to another group          // move all members of this group to another group
# Line 6973  namespace { Line 7076  namespace {
7076      }      }
7077    
7078      void File::LoadGroups() {      void File::LoadGroups() {
7079          if (!pGroups) pGroups = new std::list<Group*>;          if (!pGroups) pGroups = new std::vector<Group*>;
7080          // try to read defined groups from file          // try to read defined groups from file
7081          RIFF::List* lst3gri = pRIFF->GetSubList(LIST_TYPE_3GRI);          RIFF::List* lst3gri = pRIFF->GetSubList(LIST_TYPE_3GRI);
7082          if (lst3gri) {          if (lst3gri) {
# Line 7007  namespace { Line 7110  namespace {
7110       * @param index - number of the sought group (0..n)       * @param index - number of the sought group (0..n)
7111       * @returns sought script group or NULL if there's no such group       * @returns sought script group or NULL if there's no such group
7112       */       */
7113      ScriptGroup* File::GetScriptGroup(uint index) {      ScriptGroup* File::GetScriptGroup(size_t index) {
7114          if (!pScriptGroups) LoadScriptGroups();          if (!pScriptGroups) LoadScriptGroups();
7115          std::list<ScriptGroup*>::iterator it = pScriptGroups->begin();          if (index >= pScriptGroups->size()) return NULL;
7116          for (uint i = 0; it != pScriptGroups->end(); ++i, ++it)          return (*pScriptGroups)[index];
             if (i == index) return *it;  
         return NULL;  
7117      }      }
7118    
7119      /** @brief Get instrument script group (by name).      /** @brief Get instrument script group (by name).
# Line 7025  namespace { Line 7126  namespace {
7126       */       */
7127      ScriptGroup* File::GetScriptGroup(const String& name) {      ScriptGroup* File::GetScriptGroup(const String& name) {
7128          if (!pScriptGroups) LoadScriptGroups();          if (!pScriptGroups) LoadScriptGroups();
7129          std::list<ScriptGroup*>::iterator it = pScriptGroups->begin();          for (size_t i = 0; i < pScriptGroups->size(); ++i) {
7130          for (uint i = 0; it != pScriptGroups->end(); ++i, ++it)              ScriptGroup* pGroup = (*pScriptGroups)[i];
7131              if ((*it)->Name == name) return *it;              if (pGroup->Name == name) return pGroup;
7132            }
7133          return NULL;          return NULL;
7134      }      }
7135    
# Line 7060  namespace { Line 7162  namespace {
7162       */       */
7163      void File::DeleteScriptGroup(ScriptGroup* pScriptGroup) {      void File::DeleteScriptGroup(ScriptGroup* pScriptGroup) {
7164          if (!pScriptGroups) LoadScriptGroups();          if (!pScriptGroups) LoadScriptGroups();
7165          std::list<ScriptGroup*>::iterator iter =          std::vector<ScriptGroup*>::iterator iter =
7166              find(pScriptGroups->begin(), pScriptGroups->end(), pScriptGroup);              find(pScriptGroups->begin(), pScriptGroups->end(), pScriptGroup);
7167          if (iter == pScriptGroups->end())          if (iter == pScriptGroups->end())
7168              throw gig::Exception("Could not delete script group, could not find given script group");              throw gig::Exception("Could not delete script group, could not find given script group");
# Line 7075  namespace { Line 7177  namespace {
7177    
7178      void File::LoadScriptGroups() {      void File::LoadScriptGroups() {
7179          if (pScriptGroups) return;          if (pScriptGroups) return;
7180          pScriptGroups = new std::list<ScriptGroup*>;          pScriptGroups = new std::vector<ScriptGroup*>;
7181          RIFF::List* lstLS = pRIFF->GetSubList(LIST_TYPE_3LS);          RIFF::List* lstLS = pRIFF->GetSubList(LIST_TYPE_3LS);
7182          if (lstLS) {          if (lstLS) {
7183              size_t i = 0;              size_t i = 0;
# Line 7120  namespace { Line 7222  namespace {
7222          // of the respective instrument script chunk as reference.          // of the respective instrument script chunk as reference.
7223          if (pScriptGroups) {          if (pScriptGroups) {
7224              // Update instrument script (group) chunks.              // Update instrument script (group) chunks.
7225              for (std::list<ScriptGroup*>::iterator it = pScriptGroups->begin();              for (std::vector<ScriptGroup*>::iterator it = pScriptGroups->begin();
7226                   it != pScriptGroups->end(); ++it)                   it != pScriptGroups->end(); ++it)
7227              {              {
7228                  (*it)->UpdateChunks(pProgress);                  (*it)->UpdateChunks(pProgress);
# Line 7172  namespace { Line 7274  namespace {
7274                  }                  }
7275              }              }
7276    
7277              std::list<Group*>::iterator iter = pGroups->begin();              std::vector<Group*>::iterator iter = pGroups->begin();
7278              std::list<Group*>::iterator end  = pGroups->end();              std::vector<Group*>::iterator end  = pGroups->end();
7279              for (; iter != end; ++iter) {              for (; iter != end; ++iter) {
7280                  (*iter)->UpdateChunks(pProgress);                  (*iter)->UpdateChunks(pProgress);
7281              }              }
# Line 7211  namespace { Line 7313  namespace {
7313              uint8_t* pData = (uint8_t*) einf->LoadChunkData();              uint8_t* pData = (uint8_t*) einf->LoadChunkData();
7314    
7315              std::map<gig::Sample*,int> sampleMap;              std::map<gig::Sample*,int> sampleMap;
7316              int sampleIdx = 0;              size_t sampleIdx = 0;
7317              for (Sample* pSample = GetFirstSample(); pSample; pSample = GetNextSample()) {              for (Sample* pSample = GetSample(0); pSample;
7318                  sampleMap[pSample] = sampleIdx++;                           pSample = GetSample(++sampleIdx))
7319                {
7320                    sampleMap[pSample] = sampleIdx;
7321              }              }
7322    
7323              int totnbusedsamples = 0;              int totnbusedsamples = 0;
# Line 7225  namespace { Line 7329  namespace {
7329    
7330              memset(&pData[48], 0, sublen - 48);              memset(&pData[48], 0, sublen - 48);
7331    
7332              for (Instrument* instrument = GetFirstInstrument() ; instrument ;              size_t iIns = 0;
7333                   instrument = GetNextInstrument()) {              for (Instrument* instrument = GetInstrument(iIns); instrument;
7334                                 instrument = GetInstrument(++iIns))
7335                {
7336                  int nbusedsamples = 0;                  int nbusedsamples = 0;
7337                  int nbusedchannels = 0;                  int nbusedchannels = 0;
7338                  int nbdimregions = 0;                  int nbdimregions = 0;
# Line 7234  namespace { Line 7340  namespace {
7340    
7341                  memset(&pData[(instrumentIdx + 1) * sublen + 48], 0, sublen - 48);                  memset(&pData[(instrumentIdx + 1) * sublen + 48], 0, sublen - 48);
7342    
7343                  for (Region* region = instrument->GetFirstRegion() ; region ;                  size_t iRgn = 0;
7344                       region = instrument->GetNextRegion()) {                  for (Region* region = instrument->GetRegionAt(iRgn); region;
7345                         region = instrument->GetRegionAt(++iRgn))
7346                    {
7347                      for (int i = 0 ; i < region->DimensionRegions ; i++) {                      for (int i = 0 ; i < region->DimensionRegions ; i++) {
7348                          gig::DimensionRegion *d = region->pDimensionRegions[i];                          gig::DimensionRegion *d = region->pDimensionRegions[i];
7349                          if (d->pSample) {                          if (d->pSample) {
# Line 7329  namespace { Line 7437  namespace {
7437      void File::UpdateFileOffsets() {      void File::UpdateFileOffsets() {
7438          DLS::File::UpdateFileOffsets();          DLS::File::UpdateFileOffsets();
7439    
7440          for (Instrument* instrument = GetFirstInstrument(); instrument;          size_t i = 0;
7441               instrument = GetNextInstrument())          for (Instrument* instrument = GetInstrument(i); instrument;
7442                             instrument = GetInstrument(++i))
7443          {          {
7444              instrument->UpdateScriptFileOffsets();              instrument->UpdateScriptFileOffsets();
7445          }          }
Legend:
Removed from v.3925  
changed lines
  Added in v.3977
  ViewVC Help
Powered by ViewVC