/[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 3928 by schoenebeck, Tue Jun 15 11:38:38 2021 UTC revision 3937 by schoenebeck, Thu Jun 17 10:59:54 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 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 6061  namespace { Line 6063  namespace {
6063      Group::Group(File* file, RIFF::Chunk* ck3gnm) {      Group::Group(File* file, RIFF::Chunk* ck3gnm) {
6064          pFile      = file;          pFile      = file;
6065          pNameChunk = ck3gnm;          pNameChunk = ck3gnm;
6066            SamplesIterator = 0;
6067          ::LoadString(pNameChunk, Name);          ::LoadString(pNameChunk, Name);
6068      }      }
6069    
# Line 6119  namespace { Line 6122  namespace {
6122      }      }
6123    
6124      /**      /**
6125         * Returns Sample object at @a index of this sample group.
6126         *
6127         * @param index - position of sample in this sample group's sample list
6128         *                (0..n)
6129         * @returns sample object or NULL if index is out of bounds
6130         */
6131        Sample* Group::GetSample(size_t index) {
6132            if (pFile->pSamples && index >= pFile->pSamples->size()) return NULL;
6133            size_t indexInFile = 0;
6134            size_t indexInGroup = 0;
6135            for (Sample* pSample = pFile->GetSample(indexInFile); pSample;
6136                         pSample = pFile->GetSample(++indexInFile))
6137            {
6138                if (pSample->GetGroup() != this) continue;
6139                if (indexInGroup++ == index) return pSample;
6140            }
6141            return NULL;
6142        }
6143    
6144        /**
6145       * 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
6146       * once before you use GetNextSample().       * once before you use GetNextSample().
6147       *       *
# Line 6128  namespace { Line 6151  namespace {
6151       * @returns  pointer address to first Sample or NULL if there is none       * @returns  pointer address to first Sample or NULL if there is none
6152       *           applied to this Group       *           applied to this Group
6153       * @see      GetNextSample()       * @see      GetNextSample()
6154         * @deprecated  This method is not reentrant-safe, use GetSample()
6155         *              instead.
6156       */       */
6157      Sample* Group::GetFirstSample() {      Sample* Group::GetFirstSample() {
6158          // FIXME: lazy und unsafe implementation, should be an autonomous iterator          size_t& i = this->SamplesIterator;
6159          for (Sample* pSample = pFile->GetFirstSample(); pSample; pSample = pFile->GetNextSample()) {          i = 0;
6160              if (pSample->GetGroup() == this) return pSample;          for (Sample* pSample = pFile->GetSample(i); pSample;
6161                         pSample = pFile->GetSample(++i))
6162            {
6163                if (pSample->GetGroup() == this)
6164                    return pSample;
6165          }          }
6166          return NULL;          return NULL;
6167      }      }
# Line 6146  namespace { Line 6175  namespace {
6175       * @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
6176       *           end reached       *           end reached
6177       * @see      GetFirstSample()       * @see      GetFirstSample()
6178         * @deprecated  This method is not reentrant-safe, use GetSample()
6179         *              instead.
6180       */       */
6181      Sample* Group::GetNextSample() {      Sample* Group::GetNextSample() {
6182          // FIXME: lazy und unsafe implementation, should be an autonomous iterator          size_t& i = this->SamplesIterator;
6183          for (Sample* pSample = pFile->GetNextSample(); pSample; pSample = pFile->GetNextSample()) {          for (Sample* pSample = pFile->GetSample(++i); pSample;
6184              if (pSample->GetGroup() == this) return pSample;                       pSample = pFile->GetSample(++i))
6185            {
6186                if (pSample->GetGroup() == this)
6187                    return pSample;
6188          }          }
6189          return NULL;          return NULL;
6190      }      }
# Line 6179  namespace { Line 6213  namespace {
6213              "other Group. This is a bug, report it!"              "other Group. This is a bug, report it!"
6214          );          );
6215          // now move all samples of this group to the other group          // now move all samples of this group to the other group
6216          for (Sample* pSample = GetFirstSample(); pSample; pSample = GetNextSample()) {          Sample* pSample;
6217            while ((pSample = GetSample(0))) {
6218              pOtherGroup->AddSample(pSample);              pOtherGroup->AddSample(pSample);
6219          }          }
6220      }      }
# Line 6251  namespace { Line 6286  namespace {
6286    
6287      File::~File() {      File::~File() {
6288          if (pGroups) {          if (pGroups) {
6289              std::list<Group*>::iterator iter = pGroups->begin();              std::vector<Group*>::iterator iter = pGroups->begin();
6290              std::list<Group*>::iterator end  = pGroups->end();              std::vector<Group*>::iterator end  = pGroups->end();
6291              while (iter != end) {              while (iter != end) {
6292                  delete *iter;                  delete *iter;
6293                  ++iter;                  ++iter;
# Line 6545  namespace { Line 6580  namespace {
6580                  __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
6581                  __notify_progress(&subprogress, 0.0f);                  __notify_progress(&subprogress, 0.0f);
6582                  if (GetAutoLoad())                  if (GetAutoLoad())
6583                      GetFirstSample(&subprogress); // now force all samples to be loaded                      GetSample(0, &subprogress); // now force all samples to be loaded
6584                  __notify_progress(&subprogress, 1.0f);                  __notify_progress(&subprogress, 1.0f);
6585    
6586                  // instrument loading subtask                  // instrument loading subtask
# Line 6559  namespace { Line 6594  namespace {
6594              } else {              } else {
6595                  // sample loading subtask                  // sample loading subtask
6596                  if (GetAutoLoad())                  if (GetAutoLoad())
6597                      GetFirstSample(); // now force all samples to be loaded                      GetSample(0); // now force all samples to be loaded
6598    
6599                  // instrument loading subtask                  // instrument loading subtask
6600                  LoadInstruments();                  LoadInstruments();
# Line 6799  namespace { Line 6834  namespace {
6834      }      }
6835    
6836      int File::GetWaveTableIndexOf(gig::Sample* pSample) {      int File::GetWaveTableIndexOf(gig::Sample* pSample) {
6837          if (!pSamples) GetFirstSample(); // make sure sample chunks were scanned          if (!pSamples) GetSample(0); // make sure sample chunks were scanned
6838          File::SampleList::iterator iter = pSamples->begin();          File::SampleList::iterator iter = pSamples->begin();
6839          File::SampleList::iterator end  = pSamples->end();          File::SampleList::iterator end  = pSamples->end();
6840          for (int index = 0; iter != end; ++iter, ++index)          for (int index = 0; iter != end; ++iter, ++index)
# Line 6819  namespace { Line 6854  namespace {
6854          if (!_3crc) return false;          if (!_3crc) return false;
6855          if (_3crc->GetNewSize() <= 0) return false;          if (_3crc->GetNewSize() <= 0) return false;
6856          if (_3crc->GetNewSize() % 8) return false;          if (_3crc->GetNewSize() % 8) return false;
6857          if (!pSamples) GetFirstSample(); // make sure sample chunks were scanned          if (!pSamples) GetSample(0); // make sure sample chunks were scanned
6858          if (_3crc->GetNewSize() != pSamples->size() * 8) return false;          if (_3crc->GetNewSize() != pSamples->size() * 8) return false;
6859    
6860          const file_offset_t n = _3crc->GetNewSize() / 8;          const file_offset_t n = _3crc->GetNewSize() / 8;
# Line 6853  namespace { Line 6888  namespace {
6888       */       */
6889      bool File::RebuildSampleChecksumTable() {      bool File::RebuildSampleChecksumTable() {
6890          // make sure sample chunks were scanned          // make sure sample chunks were scanned
6891          if (!pSamples) GetFirstSample();          if (!pSamples) GetSample(0);
6892    
6893          bool bRequiresSave = false;          bool bRequiresSave = false;
6894    
# Line 6902  namespace { Line 6937  namespace {
6937          return bRequiresSave;          return bRequiresSave;
6938      }      }
6939    
6940        /**
6941         * Returns a pointer to the first <i>Group</i> object of the file,
6942         * <i>NULL</i> otherwise.
6943         *
6944         * @deprecated  This method is not reentrant-safe, use GetGroup() instead.
6945         */
6946      Group* File::GetFirstGroup() {      Group* File::GetFirstGroup() {
6947          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
6948          // there must always be at least one group          // there must always be at least one group
# Line 6909  namespace { Line 6950  namespace {
6950          return *GroupsIterator;          return *GroupsIterator;
6951      }      }
6952    
6953        /**
6954         * Returns a pointer to the next <i>Group</i> object of the file,
6955         * <i>NULL</i> otherwise.
6956         *
6957         * @deprecated  This method is not reentrant-safe, use GetGroup() instead.
6958         */
6959      Group* File::GetNextGroup() {      Group* File::GetNextGroup() {
6960          if (!pGroups) return NULL;          if (!pGroups) return NULL;
6961          ++GroupsIterator;          ++GroupsIterator;
# Line 6921  namespace { Line 6968  namespace {
6968       * @param index - number of the sought group (0..n)       * @param index - number of the sought group (0..n)
6969       * @returns sought group or NULL if there's no such group       * @returns sought group or NULL if there's no such group
6970       */       */
6971      Group* File::GetGroup(uint index) {      Group* File::GetGroup(size_t index) {
6972          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
6973          GroupsIterator = pGroups->begin();          if (index >= pGroups->size()) return NULL;
6974          for (uint i = 0; GroupsIterator != pGroups->end(); i++) {          return (*pGroups)[index];
             if (i == index) return *GroupsIterator;  
             ++GroupsIterator;  
         }  
         return NULL;  
6975      }      }
6976    
6977      /**      /**
# Line 6969  namespace { Line 7012  namespace {
7012       */       */
7013      void File::DeleteGroup(Group* pGroup) {      void File::DeleteGroup(Group* pGroup) {
7014          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
7015          std::list<Group*>::iterator iter = find(pGroups->begin(), pGroups->end(), pGroup);          std::vector<Group*>::iterator iter =
7016                find(pGroups->begin(), pGroups->end(), pGroup);
7017          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");
7018          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!");
7019          // delete all members of this group          // delete all members of this group
7020          for (Sample* pSample = pGroup->GetFirstSample(); pSample; pSample = pGroup->GetNextSample()) {          Sample* pSample;
7021            while ((pSample = pGroup->GetSample(0))) {
7022              DeleteSample(pSample);              DeleteSample(pSample);
7023          }          }
7024          // now delete this group object          // now delete this group object
# Line 6994  namespace { Line 7039  namespace {
7039       */       */
7040      void File::DeleteGroupOnly(Group* pGroup) {      void File::DeleteGroupOnly(Group* pGroup) {
7041          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
7042          std::list<Group*>::iterator iter = find(pGroups->begin(), pGroups->end(), pGroup);          std::vector<Group*>::iterator iter =
7043                find(pGroups->begin(), pGroups->end(), pGroup);
7044          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");
7045          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!");
7046          // move all members of this group to another group          // move all members of this group to another group
# Line 7005  namespace { Line 7051  namespace {
7051      }      }
7052    
7053      void File::LoadGroups() {      void File::LoadGroups() {
7054          if (!pGroups) pGroups = new std::list<Group*>;          if (!pGroups) pGroups = new std::vector<Group*>;
7055          // try to read defined groups from file          // try to read defined groups from file
7056          RIFF::List* lst3gri = pRIFF->GetSubList(LIST_TYPE_3GRI);          RIFF::List* lst3gri = pRIFF->GetSubList(LIST_TYPE_3GRI);
7057          if (lst3gri) {          if (lst3gri) {
# Line 7204  namespace { Line 7250  namespace {
7250                  }                  }
7251              }              }
7252    
7253              std::list<Group*>::iterator iter = pGroups->begin();              std::vector<Group*>::iterator iter = pGroups->begin();
7254              std::list<Group*>::iterator end  = pGroups->end();              std::vector<Group*>::iterator end  = pGroups->end();
7255              for (; iter != end; ++iter) {              for (; iter != end; ++iter) {
7256                  (*iter)->UpdateChunks(pProgress);                  (*iter)->UpdateChunks(pProgress);
7257              }              }
# Line 7243  namespace { Line 7289  namespace {
7289              uint8_t* pData = (uint8_t*) einf->LoadChunkData();              uint8_t* pData = (uint8_t*) einf->LoadChunkData();
7290    
7291              std::map<gig::Sample*,int> sampleMap;              std::map<gig::Sample*,int> sampleMap;
7292              int sampleIdx = 0;              size_t sampleIdx = 0;
7293              for (Sample* pSample = GetFirstSample(); pSample; pSample = GetNextSample()) {              for (Sample* pSample = GetSample(0); pSample;
7294                  sampleMap[pSample] = sampleIdx++;                           pSample = GetSample(++sampleIdx))
7295                {
7296                    sampleMap[pSample] = sampleIdx;
7297              }              }
7298    
7299              int totnbusedsamples = 0;              int totnbusedsamples = 0;
Legend:
Removed from v.3928  
changed lines
  Added in v.3937
  ViewVC Help
Powered by ViewVC