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

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

Parent Directory | Revision Log | View Patch Patch

-revision 3350 by schoenebeck,
Tue Oct  3 17:35:02 2017 UTC
+revision 3481 by schoenebeck,
Fri Feb 22 12:12:50 2019 UTC
 Line 2
   *                                                                         *
   *   libgig - C++ cross-platform Gigasampler format file access library    *
   *                                                                         *
-  *   Copyright (C) 2003-2017 by Christian Schoenebeck                      *
+  *   Copyright (C) 2003-2019 by Christian Schoenebeck                      *
   *                              <cuse@users.sourceforge.net>               *
   *                                                                         *
   *   This library is free software; you can redistribute it and/or modify  *
 Line 412 
 namespace {
          pCk3gix = waveList->GetSubChunk(CHUNK_ID_3GIX);
          if (pCk3gix) {
+             pCk3gix->SetPos(0);
              uint16_t iSampleGroup = pCk3gix->ReadInt16();
              pGroup = pFile->GetGroup(iSampleGroup);
          } else { // '3gix' chunk missing
-Line 421 
 namespace {
+Line 423 
 namespace {
          pCkSmpl = waveList->GetSubChunk(CHUNK_ID_SMPL);
          if (pCkSmpl) {
+             pCkSmpl->SetPos(0);
              Manufacturer  = pCkSmpl->ReadInt32();
              Product       = pCkSmpl->ReadInt32();
              SamplePeriod  = pCkSmpl->ReadInt32();
-Line 467 
 namespace {
+Line 471 
 namespace {
          Dithered          = false;
          TruncatedBits     = 0;
          if (Compressed) {
+             ewav->SetPos(0);
              uint32_t version = ewav->ReadInt32();
-             if (version == 3 && BitDepth == 24) {
+             if (version > 2 && BitDepth == 24) {
                  Dithered = ewav->ReadInt32();
                  ewav->SetPos(Channels == 2 ? 84 : 64);
                  TruncatedBits = ewav->ReadInt32();
-Line 1500 
 namespace {
+Line 1506 
 namespace {
          RIFF::Chunk* _3ewa = _3ewl->GetSubChunk(CHUNK_ID_3EWA);
          if (_3ewa) { // if '3ewa' chunk exists
+             _3ewa->SetPos(0);
              _3ewa->ReadInt32(); // unknown, always == chunk size ?
              LFO3Frequency = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
              EG3Attack     = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-Line 1732 
 namespace {
+Line 1740 
 namespace {
              VCFType                         = vcf_type_lowpass;
              memset(DimensionUpperLimits, 127, 8);
          }
-         // format extension for EG behavior options, these will *NOT* work with
+         // chunk for own format extensions, these will *NOT* work with Gigasampler/GigaStudio !
-         // Gigasampler/GigaStudio !
          RIFF::Chunk* lsde = _3ewl->GetSubChunk(CHUNK_ID_LSDE);
-         if (lsde) {
+         if (lsde) { // format extension for EG behavior options
+             lsde->SetPos(0);
              eg_opt_t* pEGOpts[2] = { &EG1Options, &EG2Options };
-             for (int i = 0; i < 2; ++i) {
+             for (int i = 0; i < 2; ++i) { // NOTE: we reserved a 3rd byte for a potential future EG3 option
                  unsigned char byte = lsde->ReadUint8();
                  pEGOpts[i]->AttackCancel     = byte & 1;
                  pEGOpts[i]->AttackHoldCancel = byte & (1 << 1);
-Line 1746 
 namespace {
+Line 1755 
 namespace {
                  pEGOpts[i]->ReleaseCancel    = byte & (1 << 4);
              }
          }
+         // format extension for sustain pedal up effect on release trigger samples
+         if (lsde && lsde->GetSize() > 3) { // NOTE: we reserved the 3rd byte for a potential future EG3 option
+             lsde->SetPos(3);
+             uint8_t byte = lsde->ReadUint8();
+             SustainReleaseTrigger   = static_cast<sust_rel_trg_t>(byte & 0x03);
+             NoNoteOffReleaseTrigger = byte >> 7;
+         } else {
+             SustainReleaseTrigger   = sust_rel_trg_none;
+             NoNoteOffReleaseTrigger = false;
+         }
          pVelocityAttenuationTable = GetVelocityTable(VelocityResponseCurve,
                                                       VelocityResponseDepth,
-Line 1936 
 namespace {
+Line 1955 
 namespace {
          SRLZ(SampleAttenuation);
          SRLZ(EG1Options);
          SRLZ(EG2Options);
+         SRLZ(SustainReleaseTrigger);
+         SRLZ(NoNoteOffReleaseTrigger);
          // derived attributes from DLS::Sampler
          SRLZ(FineTune);
-Line 1975 
 namespace {
+Line 1996 
 namespace {
          RIFF::Chunk* _3ewa = pParentList->GetSubChunk(CHUNK_ID_3EWA);
          if (!_3ewa) {
              File* pFile = (File*) GetParent()->GetParent()->GetParent();
-             bool version3 = pFile->pVersion && pFile->pVersion->major == 3;
+             bool versiongt2 = pFile->pVersion && pFile->pVersion->major > 2;
-             _3ewa = pParentList->AddSubChunk(CHUNK_ID_3EWA, version3 ? 148 : 140);
+             _3ewa = pParentList->AddSubChunk(CHUNK_ID_3EWA, versiongt2 ? 148 : 140);
          }
          pData = (uint8_t*) _3ewa->LoadChunkData();
-Line 2243 
 namespace {
+Line 2264 
 namespace {
              memcpy(&pData[140], DimensionUpperLimits, 8);
          }
-         // format extension for EG behavior options, these will *NOT* work with
+         // chunk for own format extensions, these will *NOT* work with
          // Gigasampler/GigaStudio !
          RIFF::Chunk* lsde = pParentList->GetSubChunk(CHUNK_ID_LSDE);
+         const int lsdeSize = 4; // NOTE: we reserved the 3rd byte for a potential future EG3 option
          if (!lsde) {
-             // only add this "LSDE" chunk if the EG options do not match the
+             // only add this "LSDE" chunk if either EG options or release
-             // default EG behavior
+             // trigger options deviate from their default behaviour
              eg_opt_t defaultOpt;
              if (memcmp(&EG1Options, &defaultOpt, sizeof(eg_opt_t)) ||
-                 memcmp(&EG2Options, &defaultOpt, sizeof(eg_opt_t)))
+                 memcmp(&EG2Options, &defaultOpt, sizeof(eg_opt_t)) ||
+                 SustainReleaseTrigger || NoNoteOffReleaseTrigger)
              {
-                 lsde = pParentList->AddSubChunk(CHUNK_ID_LSDE, 2);
+                 lsde = pParentList->AddSubChunk(CHUNK_ID_LSDE, lsdeSize);
                  // move LSDE chunk to the end of parent list
                  pParentList->MoveSubChunk(lsde, (RIFF::Chunk*)NULL);
              }
          }
          if (lsde) {
+             if (lsde->GetNewSize() < lsdeSize)
+                 lsde->Resize(lsdeSize);
+             // format extension for EG behavior options
              unsigned char* pData = (unsigned char*) lsde->LoadChunkData();
              eg_opt_t* pEGOpts[2] = { &EG1Options, &EG2Options };
-             for (int i = 0; i < 2; ++i) {
+             for (int i = 0; i < 2; ++i) { // NOTE: we reserved the 3rd byte for a potential future EG3 option
                  pData[i] =
                      (pEGOpts[i]->AttackCancel     ? 1 : 0) |
                      (pEGOpts[i]->AttackHoldCancel ? (1<<1) : 0) |
-Line 2269 
 namespace {
+Line 2295 
 namespace {
                      (pEGOpts[i]->Decay2Cancel     ? (1<<3) : 0) |
                      (pEGOpts[i]->ReleaseCancel    ? (1<<4) : 0);
              }
+             // format extension for release trigger options
+             pData[3] = static_cast<uint8_t>(SustainReleaseTrigger) | (NoNoteOffReleaseTrigger ? (1<<7) : 0);
          }
      }
-Line 3208 
 namespace {
+Line 3236 
 namespace {
          }
          Layers = 1;
          File* file = (File*) GetParent()->GetParent();
-         int dimensionBits = (file->pVersion && file->pVersion->major == 3) ? 8 : 5;
+         int dimensionBits = (file->pVersion && file->pVersion->major > 2) ? 8 : 5;
          // Actual Loading
-Line 3218 
 namespace {
+Line 3246 
 namespace {
          RIFF::Chunk* _3lnk = rgnList->GetSubChunk(CHUNK_ID_3LNK);
          if (_3lnk) {
+             _3lnk->SetPos(0);
              DimensionRegions = _3lnk->ReadUint32();
              for (int i = 0; i < dimensionBits; i++) {
                  dimension_t dimension = static_cast<dimension_t>(_3lnk->ReadUint8());
-Line 3252 
 namespace {
+Line 3282 
 namespace {
              UpdateVelocityTable();
              // jump to start of the wave pool indices (if not already there)
-             if (file->pVersion && file->pVersion->major == 3)
+             if (file->pVersion && file->pVersion->major > 2)
                  _3lnk->SetPos(68); // version 3 has a different 3lnk structure
              else
                  _3lnk->SetPos(44);
-Line 3311 
 namespace {
+Line 3341 
 namespace {
          }
          File* pFile = (File*) GetParent()->GetParent();
-         bool version3 = pFile->pVersion && pFile->pVersion->major == 3;
+         bool versiongt2 = pFile->pVersion && pFile->pVersion->major > 2;
-         const int iMaxDimensions =  version3 ? 8 : 5;
+         const int iMaxDimensions =  versiongt2 ? 8 : 5;
-         const int iMaxDimensionRegions = version3 ? 256 : 32;
+         const int iMaxDimensionRegions = versiongt2 ? 256 : 32;
          // make sure '3lnk' chunk exists
          RIFF::Chunk* _3lnk = pCkRegion->GetSubChunk(CHUNK_ID_3LNK);
          if (!_3lnk) {
-             const int _3lnkChunkSize = version3 ? 1092 : 172;
+             const int _3lnkChunkSize = versiongt2 ? 1092 : 172;
              _3lnk = pCkRegion->AddSubChunk(CHUNK_ID_3LNK, _3lnkChunkSize);
              memset(_3lnk->LoadChunkData(), 0, _3lnkChunkSize);
-Line 3342 
 namespace {
+Line 3372 
 namespace {
          }
          // update wave pool table in '3lnk' chunk
-         const int iWavePoolOffset = version3 ? 68 : 44;
+         const int iWavePoolOffset = versiongt2 ? 68 : 44;
          for (uint i = 0; i < iMaxDimensionRegions; i++) {
              int iWaveIndex = -1;
              if (i < DimensionRegions) {
-Line 3485 
 namespace {
+Line 3515 
 namespace {
          // check if max. amount of dimensions reached
          File* file = (File*) GetParent()->GetParent();
-         const int iMaxDimensions = (file->pVersion && file->pVersion->major == 3) ? 8 : 5;
+         const int iMaxDimensions = (file->pVersion && file->pVersion->major > 2) ? 8 : 5;
          if (Dimensions >= iMaxDimensions)
              throw gig::Exception("Could not add new dimension, max. amount of " + ToString(iMaxDimensions) + " dimensions already reached");
          // check if max. amount of dimension bits reached
-Line 3777 
 namespace {
+Line 3807 
 namespace {
          }
          // delete temporary region
+         tempRgn->DeleteChunks();
          delete tempRgn;
          UpdateVelocityTable();
-Line 3916 
 namespace {
+Line 3947 
 namespace {
          }
          // delete temporary region
+         tempRgn->DeleteChunks();
          delete tempRgn;
          UpdateVelocityTable();
-Line 4394 
 namespace {
+Line 4426 
 namespace {
          pGroup = group;
          pChunk = ckScri;
          if (ckScri) { // object is loaded from file ...
+             ckScri->SetPos(0);
              // read header
              uint32_t headerSize = ckScri->ReadUint32();
              Compression = (Compression_t) ckScri->ReadUint32();
-Line 4446 
 namespace {
+Line 4480 
 namespace {
          memcpy(&data[0], &text[0], text.size());
      }
+     /** @brief Remove all RIFF chunks associated with this Script object.
+      *
+      * At the moment Script::DeleteChunks() does nothing. It is
+      * recommended to call this method explicitly though from deriving classes's
+      * own overridden implementation of this method to avoid potential future
+      * compatiblity issues.
+      *
+      * See DLS::Storage::DeleteChunks() for details.
+      */
+     void Script::DeleteChunks() {
+     }
      /**
       * Apply this script to the respective RIFF chunks. You have to call
       * File::Save() to make changes persistent.
-Line 4561 
 namespace {
+Line 4607 
 namespace {
          }
      }
+     /** @brief Remove all RIFF chunks associated with this ScriptGroup object.
+      *
+      * At the moment ScriptGroup::DeleteChunks() does nothing. It is
+      * recommended to call this method explicitly though from deriving classes's
+      * own overridden implementation of this method to avoid potential future
+      * compatiblity issues.
+      *
+      * See DLS::Storage::DeleteChunks() for details.
+      */
+     void ScriptGroup::DeleteChunks() {
+     }
      /**
       * Apply this script group to the respective RIFF chunks. You have to call
       * File::Save() to make changes persistent.
-Line 4685 
 namespace {
+Line 4743 
 namespace {
          if (lart) {
              RIFF::Chunk* _3ewg = lart->GetSubChunk(CHUNK_ID_3EWG);
              if (_3ewg) {
+                 _3ewg->SetPos(0);
                  EffectSend             = _3ewg->ReadUint16();
                  Attenuation            = _3ewg->ReadInt32();
                  FineTune               = _3ewg->ReadInt16();
-Line 4744 
 namespace {
+Line 4804 
 namespace {
          if (lst3LS) {
              RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);
              if (ckSCSL) {
+                 ckSCSL->SetPos(0);
                  int headerSize = ckSCSL->ReadUint32();
                  int slotCount  = ckSCSL->ReadUint32();
                  if (slotCount) {
-Line 4817 
 namespace {
+Line 4879 
 namespace {
              File* pFile = (File*) GetParent();
              // 3ewg is bigger in gig3, as it includes the iMIDI rules
-             int size = (pFile->pVersion && pFile->pVersion->major == 3) ? 16416 : 12;
+             int size = (pFile->pVersion && pFile->pVersion->major > 2) ? 16416 : 12;
              _3ewg = lart->AddSubChunk(CHUNK_ID_3EWG, size);
              memset(_3ewg->LoadChunkData(), 0, size);
          }
-Line 5374 
 namespace {
+Line 5436 
 namespace {
          ::LoadString(pNameChunk, Name);
      }
+     /** @brief Destructor.
+      *
+      * Currently this destructor implementation does nothing.
+      */
      Group::~Group() {
-         // remove the chunk associated with this group (if any)
+     }
-         if (pNameChunk) pNameChunk->GetParent()->DeleteSubChunk(pNameChunk);
+     /** @brief Remove all RIFF chunks associated with this Group object.
+      *
+      * See DLS::Storage::DeleteChunks() for details.
+      */
+     void Group::DeleteChunks() {
+         // handle own RIFF chunks
+         if (pNameChunk) {
+             pNameChunk->GetParent()->DeleteSubChunk(pNameChunk);
+             pNameChunk = NULL;
+         }
      }
      /** @brief Update chunks with current group settings.
-Line 5399 
 namespace {
+Line 5475 
 namespace {
          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);
          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);
-         if (!pNameChunk && pFile->pVersion && pFile->pVersion->major == 3) {
+         if (!pNameChunk && pFile->pVersion && pFile->pVersion->major > 2) {
              // v3 has a fixed list of 128 strings, find a free one
              for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {
                  if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {
-Line 5494 
 namespace {
+Line 5570 
 namespace {
 , 3, 20030331 & 0xffff, 20030331 >> 16
      };
+     /// Reflects Gigasampler file format version 4.0 (2007-10-12).
+     const DLS::version_t File::VERSION_4 = {
+, 4, 20071012 & 0xffff, 20071012 >> 16
+     };
      static const DLS::Info::string_length_t _FileFixedStringLengths[] = {
          { CHUNK_ID_IARL, 256 },
          { CHUNK_ID_IART, 128 },
-Line 5590 
 namespace {
+Line 5671 
 namespace {
          return static_cast<gig::Sample*>( *it );
      }
+     /**
+      * Returns the total amount of samples of this gig file.
+      *
+      * Note that this method might block for a long time in case it is required
+      * to load the sample info for the first time.
+      *
+      * @returns total amount of samples
+      */
+     size_t File::CountSamples() {
+         if (!pSamples) LoadSamples();
+         if (!pSamples) return 0;
+         return pSamples->size();
+     }
      /** @brief Add a new sample.
       *
       * This will create a new Sample object for the gig file. You have to
-Line 5628 
 namespace {
+Line 5723 
 namespace {
          if (iter == pSamples->end()) throw gig::Exception("Could not delete sample, could not find given sample");
          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation
          pSamples->erase(iter);
+         pSample->DeleteChunks();
          delete pSample;
          SampleList::iterator tmp = SamplesIterator;
-Line 5665 
 namespace {
+Line 5761 
 namespace {
          int iSampleIndex  = 0;
          int iTotalSamples = WavePoolCount;
-         // check if samples should be loaded from extension files
+         // just for assembling path of optional extension files to be read
-         // (only for old gig files < 2 GB)
+         const std::string folder = parentPath(pRIFF->GetFileName());
-         int lastFileNo = 0;
+         const std::string baseName = pathWithoutExtension(pRIFF->GetFileName());
-         if (!file->IsNew() && !(file->GetCurrentFileSize() >> 31)) {
-             for (int i = 0 ; i < WavePoolCount ; i++) {
+         // the main gig file and the extension files (.gx01, ... , .gx98) may
-                 if (pWavePoolTableHi[i] > lastFileNo) lastFileNo = pWavePoolTableHi[i];
+         // contain wave data (wave pool)
-             }
+         std::vector<RIFF::File*> poolFiles;
-         }
+         poolFiles.push_back(pRIFF);
-         String name(pRIFF->GetFileName());
-         int nameLen = (int) name.length();
+         // get info about all extension files
-         char suffix[6];
+         RIFF::Chunk* ckXfil = pRIFF->GetSubChunk(CHUNK_ID_XFIL);
-         if (nameLen > 4 && name.substr(nameLen - 4) == ".gig") nameLen -= 4;
+         if (ckXfil) { // there are extension files (.gx01, ... , .gx98) ...
+             const uint32_t n = ckXfil->ReadInt32();
-         for (int fileNo = 0 ; ; ) {
+             for (int i = 0; i < n; i++) {
+                 // read the filename and load the extension file
+                 std::string name;
+                 ckXfil->ReadString(name, 128);
+                 std::string path = concatPath(folder, name);
+                 RIFF::File* pExtFile = new RIFF::File(path);
+                 // check that the dlsids match
+                 RIFF::Chunk* ckDLSID = pExtFile->GetSubChunk(CHUNK_ID_DLID);
+                 if (ckDLSID) {
+                     ::DLS::dlsid_t idExpected;
+                     idExpected.ulData1 = ckXfil->ReadInt32();
+                     idExpected.usData2 = ckXfil->ReadInt16();
+                     idExpected.usData3 = ckXfil->ReadInt16();
+                     ckXfil->Read(idExpected.abData, 8, 1);
+                     ::DLS::dlsid_t idFound;
+                     ckDLSID->Read(&idFound.ulData1, 1, 4);
+                     ckDLSID->Read(&idFound.usData2, 1, 2);
+                     ckDLSID->Read(&idFound.usData3, 1, 2);
+                     ckDLSID->Read(idFound.abData, 8, 1);
+                     if (memcmp(&idExpected, &idFound, 16) != 0)
+                         throw gig::Exception("dlsid mismatch for extension file: %s", path.c_str());
+                 }
+                 poolFiles.push_back(pExtFile);
+                 ExtensionFiles.push_back(pExtFile);
+             }
+         }
+         // check if a .gx99 (GigaPulse) file exists
+         RIFF::Chunk* ckDoxf = pRIFF->GetSubChunk(CHUNK_ID_DOXF);
+         if (ckDoxf) { // there is a .gx99 (GigaPulse) file ...
+             std::string path = baseName + ".gx99";
+             RIFF::File* pExtFile = new RIFF::File(path);
+             // skip unused int and filename
+             ckDoxf->SetPos(132, RIFF::stream_curpos);
+             // check that the dlsids match
+             RIFF::Chunk* ckDLSID = pExtFile->GetSubChunk(CHUNK_ID_DLID);
+             if (ckDLSID) {
+                 ::DLS::dlsid_t idExpected;
+                 idExpected.ulData1 = ckDoxf->ReadInt32();
+                 idExpected.usData2 = ckDoxf->ReadInt16();
+                 idExpected.usData3 = ckDoxf->ReadInt16();
+                 ckDoxf->Read(idExpected.abData, 8, 1);
+                 ::DLS::dlsid_t idFound;
+                 ckDLSID->Read(&idFound.ulData1, 1, 4);
+                 ckDLSID->Read(&idFound.usData2, 1, 2);
+                 ckDLSID->Read(&idFound.usData3, 1, 2);
+                 ckDLSID->Read(idFound.abData, 8, 1);
+                 if (memcmp(&idExpected, &idFound, 16) != 0)
+                     throw gig::Exception("dlsid mismatch for GigaPulse file: %s", path.c_str());
+             }
+             poolFiles.push_back(pExtFile);
+             ExtensionFiles.push_back(pExtFile);
+         }
+         // load samples from extension files (if required)
+         for (int i = 0; i < poolFiles.size(); i++) {
+             RIFF::File* file = poolFiles[i];
              RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);
              if (wvpl) {
-                 file_offset_t wvplFileOffset = wvpl->GetFilePos();
+                 file_offset_t wvplFileOffset = wvpl->GetFilePos() -
+                                                wvpl->GetPos(); // should be zero, but just to be sure
                  RIFF::List* wave = wvpl->GetFirstSubList();
                  while (wave) {
                      if (wave->GetListType() == LIST_TYPE_WAVE) {
-Line 5690 
 namespace {
+Line 5845 
 namespace {
                          __notify_progress(pProgress, subprogress);
                          file_offset_t waveFileOffset = wave->GetFilePos();
-                         pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, fileNo, iSampleIndex));
+                         pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, i, iSampleIndex));
                          iSampleIndex++;
                      }
                      wave = wvpl->GetNextSubList();
                  }
+             }
-                 if (fileNo == lastFileNo) break;
-                 // open extension file (*.gx01, *.gx02, ...)
-                 fileNo++;
-                 sprintf(suffix, ".gx%02d", fileNo);
-                 name.replace(nameLen, 5, suffix);
-                 file = new RIFF::File(name);
-                 ExtensionFiles.push_back(file);
-             } else break;
          }
          __notify_progress(pProgress, 1.0); // notify done
-Line 5725 
 namespace {
+Line 5871 
 namespace {
      }
      /**
+      * Returns the total amount of instruments of this gig file.
+      *
+      * Note that this method might block for a long time in case it is required
+      * to load the instruments info for the first time.
+      *
+      * @returns total amount of instruments
+      */
+     size_t File::CountInstruments() {
+         if (!pInstruments) LoadInstruments();
+         if (!pInstruments) return 0;
+         return pInstruments->size();
+     }
+     /**
       * Returns the instrument with the given index.
       *
       * @param index     - number of the sought instrument (0..n)
-Line 5899 
 namespace {
+Line 6059 
 namespace {
          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), (DLS::Instrument*) pInstrument);
          if (iter == pInstruments->end()) throw gig::Exception("Could not delete instrument, could not find given instrument");
          pInstruments->erase(iter);
+         pInstrument->DeleteChunks();
          delete pInstrument;
      }
-Line 6043 
 namespace {
+Line 6204 
 namespace {
              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);
              // the order of einf and 3crc is not the same in v2 and v3
              RIFF::Chunk* einf = pRIFF->GetSubChunk(CHUNK_ID_EINF);
-             if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);
+             if (einf && pVersion && pVersion->major > 2) pRIFF->MoveSubChunk(_3crc, einf);
              bRequiresSave = true;
          } else if (_3crc->GetNewSize() != pSamples->size() * 8) {
              _3crc->Resize(pSamples->size() * 8);
-Line 6158 
 namespace {
+Line 6319 
 namespace {
          }
          // now delete this group object
          pGroups->erase(iter);
+         pGroup->DeleteChunks();
          delete pGroup;
      }
-Line 6179 
 namespace {
+Line 6341 
 namespace {
          // move all members of this group to another group
          pGroup->MoveAll();
          pGroups->erase(iter);
+         pGroup->DeleteChunks();
          delete pGroup;
      }
-Line 6192 
 namespace {
+Line 6355 
 namespace {
                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();
                  while (ck) {
                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {
-                         if (pVersion && pVersion->major == 3 &&
+                         if (pVersion && pVersion->major > 2 &&
                              strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;
                          pGroups->push_back(new Group(this, ck));
-Line 6278 
 namespace {
+Line 6441 
 namespace {
              pScriptGroup->DeleteScript(pScriptGroup->GetScript(i));
          if (pScriptGroup->pList)
              pScriptGroup->pList->GetParent()->DeleteSubChunk(pScriptGroup->pList);
+         pScriptGroup->DeleteChunks();
          delete pScriptGroup;
      }
-Line 6368 
 namespace {
+Line 6532 
 namespace {
              // v3: make sure the file has 128 3gnm chunks
              // (before updating the Group chunks)
-             if (pVersion && pVersion->major == 3) {
+             if (pVersion && pVersion->major > 2) {
                  RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();
                  for (int i = 0 ; i < 128 ; i++) {
                      if (i >= pGroups->size()) ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);
-Line 6514 
 namespace {
+Line 6678 
 namespace {
          } else /*if (newFile)*/ {
              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);
              // the order of einf and 3crc is not the same in v2 and v3
-             if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);
+             if (einf && pVersion && pVersion->major > 2) pRIFF->MoveSubChunk(_3crc, einf);
          }
          { // must be performed in RAM here ...
              uint32_t* pData = (uint32_t*) _3crc->LoadChunkData();
-Line 6541 
 namespace {
+Line 6705 
 namespace {
      }
      /**
-      * Enable / disable automatic loading. By default this properyt is
+      * Enable / disable automatic loading. By default this property is
-      * enabled and all informations are loaded automatically. However
+      * enabled and every information is loaded automatically. However
       * loading all Regions, DimensionRegions and especially samples might
       * take a long time for large .gig files, and sometimes one might only
       * be interested in retrieving very superficial informations like the
-Line 6550 
 namespace {
+Line 6714 
 namespace {
       * automatic loading to avoid very slow response times.
       *
       * @e CAUTION: by disabling this property many pointers (i.e. sample
-      * references) and informations will have invalid or even undefined
+      * references) and attributes will have invalid or even undefined
       * data! This feature is currently only intended for retrieving very
-      * superficial informations in a very fast way. Don't use it to retrieve
+      * superficial information in a very fast way. Don't use it to retrieve
-      * details like synthesis informations or even to modify .gig files!
+      * details like synthesis information or even to modify .gig files!
       */
      void File::SetAutoLoad(bool b) {
          bAutoLoad = b;

 Legend:



Removed from v.3350
 


changed lines


 
Added in v.3481
 Legend:



Removed from v.3350
 


changed lines


 
Added in v.3481
-Removed from v.3350
+Added in v.3481

	ViewVC Help
Powered by ViewVC