/[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 3475 by schoenebeck, Wed Feb 20 17:06:11 2019 UTC revision 3657 by schoenebeck, Sat Dec 14 17:10:57 2019 UTC
# Line 412  namespace { Line 412  namespace {
412    
413          pCk3gix = waveList->GetSubChunk(CHUNK_ID_3GIX);          pCk3gix = waveList->GetSubChunk(CHUNK_ID_3GIX);
414          if (pCk3gix) {          if (pCk3gix) {
415                pCk3gix->SetPos(0);
416    
417              uint16_t iSampleGroup = pCk3gix->ReadInt16();              uint16_t iSampleGroup = pCk3gix->ReadInt16();
418              pGroup = pFile->GetGroup(iSampleGroup);              pGroup = pFile->GetGroup(iSampleGroup);
419          } else { // '3gix' chunk missing          } else { // '3gix' chunk missing
# Line 421  namespace { Line 423  namespace {
423    
424          pCkSmpl = waveList->GetSubChunk(CHUNK_ID_SMPL);          pCkSmpl = waveList->GetSubChunk(CHUNK_ID_SMPL);
425          if (pCkSmpl) {          if (pCkSmpl) {
426                pCkSmpl->SetPos(0);
427    
428              Manufacturer  = pCkSmpl->ReadInt32();              Manufacturer  = pCkSmpl->ReadInt32();
429              Product       = pCkSmpl->ReadInt32();              Product       = pCkSmpl->ReadInt32();
430              SamplePeriod  = pCkSmpl->ReadInt32();              SamplePeriod  = pCkSmpl->ReadInt32();
# Line 467  namespace { Line 471  namespace {
471          Dithered          = false;          Dithered          = false;
472          TruncatedBits     = 0;          TruncatedBits     = 0;
473          if (Compressed) {          if (Compressed) {
474                ewav->SetPos(0);
475    
476              uint32_t version = ewav->ReadInt32();              uint32_t version = ewav->ReadInt32();
477              if (version > 2 && BitDepth == 24) {              if (version > 2 && BitDepth == 24) {
478                  Dithered = ewav->ReadInt32();                  Dithered = ewav->ReadInt32();
# Line 1500  namespace { Line 1506  namespace {
1506    
1507          RIFF::Chunk* _3ewa = _3ewl->GetSubChunk(CHUNK_ID_3EWA);          RIFF::Chunk* _3ewa = _3ewl->GetSubChunk(CHUNK_ID_3EWA);
1508          if (_3ewa) { // if '3ewa' chunk exists          if (_3ewa) { // if '3ewa' chunk exists
1509                _3ewa->SetPos(0);
1510    
1511              _3ewa->ReadInt32(); // unknown, always == chunk size ?              _3ewa->ReadInt32(); // unknown, always == chunk size ?
1512              LFO3Frequency = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());              LFO3Frequency = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
1513              EG3Attack     = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());              EG3Attack     = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
# Line 1732  namespace { Line 1740  namespace {
1740              VCFType                         = vcf_type_lowpass;              VCFType                         = vcf_type_lowpass;
1741              memset(DimensionUpperLimits, 127, 8);              memset(DimensionUpperLimits, 127, 8);
1742          }          }
1743    
1744          // chunk for own format extensions, these will *NOT* work with Gigasampler/GigaStudio !          // chunk for own format extensions, these will *NOT* work with Gigasampler/GigaStudio !
1745          RIFF::Chunk* lsde = _3ewl->GetSubChunk(CHUNK_ID_LSDE);          RIFF::Chunk* lsde = _3ewl->GetSubChunk(CHUNK_ID_LSDE);
1746          if (lsde) { // format extension for EG behavior options          if (lsde) { // format extension for EG behavior options
1747                lsde->SetPos(0);
1748    
1749              eg_opt_t* pEGOpts[2] = { &EG1Options, &EG2Options };              eg_opt_t* pEGOpts[2] = { &EG1Options, &EG2Options };
1750              for (int i = 0; i < 2; ++i) { // NOTE: we reserved a 3rd byte for a potential future EG3 option              for (int i = 0; i < 2; ++i) { // NOTE: we reserved a 3rd byte for a potential future EG3 option
1751                  unsigned char byte = lsde->ReadUint8();                  unsigned char byte = lsde->ReadUint8();
# Line 1755  namespace { Line 1766  namespace {
1766              SustainReleaseTrigger   = sust_rel_trg_none;              SustainReleaseTrigger   = sust_rel_trg_none;
1767              NoNoteOffReleaseTrigger = false;              NoNoteOffReleaseTrigger = false;
1768          }          }
1769            // format extension for LFOs' wave form, phase displacement and for
1770            // LFO3's flip phase
1771            if (lsde && lsde->GetSize() > 4) {
1772                lsde->SetPos(4);
1773                LFO1WaveForm = static_cast<lfo_wave_t>( lsde->ReadUint16() );
1774                LFO2WaveForm = static_cast<lfo_wave_t>( lsde->ReadUint16() );
1775                LFO3WaveForm = static_cast<lfo_wave_t>( lsde->ReadUint16() );
1776                lsde->ReadUint16(); // unused 16 bits, reserved for potential future use
1777                LFO1Phase = (double) GIG_EXP_DECODE( lsde->ReadInt32() );
1778                LFO2Phase = (double) GIG_EXP_DECODE( lsde->ReadInt32() );
1779                LFO3Phase = (double) GIG_EXP_DECODE( lsde->ReadInt32() );
1780                const uint32_t flags = lsde->ReadInt32();
1781                LFO3FlipPhase = flags & 1;
1782            } else {
1783                LFO1WaveForm = lfo_wave_sine;
1784                LFO2WaveForm = lfo_wave_sine;
1785                LFO3WaveForm = lfo_wave_sine;
1786                LFO1Phase = 0.0;
1787                LFO2Phase = 0.0;
1788                LFO3Phase = 0.0;
1789                LFO3FlipPhase = false;
1790            }
1791    
1792          pVelocityAttenuationTable = GetVelocityTable(VelocityResponseCurve,          pVelocityAttenuationTable = GetVelocityTable(VelocityResponseCurve,
1793                                                       VelocityResponseDepth,                                                       VelocityResponseDepth,
# Line 1880  namespace { Line 1913  namespace {
1913          SRLZ(EG1ControllerAttackInfluence);          SRLZ(EG1ControllerAttackInfluence);
1914          SRLZ(EG1ControllerDecayInfluence);          SRLZ(EG1ControllerDecayInfluence);
1915          SRLZ(EG1ControllerReleaseInfluence);          SRLZ(EG1ControllerReleaseInfluence);
1916            SRLZ(LFO1WaveForm);
1917          SRLZ(LFO1Frequency);          SRLZ(LFO1Frequency);
1918            SRLZ(LFO1Phase);
1919          SRLZ(LFO1InternalDepth);          SRLZ(LFO1InternalDepth);
1920          SRLZ(LFO1ControlDepth);          SRLZ(LFO1ControlDepth);
1921          SRLZ(LFO1Controller);          SRLZ(LFO1Controller);
# Line 1898  namespace { Line 1933  namespace {
1933          SRLZ(EG2ControllerAttackInfluence);          SRLZ(EG2ControllerAttackInfluence);
1934          SRLZ(EG2ControllerDecayInfluence);          SRLZ(EG2ControllerDecayInfluence);
1935          SRLZ(EG2ControllerReleaseInfluence);          SRLZ(EG2ControllerReleaseInfluence);
1936            SRLZ(LFO2WaveForm);
1937          SRLZ(LFO2Frequency);          SRLZ(LFO2Frequency);
1938            SRLZ(LFO2Phase);
1939          SRLZ(LFO2InternalDepth);          SRLZ(LFO2InternalDepth);
1940          SRLZ(LFO2ControlDepth);          SRLZ(LFO2ControlDepth);
1941          SRLZ(LFO2Controller);          SRLZ(LFO2Controller);
# Line 1906  namespace { Line 1943  namespace {
1943          SRLZ(LFO2Sync);          SRLZ(LFO2Sync);
1944          SRLZ(EG3Attack);          SRLZ(EG3Attack);
1945          SRLZ(EG3Depth);          SRLZ(EG3Depth);
1946            SRLZ(LFO3WaveForm);
1947          SRLZ(LFO3Frequency);          SRLZ(LFO3Frequency);
1948            SRLZ(LFO3Phase);
1949          SRLZ(LFO3InternalDepth);          SRLZ(LFO3InternalDepth);
1950          SRLZ(LFO3ControlDepth);          SRLZ(LFO3ControlDepth);
1951          SRLZ(LFO3Controller);          SRLZ(LFO3Controller);
1952            SRLZ(LFO3FlipPhase);
1953          SRLZ(LFO3Sync);          SRLZ(LFO3Sync);
1954          SRLZ(VCFEnabled);          SRLZ(VCFEnabled);
1955          SRLZ(VCFType);          SRLZ(VCFType);
# Line 2257  namespace { Line 2297  namespace {
2297          // chunk for own format extensions, these will *NOT* work with          // chunk for own format extensions, these will *NOT* work with
2298          // Gigasampler/GigaStudio !          // Gigasampler/GigaStudio !
2299          RIFF::Chunk* lsde = pParentList->GetSubChunk(CHUNK_ID_LSDE);          RIFF::Chunk* lsde = pParentList->GetSubChunk(CHUNK_ID_LSDE);
2300          const int lsdeSize = 4; // NOTE: we reserved the 3rd byte for a potential future EG3 option          const int lsdeSize =
2301          if (!lsde) {              3 /* EG cancel options */ +
2302              // only add this "LSDE" chunk if either EG options or release              1 /* sustain pedal up on release trigger option */ +
2303              // trigger options deviate from their default behaviour              8 /* LFOs' wave forms */ + 12 /* LFOs' phase */ + 4 /* flags (LFO3FlipPhase) */;
2304              eg_opt_t defaultOpt;          if (!lsde && UsesAnyGigFormatExtension()) {
2305              if (memcmp(&EG1Options, &defaultOpt, sizeof(eg_opt_t)) ||              // only add this "LSDE" chunk if there is some (format extension)
2306                  memcmp(&EG2Options, &defaultOpt, sizeof(eg_opt_t)) ||              // setting effective that would require our "LSDE" format extension
2307                  SustainReleaseTrigger || NoNoteOffReleaseTrigger)              // chunk to be stored
2308              {              lsde = pParentList->AddSubChunk(CHUNK_ID_LSDE, lsdeSize);
2309                  lsde = pParentList->AddSubChunk(CHUNK_ID_LSDE, lsdeSize);              // move LSDE chunk to the end of parent list
2310                  // move LSDE chunk to the end of parent list              pParentList->MoveSubChunk(lsde, (RIFF::Chunk*)NULL);
                 pParentList->MoveSubChunk(lsde, (RIFF::Chunk*)NULL);  
             }  
2311          }          }
2312          if (lsde) {          if (lsde) {
2313              if (lsde->GetNewSize() < lsdeSize)              if (lsde->GetNewSize() < lsdeSize)
# Line 2287  namespace { Line 2325  namespace {
2325              }              }
2326              // format extension for release trigger options              // format extension for release trigger options
2327              pData[3] = static_cast<uint8_t>(SustainReleaseTrigger) | (NoNoteOffReleaseTrigger ? (1<<7) : 0);              pData[3] = static_cast<uint8_t>(SustainReleaseTrigger) | (NoNoteOffReleaseTrigger ? (1<<7) : 0);
2328                // format extension for LFOs' wave form, phase displacement and for
2329                // LFO3's flip phase
2330                store16(&pData[4], LFO1WaveForm);
2331                store16(&pData[6], LFO2WaveForm);
2332                store16(&pData[8], LFO3WaveForm);
2333                //NOTE: 16 bits reserved here for potential future use !
2334                const int32_t lfo1Phase = (int32_t) GIG_EXP_ENCODE(LFO1Phase);
2335                const int32_t lfo2Phase = (int32_t) GIG_EXP_ENCODE(LFO2Phase);
2336                const int32_t lfo3Phase = (int32_t) GIG_EXP_ENCODE(LFO3Phase);
2337                store32(&pData[12], lfo1Phase);
2338                store32(&pData[16], lfo2Phase);
2339                store32(&pData[20], lfo3Phase);
2340                const int32_t flags = LFO3FlipPhase ? 1 : 0;
2341                store32(&pData[24], flags);
2342    
2343                // compile time sanity check: is our last store access here
2344                // consistent with the initial lsdeSize value assignment?
2345                static_assert(lsdeSize == 28, "Inconsistency in assumed 'LSDE' RIFF chunk size");
2346          }          }
2347      }      }
2348    
2349        /**
2350         * Returns @c true in case this DimensionRegion object uses any gig format
2351         * extension, that is whether this DimensionRegion object currently has any
2352         * setting effective that would require our "LSDE" RIFF chunk to be stored
2353         * to the gig file.
2354         *
2355         * Right now this is a private method. It is considerable though this method
2356         * to become (in slightly modified form) a public API method in future, i.e.
2357         * to allow instrument editors to visualize and/or warn the user of any
2358         * format extension being used. Right now this method really just serves to
2359         * answer the question whether an LSDE chunk is required, for the public API
2360         * purpose this method would also need to check whether any other setting
2361         * stored to the regular value '3ewa' chunk, is actually a format extension
2362         * as well.
2363         */
2364        bool DimensionRegion::UsesAnyGigFormatExtension() const {
2365            eg_opt_t defaultOpt;
2366            return memcmp(&EG1Options, &defaultOpt, sizeof(eg_opt_t)) ||
2367                   memcmp(&EG2Options, &defaultOpt, sizeof(eg_opt_t)) ||
2368                   SustainReleaseTrigger || NoNoteOffReleaseTrigger ||
2369                   LFO1WaveForm || LFO2WaveForm || LFO3WaveForm ||
2370                   LFO1Phase || LFO2Phase || LFO3Phase ||
2371                   LFO3FlipPhase;
2372        }
2373    
2374      double* DimensionRegion::GetReleaseVelocityTable(curve_type_t releaseVelocityResponseCurve, uint8_t releaseVelocityResponseDepth) {      double* DimensionRegion::GetReleaseVelocityTable(curve_type_t releaseVelocityResponseCurve, uint8_t releaseVelocityResponseDepth) {
2375          curve_type_t curveType = releaseVelocityResponseCurve;          curve_type_t curveType = releaseVelocityResponseCurve;
2376          uint8_t depth = releaseVelocityResponseDepth;          uint8_t depth = releaseVelocityResponseDepth;
# Line 3236  namespace { Line 3317  namespace {
3317    
3318          RIFF::Chunk* _3lnk = rgnList->GetSubChunk(CHUNK_ID_3LNK);          RIFF::Chunk* _3lnk = rgnList->GetSubChunk(CHUNK_ID_3LNK);
3319          if (_3lnk) {          if (_3lnk) {
3320                _3lnk->SetPos(0);
3321    
3322              DimensionRegions = _3lnk->ReadUint32();              DimensionRegions = _3lnk->ReadUint32();
3323              for (int i = 0; i < dimensionBits; i++) {              for (int i = 0; i < dimensionBits; i++) {
3324                  dimension_t dimension = static_cast<dimension_t>(_3lnk->ReadUint8());                  dimension_t dimension = static_cast<dimension_t>(_3lnk->ReadUint8());
# Line 3329  namespace { Line 3412  namespace {
3412          }          }
3413    
3414          File* pFile = (File*) GetParent()->GetParent();          File* pFile = (File*) GetParent()->GetParent();
3415          bool versiongt2 = pFile->pVersion && pFile->pVersion->major > 2;          const bool versiongt2 = pFile->pVersion && pFile->pVersion->major > 2;
3416          const int iMaxDimensions =  versiongt2 ? 8 : 5;          const int iMaxDimensions =  versiongt2 ? 8 : 5;
3417          const int iMaxDimensionRegions = versiongt2 ? 256 : 32;          const int iMaxDimensionRegions = versiongt2 ? 256 : 32;
3418    
# Line 3376  namespace { Line 3459  namespace {
3459              }              }
3460              store32(&pData[iWavePoolOffset + i * 4], iWaveIndex);              store32(&pData[iWavePoolOffset + i * 4], iWaveIndex);
3461          }          }
3462    
3463            if (versiongt2) {
3464                // add 3dnm list which always seems to be empty
3465                RIFF::List* _3dnm = pCkRegion->GetSubList(LIST_TYPE_3DNM);
3466                if (!_3dnm) _3dnm = pCkRegion->AddSubList(LIST_TYPE_3DNM);
3467    
3468                // add 3ddp chunk which always seems to have 16 bytes of 0xFF
3469                RIFF::Chunk* _3ddp = pCkRegion->GetSubChunk(CHUNK_ID_3DDP);
3470                if (!_3ddp) _3ddp =  pCkRegion->AddSubChunk(CHUNK_ID_3DDP, 16);
3471                uint8_t* pData = (uint8_t*) _3ddp->LoadChunkData();
3472                for (int i = 0; i < 16; i += 4) {
3473                    store32(&pData[i], 0xFFFFFFFF);
3474                }
3475    
3476                // move 3dnm and 3ddp to the end of the region list
3477                pCkRegion->MoveSubChunk(pCkRegion->GetSubList(LIST_TYPE_3DNM), (RIFF::Chunk*)NULL);
3478                pCkRegion->MoveSubChunk(pCkRegion->GetSubChunk(CHUNK_ID_3DDP), (RIFF::Chunk*)NULL);
3479            } else {
3480                // this is intended for the user switching from GSt >= 3 version
3481                // back to an older format version, delete GSt3 chunks ...
3482                RIFF::List* _3dnm = pCkRegion->GetSubList(LIST_TYPE_3DNM);
3483                if (_3dnm) pCkRegion->DeleteSubChunk(_3dnm);
3484    
3485                RIFF::Chunk* _3ddp = pCkRegion->GetSubChunk(CHUNK_ID_3DDP);
3486                if (_3ddp) pCkRegion->DeleteSubChunk(_3ddp);
3487            }
3488      }      }
3489    
3490      void Region::LoadDimensionRegions(RIFF::List* rgn) {      void Region::LoadDimensionRegions(RIFF::List* rgn) {
# Line 3795  namespace { Line 3904  namespace {
3904          }          }
3905    
3906          // delete temporary region          // delete temporary region
3907            tempRgn->DeleteChunks();
3908          delete tempRgn;          delete tempRgn;
3909    
3910          UpdateVelocityTable();          UpdateVelocityTable();
# Line 3934  namespace { Line 4044  namespace {
4044          }          }
4045    
4046          // delete temporary region          // delete temporary region
4047            tempRgn->DeleteChunks();
4048          delete tempRgn;          delete tempRgn;
4049    
4050          UpdateVelocityTable();          UpdateVelocityTable();
# Line 4412  namespace { Line 4523  namespace {
4523          pGroup = group;          pGroup = group;
4524          pChunk = ckScri;          pChunk = ckScri;
4525          if (ckScri) { // object is loaded from file ...          if (ckScri) { // object is loaded from file ...
4526                ckScri->SetPos(0);
4527    
4528              // read header              // read header
4529              uint32_t headerSize = ckScri->ReadUint32();              uint32_t headerSize = ckScri->ReadUint32();
4530              Compression = (Compression_t) ckScri->ReadUint32();              Compression = (Compression_t) ckScri->ReadUint32();
# Line 4464  namespace { Line 4577  namespace {
4577          memcpy(&data[0], &text[0], text.size());          memcpy(&data[0], &text[0], text.size());
4578      }      }
4579    
4580        /** @brief Remove all RIFF chunks associated with this Script object.
4581         *
4582         * At the moment Script::DeleteChunks() does nothing. It is
4583         * recommended to call this method explicitly though from deriving classes's
4584         * own overridden implementation of this method to avoid potential future
4585         * compatiblity issues.
4586         *
4587         * See DLS::Storage::DeleteChunks() for details.
4588         */
4589        void Script::DeleteChunks() {
4590        }
4591    
4592      /**      /**
4593       * Apply this script to the respective RIFF chunks. You have to call       * Apply this script to the respective RIFF chunks. You have to call
4594       * File::Save() to make changes persistent.       * File::Save() to make changes persistent.
# Line 4579  namespace { Line 4704  namespace {
4704          }          }
4705      }      }
4706    
4707        /** @brief Remove all RIFF chunks associated with this ScriptGroup object.
4708         *
4709         * At the moment ScriptGroup::DeleteChunks() does nothing. It is
4710         * recommended to call this method explicitly though from deriving classes's
4711         * own overridden implementation of this method to avoid potential future
4712         * compatiblity issues.
4713         *
4714         * See DLS::Storage::DeleteChunks() for details.
4715         */
4716        void ScriptGroup::DeleteChunks() {
4717        }
4718    
4719      /**      /**
4720       * Apply this script group to the respective RIFF chunks. You have to call       * Apply this script group to the respective RIFF chunks. You have to call
4721       * File::Save() to make changes persistent.       * File::Save() to make changes persistent.
# Line 4703  namespace { Line 4840  namespace {
4840          if (lart) {          if (lart) {
4841              RIFF::Chunk* _3ewg = lart->GetSubChunk(CHUNK_ID_3EWG);              RIFF::Chunk* _3ewg = lart->GetSubChunk(CHUNK_ID_3EWG);
4842              if (_3ewg) {              if (_3ewg) {
4843                    _3ewg->SetPos(0);
4844    
4845                  EffectSend             = _3ewg->ReadUint16();                  EffectSend             = _3ewg->ReadUint16();
4846                  Attenuation            = _3ewg->ReadInt32();                  Attenuation            = _3ewg->ReadInt32();
4847                  FineTune               = _3ewg->ReadInt16();                  FineTune               = _3ewg->ReadInt16();
# Line 4747  namespace { Line 4886  namespace {
4886                  RIFF::List* rgn = lrgn->GetFirstSubList();                  RIFF::List* rgn = lrgn->GetFirstSubList();
4887                  while (rgn) {                  while (rgn) {
4888                      if (rgn->GetListType() == LIST_TYPE_RGN) {                      if (rgn->GetListType() == LIST_TYPE_RGN) {
4889                          __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);                          if (pProgress)
4890                                __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);
4891                          pRegions->push_back(new Region(this, rgn));                          pRegions->push_back(new Region(this, rgn));
4892                      }                      }
4893                      rgn = lrgn->GetNextSubList();                      rgn = lrgn->GetNextSubList();
# Line 4762  namespace { Line 4902  namespace {
4902          if (lst3LS) {          if (lst3LS) {
4903              RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);              RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);
4904              if (ckSCSL) {              if (ckSCSL) {
4905                    ckSCSL->SetPos(0);
4906    
4907                  int headerSize = ckSCSL->ReadUint32();                  int headerSize = ckSCSL->ReadUint32();
4908                  int slotCount  = ckSCSL->ReadUint32();                  int slotCount  = ckSCSL->ReadUint32();
4909                  if (slotCount) {                  if (slotCount) {
# Line 4779  namespace { Line 4921  namespace {
4921              }              }
4922          }          }
4923    
4924          __notify_progress(pProgress, 1.0f); // notify done          if (pProgress)
4925                __notify_progress(pProgress, 1.0f); // notify done
4926      }      }
4927    
4928      void Instrument::UpdateRegionKeyTable() {      void Instrument::UpdateRegionKeyTable() {
# Line 5392  namespace { Line 5535  namespace {
5535          ::LoadString(pNameChunk, Name);          ::LoadString(pNameChunk, Name);
5536      }      }
5537    
5538        /** @brief Destructor.
5539         *
5540         * Currently this destructor implementation does nothing.
5541         */
5542      Group::~Group() {      Group::~Group() {
5543          // remove the chunk associated with this group (if any)      }
5544          if (pNameChunk) pNameChunk->GetParent()->DeleteSubChunk(pNameChunk);  
5545        /** @brief Remove all RIFF chunks associated with this Group object.
5546         *
5547         * See DLS::Storage::DeleteChunks() for details.
5548         */
5549        void Group::DeleteChunks() {
5550            // handle own RIFF chunks
5551            if (pNameChunk) {
5552                pNameChunk->GetParent()->DeleteSubChunk(pNameChunk);
5553                pNameChunk = NULL;
5554            }
5555      }      }
5556    
5557      /** @brief Update chunks with current group settings.      /** @brief Update chunks with current group settings.
# Line 5665  namespace { Line 5822  namespace {
5822          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");
5823          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation
5824          pSamples->erase(iter);          pSamples->erase(iter);
5825            pSample->DeleteChunks();
5826          delete pSample;          delete pSample;
5827    
5828          SampleList::iterator tmp = SamplesIterator;          SampleList::iterator tmp = SamplesIterator;
# Line 5776  namespace { Line 5934  namespace {
5934              RIFF::File* file = poolFiles[i];              RIFF::File* file = poolFiles[i];
5935              RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);              RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);
5936              if (wvpl) {              if (wvpl) {
5937                  file_offset_t wvplFileOffset = wvpl->GetFilePos();                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -
5938                                                   wvpl->GetPos(); // should be zero, but just to be sure
5939                  RIFF::List* wave = wvpl->GetFirstSubList();                  RIFF::List* wave = wvpl->GetFirstSubList();
5940                  while (wave) {                  while (wave) {
5941                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
5942                          // notify current progress                          // notify current progress
5943                          const float subprogress = (float) iSampleIndex / (float) iTotalSamples;                          if (pProgress) {
5944                          __notify_progress(pProgress, subprogress);                              const float subprogress = (float) iSampleIndex / (float) iTotalSamples;
5945                                __notify_progress(pProgress, subprogress);
5946                            }
5947    
5948                          file_offset_t waveFileOffset = wave->GetFilePos();                          file_offset_t waveFileOffset = wave->GetFilePos();
5949                          pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, i, iSampleIndex));                          pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, i, iSampleIndex));
# Line 5794  namespace { Line 5955  namespace {
5955              }              }
5956          }          }
5957    
5958          __notify_progress(pProgress, 1.0); // notify done          if (pProgress)
5959                __notify_progress(pProgress, 1.0); // notify done
5960      }      }
5961    
5962      Instrument* File::GetFirstInstrument() {      Instrument* File::GetFirstInstrument() {
# Line 5835  namespace { Line 5997  namespace {
5997          if (!pInstruments) {          if (!pInstruments) {
5998              // 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)
5999    
6000              // sample loading subtask              if (pProgress) {
6001              progress_t subprogress;                  // sample loading subtask
6002              __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask                  progress_t subprogress;
6003              __notify_progress(&subprogress, 0.0f);                  __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask
6004              if (GetAutoLoad())                  __notify_progress(&subprogress, 0.0f);
6005                  GetFirstSample(&subprogress); // now force all samples to be loaded                  if (GetAutoLoad())
6006              __notify_progress(&subprogress, 1.0f);                      GetFirstSample(&subprogress); // now force all samples to be loaded
6007                    __notify_progress(&subprogress, 1.0f);
6008              // instrument loading subtask  
6009              if (pProgress && pProgress->callback) {                  // instrument loading subtask
6010                  subprogress.__range_min = subprogress.__range_max;                  if (pProgress->callback) {
6011                  subprogress.__range_max = pProgress->__range_max; // schedule remaining percentage for this subtask                      subprogress.__range_min = subprogress.__range_max;
6012              }                      subprogress.__range_max = pProgress->__range_max; // schedule remaining percentage for this subtask
6013              __notify_progress(&subprogress, 0.0f);                  }
6014              LoadInstruments(&subprogress);                  __notify_progress(&subprogress, 0.0f);
6015              __notify_progress(&subprogress, 1.0f);                  LoadInstruments(&subprogress);
6016                    __notify_progress(&subprogress, 1.0f);
6017                } else {
6018                    // sample loading subtask
6019                    if (GetAutoLoad())
6020                        GetFirstSample(); // now force all samples to be loaded
6021    
6022                    // instrument loading subtask
6023                    LoadInstruments();
6024                }
6025          }          }
6026          if (!pInstruments) return NULL;          if (!pInstruments) return NULL;
6027          InstrumentsIterator = pInstruments->begin();          InstrumentsIterator = pInstruments->begin();
# Line 5999  namespace { Line 6170  namespace {
6170          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), (DLS::Instrument*) pInstrument);          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), (DLS::Instrument*) pInstrument);
6171          if (iter == pInstruments->end()) throw gig::Exception("Could not delete instrument, could not find given instrument");          if (iter == pInstruments->end()) throw gig::Exception("Could not delete instrument, could not find given instrument");
6172          pInstruments->erase(iter);          pInstruments->erase(iter);
6173            pInstrument->DeleteChunks();
6174          delete pInstrument;          delete pInstrument;
6175      }      }
6176    
# Line 6014  namespace { Line 6186  namespace {
6186              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();
6187              while (lstInstr) {              while (lstInstr) {
6188                  if (lstInstr->GetListType() == LIST_TYPE_INS) {                  if (lstInstr->GetListType() == LIST_TYPE_INS) {
6189                      // notify current progress                      if (pProgress) {
6190                      const float localProgress = (float) iInstrumentIndex / (float) Instruments;                          // notify current progress
6191                      __notify_progress(pProgress, localProgress);                          const float localProgress = (float) iInstrumentIndex / (float) Instruments;
6192                            __notify_progress(pProgress, localProgress);
                     // divide local progress into subprogress for loading current Instrument  
                     progress_t subprogress;  
                     __divide_progress(pProgress, &subprogress, Instruments, iInstrumentIndex);  
6193    
6194                      pInstruments->push_back(new Instrument(this, lstInstr, &subprogress));                          // divide local progress into subprogress for loading current Instrument
6195                            progress_t subprogress;
6196                            __divide_progress(pProgress, &subprogress, Instruments, iInstrumentIndex);
6197    
6198                            pInstruments->push_back(new Instrument(this, lstInstr, &subprogress));
6199                        } else {
6200                            pInstruments->push_back(new Instrument(this, lstInstr));
6201                        }
6202    
6203                      iInstrumentIndex++;                      iInstrumentIndex++;
6204                  }                  }
6205                  lstInstr = lstInstruments->GetNextSubList();                  lstInstr = lstInstruments->GetNextSubList();
6206              }              }
6207              __notify_progress(pProgress, 1.0); // notify done              if (pProgress)
6208                    __notify_progress(pProgress, 1.0); // notify done
6209          }          }
6210      }      }
6211    
# Line 6258  namespace { Line 6435  namespace {
6435          }          }
6436          // now delete this group object          // now delete this group object
6437          pGroups->erase(iter);          pGroups->erase(iter);
6438            pGroup->DeleteChunks();
6439          delete pGroup;          delete pGroup;
6440      }      }
6441    
# Line 6279  namespace { Line 6457  namespace {
6457          // move all members of this group to another group          // move all members of this group to another group
6458          pGroup->MoveAll();          pGroup->MoveAll();
6459          pGroups->erase(iter);          pGroups->erase(iter);
6460            pGroup->DeleteChunks();
6461          delete pGroup;          delete pGroup;
6462      }      }
6463    
# Line 6378  namespace { Line 6557  namespace {
6557              pScriptGroup->DeleteScript(pScriptGroup->GetScript(i));              pScriptGroup->DeleteScript(pScriptGroup->GetScript(i));
6558          if (pScriptGroup->pList)          if (pScriptGroup->pList)
6559              pScriptGroup->pList->GetParent()->DeleteSubChunk(pScriptGroup->pList);              pScriptGroup->pList->GetParent()->DeleteSubChunk(pScriptGroup->pList);
6560            pScriptGroup->DeleteChunks();
6561          delete pScriptGroup;          delete pScriptGroup;
6562      }      }
6563    
# Line 6471  namespace { Line 6651  namespace {
6651              if (pVersion && pVersion->major > 2) {              if (pVersion && pVersion->major > 2) {
6652                  RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();                  RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();
6653                  for (int i = 0 ; i < 128 ; i++) {                  for (int i = 0 ; i < 128 ; i++) {
6654                      if (i >= pGroups->size()) ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);                      // create 128 empty placeholder strings which will either
6655                        // be filled by Group::UpdateChunks below or left empty.
6656                        ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);
6657                      if (_3gnm) _3gnm = _3gnl->GetNextSubChunk();                      if (_3gnm) _3gnm = _3gnl->GetNextSubChunk();
6658                  }                  }
6659              }              }
# Line 6641  namespace { Line 6823  namespace {
6823      }      }
6824    
6825      /**      /**
6826       * Enable / disable automatic loading. By default this properyt is       * Enable / disable automatic loading. By default this property is
6827       * enabled and all informations are loaded automatically. However       * enabled and every information is loaded automatically. However
6828       * loading all Regions, DimensionRegions and especially samples might       * loading all Regions, DimensionRegions and especially samples might
6829       * take a long time for large .gig files, and sometimes one might only       * take a long time for large .gig files, and sometimes one might only
6830       * be interested in retrieving very superficial informations like the       * be interested in retrieving very superficial informations like the
# Line 6650  namespace { Line 6832  namespace {
6832       * automatic loading to avoid very slow response times.       * automatic loading to avoid very slow response times.
6833       *       *
6834       * @e CAUTION: by disabling this property many pointers (i.e. sample       * @e CAUTION: by disabling this property many pointers (i.e. sample
6835       * references) and informations will have invalid or even undefined       * references) and attributes will have invalid or even undefined
6836       * data! This feature is currently only intended for retrieving very       * data! This feature is currently only intended for retrieving very
6837       * 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
6838       * details like synthesis informations or even to modify .gig files!       * details like synthesis information or even to modify .gig files!
6839       */       */
6840      void File::SetAutoLoad(bool b) {      void File::SetAutoLoad(bool b) {
6841          bAutoLoad = b;          bAutoLoad = b;
Legend:
Removed from v.3475  
changed lines
  Added in v.3657
  ViewVC Help
Powered by ViewVC