/[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 3198 by schoenebeck, Sun May 21 12:46:05 2017 UTC revision 3709 by schoenebeck, Fri Jan 10 11:21:59 2020 UTC
# Line 2  Line 2 
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file access library    *   *   libgig - C++ cross-platform Gigasampler format file access library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003-2017 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2019 by Christian Schoenebeck                      *
6   *                              <cuse@users.sourceforge.net>               *   *                              <cuse@users.sourceforge.net>               *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
# Line 341  namespace { Line 341  namespace {
341    
342    
343    
344    // *************** eg_opt_t ***************
345    // *
346    
347        eg_opt_t::eg_opt_t() {
348            AttackCancel     = true;
349            AttackHoldCancel = true;
350            Decay1Cancel     = true;
351            Decay2Cancel     = true;
352            ReleaseCancel    = true;
353        }
354    
355        void eg_opt_t::serialize(Serialization::Archive* archive) {
356            SRLZ(AttackCancel);
357            SRLZ(AttackHoldCancel);
358            SRLZ(Decay1Cancel);
359            SRLZ(Decay2Cancel);
360            SRLZ(ReleaseCancel);
361        }
362    
363    
364    
365  // *************** Sample ***************  // *************** Sample ***************
366  // *  // *
367    
# Line 391  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 400  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 446  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 == 3 && BitDepth == 24) {              if (version > 2 && BitDepth == 24) {
478                  Dithered = ewav->ReadInt32();                  Dithered = ewav->ReadInt32();
479                  ewav->SetPos(Channels == 2 ? 84 : 64);                  ewav->SetPos(Channels == 2 ? 84 : 64);
480                  TruncatedBits = ewav->ReadInt32();                  TruncatedBits = ewav->ReadInt32();
# Line 1479  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 1712  namespace { Line 1741  namespace {
1741              memset(DimensionUpperLimits, 127, 8);              memset(DimensionUpperLimits, 127, 8);
1742          }          }
1743    
1744            // chunk for own format extensions, these will *NOT* work with Gigasampler/GigaStudio !
1745            RIFF::Chunk* lsde = _3ewl->GetSubChunk(CHUNK_ID_LSDE);
1746            if (lsde) { // format extension for EG behavior options
1747                lsde->SetPos(0);
1748    
1749                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
1751                    unsigned char byte = lsde->ReadUint8();
1752                    pEGOpts[i]->AttackCancel     = byte & 1;
1753                    pEGOpts[i]->AttackHoldCancel = byte & (1 << 1);
1754                    pEGOpts[i]->Decay1Cancel     = byte & (1 << 2);
1755                    pEGOpts[i]->Decay2Cancel     = byte & (1 << 3);
1756                    pEGOpts[i]->ReleaseCancel    = byte & (1 << 4);
1757                }
1758            }
1759            // format extension for sustain pedal up effect on release trigger samples
1760            if (lsde && lsde->GetSize() > 3) { // NOTE: we reserved the 3rd byte for a potential future EG3 option
1761                lsde->SetPos(3);
1762                uint8_t byte = lsde->ReadUint8();
1763                SustainReleaseTrigger   = static_cast<sust_rel_trg_t>(byte & 0x03);
1764                NoNoteOffReleaseTrigger = byte >> 7;
1765            } else {
1766                SustainReleaseTrigger   = sust_rel_trg_none;
1767                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,
1794                                                       VelocityResponseCurveScaling);                                                       VelocityResponseCurveScaling);
# Line 1836  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 1854  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 1862  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 1899  namespace { Line 1983  namespace {
1983          SRLZ(MSDecode);          SRLZ(MSDecode);
1984          //SRLZ(SampleStartOffset);          //SRLZ(SampleStartOffset);
1985          SRLZ(SampleAttenuation);          SRLZ(SampleAttenuation);
1986            SRLZ(EG1Options);
1987            SRLZ(EG2Options);
1988            SRLZ(SustainReleaseTrigger);
1989            SRLZ(NoNoteOffReleaseTrigger);
1990    
1991          // derived attributes from DLS::Sampler          // derived attributes from DLS::Sampler
1992          SRLZ(FineTune);          SRLZ(FineTune);
# Line 1938  namespace { Line 2026  namespace {
2026          RIFF::Chunk* _3ewa = pParentList->GetSubChunk(CHUNK_ID_3EWA);          RIFF::Chunk* _3ewa = pParentList->GetSubChunk(CHUNK_ID_3EWA);
2027          if (!_3ewa) {          if (!_3ewa) {
2028              File* pFile = (File*) GetParent()->GetParent()->GetParent();              File* pFile = (File*) GetParent()->GetParent()->GetParent();
2029              bool version3 = pFile->pVersion && pFile->pVersion->major == 3;              bool versiongt2 = pFile->pVersion && pFile->pVersion->major > 2;
2030              _3ewa = pParentList->AddSubChunk(CHUNK_ID_3EWA, version3 ? 148 : 140);              _3ewa = pParentList->AddSubChunk(CHUNK_ID_3EWA, versiongt2 ? 148 : 140);
2031          }          }
2032          pData = (uint8_t*) _3ewa->LoadChunkData();          pData = (uint8_t*) _3ewa->LoadChunkData();
2033    
# Line 2205  namespace { Line 2293  namespace {
2293          if (chunksize >= 148) {          if (chunksize >= 148) {
2294              memcpy(&pData[140], DimensionUpperLimits, 8);              memcpy(&pData[140], DimensionUpperLimits, 8);
2295          }          }
2296    
2297            // chunk for own format extensions, these will *NOT* work with
2298            // Gigasampler/GigaStudio !
2299            RIFF::Chunk* lsde = pParentList->GetSubChunk(CHUNK_ID_LSDE);
2300            const int lsdeSize =
2301                3 /* EG cancel options */ +
2302                1 /* sustain pedal up on release trigger option */ +
2303                8 /* LFOs' wave forms */ + 12 /* LFOs' phase */ + 4 /* flags (LFO3FlipPhase) */;
2304            if (!lsde && UsesAnyGigFormatExtension()) {
2305                // only add this "LSDE" chunk if there is some (format extension)
2306                // setting effective that would require our "LSDE" format extension
2307                // chunk to be stored
2308                lsde = pParentList->AddSubChunk(CHUNK_ID_LSDE, lsdeSize);
2309                // move LSDE chunk to the end of parent list
2310                pParentList->MoveSubChunk(lsde, (RIFF::Chunk*)NULL);
2311            }
2312            if (lsde) {
2313                if (lsde->GetNewSize() < lsdeSize)
2314                    lsde->Resize(lsdeSize);
2315                // format extension for EG behavior options
2316                unsigned char* pData = (unsigned char*) lsde->LoadChunkData();
2317                eg_opt_t* pEGOpts[2] = { &EG1Options, &EG2Options };
2318                for (int i = 0; i < 2; ++i) { // NOTE: we reserved the 3rd byte for a potential future EG3 option
2319                    pData[i] =
2320                        (pEGOpts[i]->AttackCancel     ? 1 : 0) |
2321                        (pEGOpts[i]->AttackHoldCancel ? (1<<1) : 0) |
2322                        (pEGOpts[i]->Decay1Cancel     ? (1<<2) : 0) |
2323                        (pEGOpts[i]->Decay2Cancel     ? (1<<3) : 0) |
2324                        (pEGOpts[i]->ReleaseCancel    ? (1<<4) : 0);
2325                }
2326                // format extension for release trigger options
2327                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) {
# Line 2244  namespace { Line 2408  namespace {
2408      // get the corresponding velocity table from the table map or create & calculate that table if it doesn't exist yet      // get the corresponding velocity table from the table map or create & calculate that table if it doesn't exist yet
2409      double* DimensionRegion::GetVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling)      double* DimensionRegion::GetVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling)
2410      {      {
2411            // sanity check input parameters
2412            // (fallback to some default parameters on ill input)
2413            switch (curveType) {
2414                case curve_type_nonlinear:
2415                case curve_type_linear:
2416                    if (depth > 4) {
2417                        printf("Warning: Invalid depth (0x%x) for velocity curve type (0x%x).\n", depth, curveType);
2418                        depth   = 0;
2419                        scaling = 0;
2420                    }
2421                    break;
2422                case curve_type_special:
2423                    if (depth > 5) {
2424                        printf("Warning: Invalid depth (0x%x) for velocity curve type 'special'.\n", depth);
2425                        depth   = 0;
2426                        scaling = 0;
2427                    }
2428                    break;
2429                case curve_type_unknown:
2430                default:
2431                    printf("Warning: Unknown velocity curve type (0x%x).\n", curveType);
2432                    curveType = curve_type_linear;
2433                    depth     = 0;
2434                    scaling   = 0;
2435                    break;
2436            }
2437    
2438          double* table;          double* table;
2439          uint32_t tableKey = (curveType<<16) | (depth<<8) | scaling;          uint32_t tableKey = (curveType<<16) | (depth<<8) | scaling;
2440          if (pVelocityTables->count(tableKey)) { // if key exists          if (pVelocityTables->count(tableKey)) { // if key exists
# Line 2619  namespace { Line 2810  namespace {
2810    
2811              // unknown controller type              // unknown controller type
2812              default:              default:
2813                  throw gig::Exception("Unknown leverage controller type (0x%x).", EncodedController);                  decodedcontroller.type = leverage_ctrl_t::type_none;
2814                    decodedcontroller.controller_number = 0;
2815                    printf("Warning: Unknown leverage controller type (0x%x).\n", EncodedController);
2816                    break;
2817          }          }
2818          return decodedcontroller;          return decodedcontroller;
2819      }      }
# Line 3113  namespace { Line 3307  namespace {
3307          }          }
3308          Layers = 1;          Layers = 1;
3309          File* file = (File*) GetParent()->GetParent();          File* file = (File*) GetParent()->GetParent();
3310          int dimensionBits = (file->pVersion && file->pVersion->major == 3) ? 8 : 5;          int dimensionBits = (file->pVersion && file->pVersion->major > 2) ? 8 : 5;
3311    
3312          // Actual Loading          // Actual Loading
3313    
# Line 3123  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 3157  namespace { Line 3353  namespace {
3353              UpdateVelocityTable();              UpdateVelocityTable();
3354    
3355              // jump to start of the wave pool indices (if not already there)              // jump to start of the wave pool indices (if not already there)
3356              if (file->pVersion && file->pVersion->major == 3)              if (file->pVersion && file->pVersion->major > 2)
3357                  _3lnk->SetPos(68); // version 3 has a different 3lnk structure                  _3lnk->SetPos(68); // version 3 has a different 3lnk structure
3358              else              else
3359                  _3lnk->SetPos(44);                  _3lnk->SetPos(44);
# Line 3166  namespace { Line 3362  namespace {
3362              if (file->GetAutoLoad()) {              if (file->GetAutoLoad()) {
3363                  for (uint i = 0; i < DimensionRegions; i++) {                  for (uint i = 0; i < DimensionRegions; i++) {
3364                      uint32_t wavepoolindex = _3lnk->ReadUint32();                      uint32_t wavepoolindex = _3lnk->ReadUint32();
3365                      if (file->pWavePoolTable) pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);                      if (file->pWavePoolTable && pDimensionRegions[i])
3366                            pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
3367                  }                  }
3368                  GetSample(); // load global region sample reference                  GetSample(); // load global region sample reference
3369              }              }
# Line 3215  namespace { Line 3412  namespace {
3412          }          }
3413    
3414          File* pFile = (File*) GetParent()->GetParent();          File* pFile = (File*) GetParent()->GetParent();
3415          bool version3 = pFile->pVersion && pFile->pVersion->major == 3;          const bool versiongt2 = pFile->pVersion && pFile->pVersion->major > 2;
3416          const int iMaxDimensions =  version3 ? 8 : 5;          const int iMaxDimensions =  versiongt2 ? 8 : 5;
3417          const int iMaxDimensionRegions = version3 ? 256 : 32;          const int iMaxDimensionRegions = versiongt2 ? 256 : 32;
3418    
3419          // make sure '3lnk' chunk exists          // make sure '3lnk' chunk exists
3420          RIFF::Chunk* _3lnk = pCkRegion->GetSubChunk(CHUNK_ID_3LNK);          RIFF::Chunk* _3lnk = pCkRegion->GetSubChunk(CHUNK_ID_3LNK);
3421          if (!_3lnk) {          if (!_3lnk) {
3422              const int _3lnkChunkSize = version3 ? 1092 : 172;              const int _3lnkChunkSize = versiongt2 ? 1092 : 172;
3423              _3lnk = pCkRegion->AddSubChunk(CHUNK_ID_3LNK, _3lnkChunkSize);              _3lnk = pCkRegion->AddSubChunk(CHUNK_ID_3LNK, _3lnkChunkSize);
3424              memset(_3lnk->LoadChunkData(), 0, _3lnkChunkSize);              memset(_3lnk->LoadChunkData(), 0, _3lnkChunkSize);
3425    
# Line 3246  namespace { Line 3443  namespace {
3443          }          }
3444    
3445          // update wave pool table in '3lnk' chunk          // update wave pool table in '3lnk' chunk
3446          const int iWavePoolOffset = version3 ? 68 : 44;          const int iWavePoolOffset = versiongt2 ? 68 : 44;
3447          for (uint i = 0; i < iMaxDimensionRegions; i++) {          for (uint i = 0; i < iMaxDimensionRegions; i++) {
3448              int iWaveIndex = -1;              int iWaveIndex = -1;
3449              if (i < DimensionRegions) {              if (i < DimensionRegions) {
# Line 3262  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 3389  namespace { Line 3612  namespace {
3612    
3613          // check if max. amount of dimensions reached          // check if max. amount of dimensions reached
3614          File* file = (File*) GetParent()->GetParent();          File* file = (File*) GetParent()->GetParent();
3615          const int iMaxDimensions = (file->pVersion && file->pVersion->major == 3) ? 8 : 5;          const int iMaxDimensions = (file->pVersion && file->pVersion->major > 2) ? 8 : 5;
3616          if (Dimensions >= iMaxDimensions)          if (Dimensions >= iMaxDimensions)
3617              throw gig::Exception("Could not add new dimension, max. amount of " + ToString(iMaxDimensions) + " dimensions already reached");              throw gig::Exception("Could not add new dimension, max. amount of " + ToString(iMaxDimensions) + " dimensions already reached");
3618          // check if max. amount of dimension bits reached          // check if max. amount of dimension bits reached
# Line 3681  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 3799  namespace { Line 4023  namespace {
4023          // now tempRegion's dimensions and DimensionRegions basically reflect          // now tempRegion's dimensions and DimensionRegions basically reflect
4024          // what we wanted to get for this actual Region here, so we now just          // what we wanted to get for this actual Region here, so we now just
4025          // delete and recreate the dimension in question with the new amount          // delete and recreate the dimension in question with the new amount
4026          // zones and then copy back from tempRegion                // zones and then copy back from tempRegion. we're actually deleting and
4027          DeleteDimension(oldDef);          // recreating all dimensions here, to avoid altering the precise order
4028          AddDimension(&newDef);          // of the dimensions (which would not be an error per so, but it would
4029            // cause usability issues with instrument editors)
4030            {
4031                std::vector<dimension_def_t> oldDefs;
4032                for (int i = 0; i < Dimensions; ++i)
4033                    oldDefs.push_back(pDimensionDefinitions[i]); // copy, don't reference
4034                for (int i = Dimensions - 1; i >= 0; --i)
4035                    DeleteDimension(&pDimensionDefinitions[i]);
4036                for (int i = 0; i < oldDefs.size(); ++i) {
4037                    dimension_def_t& def = oldDefs[i];
4038                    AddDimension(
4039                        (def.dimension == newDef.dimension) ? &newDef : &def
4040                    );
4041                }
4042            }
4043          for (int iSrc = 0; iSrc < 256; ++iSrc) {          for (int iSrc = 0; iSrc < 256; ++iSrc) {
4044              DimensionRegion* srcDimRgn = tempRgn->pDimensionRegions[iSrc];              DimensionRegion* srcDimRgn = tempRgn->pDimensionRegions[iSrc];
4045              if (!srcDimRgn) continue;              if (!srcDimRgn) continue;
# Line 3820  namespace { Line 4058  namespace {
4058          }          }
4059    
4060          // delete temporary region          // delete temporary region
4061            tempRgn->DeleteChunks();
4062          delete tempRgn;          delete tempRgn;
4063    
4064          UpdateVelocityTable();          UpdateVelocityTable();
# Line 4047  namespace { Line 4286  namespace {
4286          if ((int32_t)WavePoolTableIndex == -1) return NULL;          if ((int32_t)WavePoolTableIndex == -1) return NULL;
4287          File* file = (File*) GetParent()->GetParent();          File* file = (File*) GetParent()->GetParent();
4288          if (!file->pWavePoolTable) return NULL;          if (!file->pWavePoolTable) return NULL;
4289            if (WavePoolTableIndex + 1 > file->WavePoolCount) return NULL;
4290          // for new files or files >= 2 GB use 64 bit wave pool offsets          // for new files or files >= 2 GB use 64 bit wave pool offsets
4291          if (file->pRIFF->IsNew() || (file->pRIFF->GetCurrentFileSize() >> 31)) {          if (file->pRIFF->IsNew() || (file->pRIFF->GetCurrentFileSize() >> 31)) {
4292              // use 64 bit wave pool offsets (treating this as large file)              // use 64 bit wave pool offsets (treating this as large file)
# Line 4297  namespace { Line 4537  namespace {
4537          pGroup = group;          pGroup = group;
4538          pChunk = ckScri;          pChunk = ckScri;
4539          if (ckScri) { // object is loaded from file ...          if (ckScri) { // object is loaded from file ...
4540                ckScri->SetPos(0);
4541    
4542              // read header              // read header
4543              uint32_t headerSize = ckScri->ReadUint32();              uint32_t headerSize = ckScri->ReadUint32();
4544              Compression = (Compression_t) ckScri->ReadUint32();              Compression = (Compression_t) ckScri->ReadUint32();
# Line 4349  namespace { Line 4591  namespace {
4591          memcpy(&data[0], &text[0], text.size());          memcpy(&data[0], &text[0], text.size());
4592      }      }
4593    
4594        /** @brief Remove all RIFF chunks associated with this Script object.
4595         *
4596         * At the moment Script::DeleteChunks() does nothing. It is
4597         * recommended to call this method explicitly though from deriving classes's
4598         * own overridden implementation of this method to avoid potential future
4599         * compatiblity issues.
4600         *
4601         * See DLS::Storage::DeleteChunks() for details.
4602         */
4603        void Script::DeleteChunks() {
4604        }
4605    
4606      /**      /**
4607       * Apply this script to the respective RIFF chunks. You have to call       * Apply this script to the respective RIFF chunks. You have to call
4608       * File::Save() to make changes persistent.       * File::Save() to make changes persistent.
# Line 4464  namespace { Line 4718  namespace {
4718          }          }
4719      }      }
4720    
4721        /** @brief Remove all RIFF chunks associated with this ScriptGroup object.
4722         *
4723         * At the moment ScriptGroup::DeleteChunks() does nothing. It is
4724         * recommended to call this method explicitly though from deriving classes's
4725         * own overridden implementation of this method to avoid potential future
4726         * compatiblity issues.
4727         *
4728         * See DLS::Storage::DeleteChunks() for details.
4729         */
4730        void ScriptGroup::DeleteChunks() {
4731        }
4732    
4733      /**      /**
4734       * 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
4735       * File::Save() to make changes persistent.       * File::Save() to make changes persistent.
# Line 4588  namespace { Line 4854  namespace {
4854          if (lart) {          if (lart) {
4855              RIFF::Chunk* _3ewg = lart->GetSubChunk(CHUNK_ID_3EWG);              RIFF::Chunk* _3ewg = lart->GetSubChunk(CHUNK_ID_3EWG);
4856              if (_3ewg) {              if (_3ewg) {
4857                    _3ewg->SetPos(0);
4858    
4859                  EffectSend             = _3ewg->ReadUint16();                  EffectSend             = _3ewg->ReadUint16();
4860                  Attenuation            = _3ewg->ReadInt32();                  Attenuation            = _3ewg->ReadInt32();
4861                  FineTune               = _3ewg->ReadInt16();                  FineTune               = _3ewg->ReadInt16();
# Line 4632  namespace { Line 4900  namespace {
4900                  RIFF::List* rgn = lrgn->GetFirstSubList();                  RIFF::List* rgn = lrgn->GetFirstSubList();
4901                  while (rgn) {                  while (rgn) {
4902                      if (rgn->GetListType() == LIST_TYPE_RGN) {                      if (rgn->GetListType() == LIST_TYPE_RGN) {
4903                          __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);                          if (pProgress)
4904                                __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);
4905                          pRegions->push_back(new Region(this, rgn));                          pRegions->push_back(new Region(this, rgn));
4906                      }                      }
4907                      rgn = lrgn->GetNextSubList();                      rgn = lrgn->GetNextSubList();
# Line 4647  namespace { Line 4916  namespace {
4916          if (lst3LS) {          if (lst3LS) {
4917              RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);              RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);
4918              if (ckSCSL) {              if (ckSCSL) {
4919                    ckSCSL->SetPos(0);
4920    
4921                  int headerSize = ckSCSL->ReadUint32();                  int headerSize = ckSCSL->ReadUint32();
4922                  int slotCount  = ckSCSL->ReadUint32();                  int slotCount  = ckSCSL->ReadUint32();
4923                  if (slotCount) {                  if (slotCount) {
# Line 4664  namespace { Line 4935  namespace {
4935              }              }
4936          }          }
4937    
4938          __notify_progress(pProgress, 1.0f); // notify done          if (pProgress)
4939                __notify_progress(pProgress, 1.0f); // notify done
4940      }      }
4941    
4942      void Instrument::UpdateRegionKeyTable() {      void Instrument::UpdateRegionKeyTable() {
# Line 4673  namespace { Line 4945  namespace {
4945          RegionList::iterator end  = pRegions->end();          RegionList::iterator end  = pRegions->end();
4946          for (; iter != end; ++iter) {          for (; iter != end; ++iter) {
4947              gig::Region* pRegion = static_cast<gig::Region*>(*iter);              gig::Region* pRegion = static_cast<gig::Region*>(*iter);
4948              for (int iKey = pRegion->KeyRange.low; iKey <= pRegion->KeyRange.high; iKey++) {              const int low  = std::max(int(pRegion->KeyRange.low), 0);
4949                const int high = std::min(int(pRegion->KeyRange.high), 127);
4950                for (int iKey = low; iKey <= high; iKey++) {
4951                  RegionKeyTable[iKey] = pRegion;                  RegionKeyTable[iKey] = pRegion;
4952              }              }
4953          }          }
# Line 4718  namespace { Line 4992  namespace {
4992              File* pFile = (File*) GetParent();              File* pFile = (File*) GetParent();
4993    
4994              // 3ewg is bigger in gig3, as it includes the iMIDI rules              // 3ewg is bigger in gig3, as it includes the iMIDI rules
4995              int size = (pFile->pVersion && pFile->pVersion->major == 3) ? 16416 : 12;              int size = (pFile->pVersion && pFile->pVersion->major > 2) ? 16416 : 12;
4996              _3ewg = lart->AddSubChunk(CHUNK_ID_3EWG, size);              _3ewg = lart->AddSubChunk(CHUNK_ID_3EWG, size);
4997              memset(_3ewg->LoadChunkData(), 0, size);              memset(_3ewg->LoadChunkData(), 0, size);
4998          }          }
# Line 5275  namespace { Line 5549  namespace {
5549          ::LoadString(pNameChunk, Name);          ::LoadString(pNameChunk, Name);
5550      }      }
5551    
5552        /** @brief Destructor.
5553         *
5554         * Currently this destructor implementation does nothing.
5555         */
5556      Group::~Group() {      Group::~Group() {
5557          // remove the chunk associated with this group (if any)      }
5558          if (pNameChunk) pNameChunk->GetParent()->DeleteSubChunk(pNameChunk);  
5559        /** @brief Remove all RIFF chunks associated with this Group object.
5560         *
5561         * See DLS::Storage::DeleteChunks() for details.
5562         */
5563        void Group::DeleteChunks() {
5564            // handle own RIFF chunks
5565            if (pNameChunk) {
5566                pNameChunk->GetParent()->DeleteSubChunk(pNameChunk);
5567                pNameChunk = NULL;
5568            }
5569      }      }
5570    
5571      /** @brief Update chunks with current group settings.      /** @brief Update chunks with current group settings.
# Line 5300  namespace { Line 5588  namespace {
5588          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);
5589          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);
5590    
5591          if (!pNameChunk && pFile->pVersion && pFile->pVersion->major == 3) {          if (!pNameChunk && pFile->pVersion && pFile->pVersion->major > 2) {
5592              // v3 has a fixed list of 128 strings, find a free one              // v3 has a fixed list of 128 strings, find a free one
5593              for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {              for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {
5594                  if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {                  if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {
# Line 5395  namespace { Line 5683  namespace {
5683          0, 3, 20030331 & 0xffff, 20030331 >> 16          0, 3, 20030331 & 0xffff, 20030331 >> 16
5684      };      };
5685    
5686        /// Reflects Gigasampler file format version 4.0 (2007-10-12).
5687        const DLS::version_t File::VERSION_4 = {
5688            0, 4, 20071012 & 0xffff, 20071012 >> 16
5689        };
5690    
5691      static const DLS::Info::string_length_t _FileFixedStringLengths[] = {      static const DLS::Info::string_length_t _FileFixedStringLengths[] = {
5692          { CHUNK_ID_IARL, 256 },          { CHUNK_ID_IARL, 256 },
5693          { CHUNK_ID_IART, 128 },          { CHUNK_ID_IART, 128 },
# Line 5491  namespace { Line 5784  namespace {
5784          return static_cast<gig::Sample*>( *it );          return static_cast<gig::Sample*>( *it );
5785      }      }
5786    
5787        /**
5788         * Returns the total amount of samples of this gig file.
5789         *
5790         * Note that this method might block for a long time in case it is required
5791         * to load the sample info for the first time.
5792         *
5793         * @returns total amount of samples
5794         */
5795        size_t File::CountSamples() {
5796            if (!pSamples) LoadSamples();
5797            if (!pSamples) return 0;
5798            return pSamples->size();
5799        }
5800    
5801      /** @brief Add a new sample.      /** @brief Add a new sample.
5802       *       *
5803       * This will create a new Sample object for the gig file. You have to       * This will create a new Sample object for the gig file. You have to
# Line 5529  namespace { Line 5836  namespace {
5836          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");
5837          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation
5838          pSamples->erase(iter);          pSamples->erase(iter);
5839            pSample->DeleteChunks();
5840          delete pSample;          delete pSample;
5841    
5842          SampleList::iterator tmp = SamplesIterator;          SampleList::iterator tmp = SamplesIterator;
# Line 5566  namespace { Line 5874  namespace {
5874          int iSampleIndex  = 0;          int iSampleIndex  = 0;
5875          int iTotalSamples = WavePoolCount;          int iTotalSamples = WavePoolCount;
5876    
5877          // check if samples should be loaded from extension files          // just for assembling path of optional extension files to be read
5878          // (only for old gig files < 2 GB)          const std::string folder = parentPath(pRIFF->GetFileName());
5879          int lastFileNo = 0;          const std::string baseName = pathWithoutExtension(pRIFF->GetFileName());
5880          if (!file->IsNew() && !(file->GetCurrentFileSize() >> 31)) {  
5881              for (int i = 0 ; i < WavePoolCount ; i++) {          // the main gig file and the extension files (.gx01, ... , .gx98) may
5882                  if (pWavePoolTableHi[i] > lastFileNo) lastFileNo = pWavePoolTableHi[i];          // contain wave data (wave pool)
5883              }          std::vector<RIFF::File*> poolFiles;
5884          }          poolFiles.push_back(pRIFF);
5885          String name(pRIFF->GetFileName());  
5886          int nameLen = (int) name.length();          // get info about all extension files
5887          char suffix[6];          RIFF::Chunk* ckXfil = pRIFF->GetSubChunk(CHUNK_ID_XFIL);
5888          if (nameLen > 4 && name.substr(nameLen - 4) == ".gig") nameLen -= 4;          if (ckXfil) { // there are extension files (.gx01, ... , .gx98) ...
5889                const uint32_t n = ckXfil->ReadInt32();
5890          for (int fileNo = 0 ; ; ) {              for (int i = 0; i < n; i++) {
5891                    // read the filename and load the extension file
5892                    std::string name;
5893                    ckXfil->ReadString(name, 128);
5894                    std::string path = concatPath(folder, name);
5895                    RIFF::File* pExtFile = new RIFF::File(path);
5896                    // check that the dlsids match
5897                    RIFF::Chunk* ckDLSID = pExtFile->GetSubChunk(CHUNK_ID_DLID);
5898                    if (ckDLSID) {
5899                        ::DLS::dlsid_t idExpected;
5900                        idExpected.ulData1 = ckXfil->ReadInt32();
5901                        idExpected.usData2 = ckXfil->ReadInt16();
5902                        idExpected.usData3 = ckXfil->ReadInt16();
5903                        ckXfil->Read(idExpected.abData, 8, 1);
5904                        ::DLS::dlsid_t idFound;
5905                        ckDLSID->Read(&idFound.ulData1, 1, 4);
5906                        ckDLSID->Read(&idFound.usData2, 1, 2);
5907                        ckDLSID->Read(&idFound.usData3, 1, 2);
5908                        ckDLSID->Read(idFound.abData, 8, 1);
5909                        if (memcmp(&idExpected, &idFound, 16) != 0)
5910                            throw gig::Exception("dlsid mismatch for extension file: %s", path.c_str());
5911                    }
5912                    poolFiles.push_back(pExtFile);
5913                    ExtensionFiles.push_back(pExtFile);
5914                }
5915            }
5916    
5917            // check if a .gx99 (GigaPulse) file exists
5918            RIFF::Chunk* ckDoxf = pRIFF->GetSubChunk(CHUNK_ID_DOXF);
5919            if (ckDoxf) { // there is a .gx99 (GigaPulse) file ...
5920                std::string path = baseName + ".gx99";
5921                RIFF::File* pExtFile = new RIFF::File(path);
5922    
5923                // skip unused int and filename
5924                ckDoxf->SetPos(132, RIFF::stream_curpos);
5925    
5926                // check that the dlsids match
5927                RIFF::Chunk* ckDLSID = pExtFile->GetSubChunk(CHUNK_ID_DLID);
5928                if (ckDLSID) {
5929                    ::DLS::dlsid_t idExpected;
5930                    idExpected.ulData1 = ckDoxf->ReadInt32();
5931                    idExpected.usData2 = ckDoxf->ReadInt16();
5932                    idExpected.usData3 = ckDoxf->ReadInt16();
5933                    ckDoxf->Read(idExpected.abData, 8, 1);
5934                    ::DLS::dlsid_t idFound;
5935                    ckDLSID->Read(&idFound.ulData1, 1, 4);
5936                    ckDLSID->Read(&idFound.usData2, 1, 2);
5937                    ckDLSID->Read(&idFound.usData3, 1, 2);
5938                    ckDLSID->Read(idFound.abData, 8, 1);
5939                    if (memcmp(&idExpected, &idFound, 16) != 0)
5940                        throw gig::Exception("dlsid mismatch for GigaPulse file: %s", path.c_str());
5941                }
5942                poolFiles.push_back(pExtFile);
5943                ExtensionFiles.push_back(pExtFile);
5944            }
5945    
5946            // load samples from extension files (if required)
5947            for (int i = 0; i < poolFiles.size(); i++) {
5948                RIFF::File* file = poolFiles[i];
5949              RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);              RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);
5950              if (wvpl) {              if (wvpl) {
5951                  file_offset_t wvplFileOffset = wvpl->GetFilePos();                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -
5952                                                   wvpl->GetPos(); // should be zero, but just to be sure
5953                  RIFF::List* wave = wvpl->GetFirstSubList();                  RIFF::List* wave = wvpl->GetFirstSubList();
5954                  while (wave) {                  while (wave) {
5955                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
5956                          // notify current progress                          // notify current progress
5957                          const float subprogress = (float) iSampleIndex / (float) iTotalSamples;                          if (pProgress) {
5958                          __notify_progress(pProgress, subprogress);                              const float subprogress = (float) iSampleIndex / (float) iTotalSamples;
5959                                __notify_progress(pProgress, subprogress);
5960                            }
5961    
5962                          file_offset_t waveFileOffset = wave->GetFilePos();                          file_offset_t waveFileOffset = wave->GetFilePos();
5963                          pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, fileNo, iSampleIndex));                          pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, i, iSampleIndex));
5964    
5965                          iSampleIndex++;                          iSampleIndex++;
5966                      }                      }
5967                      wave = wvpl->GetNextSubList();                      wave = wvpl->GetNextSubList();
5968                  }                  }
5969                }
                 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;  
5970          }          }
5971    
5972          __notify_progress(pProgress, 1.0); // notify done          if (pProgress)
5973                __notify_progress(pProgress, 1.0); // notify done
5974      }      }
5975    
5976      Instrument* File::GetFirstInstrument() {      Instrument* File::GetFirstInstrument() {
# Line 5626  namespace { Line 5987  namespace {
5987      }      }
5988    
5989      /**      /**
5990         * Returns the total amount of instruments of this gig file.
5991         *
5992         * Note that this method might block for a long time in case it is required
5993         * to load the instruments info for the first time.
5994         *
5995         * @returns total amount of instruments
5996         */
5997        size_t File::CountInstruments() {
5998            if (!pInstruments) LoadInstruments();
5999            if (!pInstruments) return 0;
6000            return pInstruments->size();
6001        }
6002    
6003        /**
6004       * Returns the instrument with the given index.       * Returns the instrument with the given index.
6005       *       *
6006       * @param index     - number of the sought instrument (0..n)       * @param index     - number of the sought instrument (0..n)
# Line 5636  namespace { Line 6011  namespace {
6011          if (!pInstruments) {          if (!pInstruments) {
6012              // 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)
6013    
6014              // sample loading subtask              if (pProgress) {
6015              progress_t subprogress;                  // sample loading subtask
6016              __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask                  progress_t subprogress;
6017              __notify_progress(&subprogress, 0.0f);                  __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask
6018              if (GetAutoLoad())                  __notify_progress(&subprogress, 0.0f);
6019                  GetFirstSample(&subprogress); // now force all samples to be loaded                  if (GetAutoLoad())
6020              __notify_progress(&subprogress, 1.0f);                      GetFirstSample(&subprogress); // now force all samples to be loaded
6021                    __notify_progress(&subprogress, 1.0f);
6022              // instrument loading subtask  
6023              if (pProgress && pProgress->callback) {                  // instrument loading subtask
6024                  subprogress.__range_min = subprogress.__range_max;                  if (pProgress->callback) {
6025                  subprogress.__range_max = pProgress->__range_max; // schedule remaining percentage for this subtask                      subprogress.__range_min = subprogress.__range_max;
6026              }                      subprogress.__range_max = pProgress->__range_max; // schedule remaining percentage for this subtask
6027              __notify_progress(&subprogress, 0.0f);                  }
6028              LoadInstruments(&subprogress);                  __notify_progress(&subprogress, 0.0f);
6029              __notify_progress(&subprogress, 1.0f);                  LoadInstruments(&subprogress);
6030                    __notify_progress(&subprogress, 1.0f);
6031                } else {
6032                    // sample loading subtask
6033                    if (GetAutoLoad())
6034                        GetFirstSample(); // now force all samples to be loaded
6035    
6036                    // instrument loading subtask
6037                    LoadInstruments();
6038                }
6039          }          }
6040          if (!pInstruments) return NULL;          if (!pInstruments) return NULL;
6041          InstrumentsIterator = pInstruments->begin();          InstrumentsIterator = pInstruments->begin();
# Line 5800  namespace { Line 6184  namespace {
6184          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), (DLS::Instrument*) pInstrument);          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), (DLS::Instrument*) pInstrument);
6185          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");
6186          pInstruments->erase(iter);          pInstruments->erase(iter);
6187            pInstrument->DeleteChunks();
6188          delete pInstrument;          delete pInstrument;
6189      }      }
6190    
# Line 5815  namespace { Line 6200  namespace {
6200              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();
6201              while (lstInstr) {              while (lstInstr) {
6202                  if (lstInstr->GetListType() == LIST_TYPE_INS) {                  if (lstInstr->GetListType() == LIST_TYPE_INS) {
6203                      // notify current progress                      if (pProgress) {
6204                      const float localProgress = (float) iInstrumentIndex / (float) Instruments;                          // notify current progress
6205                      __notify_progress(pProgress, localProgress);                          const float localProgress = (float) iInstrumentIndex / (float) Instruments;
6206                            __notify_progress(pProgress, localProgress);
                     // divide local progress into subprogress for loading current Instrument  
                     progress_t subprogress;  
                     __divide_progress(pProgress, &subprogress, Instruments, iInstrumentIndex);  
6207    
6208                      pInstruments->push_back(new Instrument(this, lstInstr, &subprogress));                          // divide local progress into subprogress for loading current Instrument
6209                            progress_t subprogress;
6210                            __divide_progress(pProgress, &subprogress, Instruments, iInstrumentIndex);
6211    
6212                            pInstruments->push_back(new Instrument(this, lstInstr, &subprogress));
6213                        } else {
6214                            pInstruments->push_back(new Instrument(this, lstInstr));
6215                        }
6216    
6217                      iInstrumentIndex++;                      iInstrumentIndex++;
6218                  }                  }
6219                  lstInstr = lstInstruments->GetNextSubList();                  lstInstr = lstInstruments->GetNextSubList();
6220              }              }
6221              __notify_progress(pProgress, 1.0); // notify done              if (pProgress)
6222                    __notify_progress(pProgress, 1.0); // notify done
6223          }          }
6224      }      }
6225    
# Line 5944  namespace { Line 6334  namespace {
6334              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);
6335              // the order of einf and 3crc is not the same in v2 and v3              // the order of einf and 3crc is not the same in v2 and v3
6336              RIFF::Chunk* einf = pRIFF->GetSubChunk(CHUNK_ID_EINF);              RIFF::Chunk* einf = pRIFF->GetSubChunk(CHUNK_ID_EINF);
6337              if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);              if (einf && pVersion && pVersion->major > 2) pRIFF->MoveSubChunk(_3crc, einf);
6338              bRequiresSave = true;              bRequiresSave = true;
6339          } else if (_3crc->GetNewSize() != pSamples->size() * 8) {          } else if (_3crc->GetNewSize() != pSamples->size() * 8) {
6340              _3crc->Resize(pSamples->size() * 8);              _3crc->Resize(pSamples->size() * 8);
# Line 6059  namespace { Line 6449  namespace {
6449          }          }
6450          // now delete this group object          // now delete this group object
6451          pGroups->erase(iter);          pGroups->erase(iter);
6452            pGroup->DeleteChunks();
6453          delete pGroup;          delete pGroup;
6454      }      }
6455    
# Line 6080  namespace { Line 6471  namespace {
6471          // move all members of this group to another group          // move all members of this group to another group
6472          pGroup->MoveAll();          pGroup->MoveAll();
6473          pGroups->erase(iter);          pGroups->erase(iter);
6474            pGroup->DeleteChunks();
6475          delete pGroup;          delete pGroup;
6476      }      }
6477    
# Line 6093  namespace { Line 6485  namespace {
6485                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();
6486                  while (ck) {                  while (ck) {
6487                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {
6488                          if (pVersion && pVersion->major == 3 &&                          if (pVersion && pVersion->major > 2 &&
6489                              strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;                              strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;
6490    
6491                          pGroups->push_back(new Group(this, ck));                          pGroups->push_back(new Group(this, ck));
# Line 6179  namespace { Line 6571  namespace {
6571              pScriptGroup->DeleteScript(pScriptGroup->GetScript(i));              pScriptGroup->DeleteScript(pScriptGroup->GetScript(i));
6572          if (pScriptGroup->pList)          if (pScriptGroup->pList)
6573              pScriptGroup->pList->GetParent()->DeleteSubChunk(pScriptGroup->pList);              pScriptGroup->pList->GetParent()->DeleteSubChunk(pScriptGroup->pList);
6574            pScriptGroup->DeleteChunks();
6575          delete pScriptGroup;          delete pScriptGroup;
6576      }      }
6577    
# Line 6269  namespace { Line 6662  namespace {
6662    
6663              // v3: make sure the file has 128 3gnm chunks              // v3: make sure the file has 128 3gnm chunks
6664              // (before updating the Group chunks)              // (before updating the Group chunks)
6665              if (pVersion && pVersion->major == 3) {              if (pVersion && pVersion->major > 2) {
6666                  RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();                  RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();
6667                  for (int i = 0 ; i < 128 ; i++) {                  for (int i = 0 ; i < 128 ; i++) {
6668                      if (i >= pGroups->size()) ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);                      // create 128 empty placeholder strings which will either
6669                        // be filled by Group::UpdateChunks below or left empty.
6670                        ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);
6671                      if (_3gnm) _3gnm = _3gnl->GetNextSubChunk();                      if (_3gnm) _3gnm = _3gnl->GetNextSubChunk();
6672                  }                  }
6673              }              }
# Line 6415  namespace { Line 6810  namespace {
6810          } else /*if (newFile)*/ {          } else /*if (newFile)*/ {
6811              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);
6812              // the order of einf and 3crc is not the same in v2 and v3              // the order of einf and 3crc is not the same in v2 and v3
6813              if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);              if (einf && pVersion && pVersion->major > 2) pRIFF->MoveSubChunk(_3crc, einf);
6814          }          }
6815          { // must be performed in RAM here ...          { // must be performed in RAM here ...
6816              uint32_t* pData = (uint32_t*) _3crc->LoadChunkData();              uint32_t* pData = (uint32_t*) _3crc->LoadChunkData();
# Line 6442  namespace { Line 6837  namespace {
6837      }      }
6838    
6839      /**      /**
6840       * Enable / disable automatic loading. By default this properyt is       * Enable / disable automatic loading. By default this property is
6841       * enabled and all informations are loaded automatically. However       * enabled and every information is loaded automatically. However
6842       * loading all Regions, DimensionRegions and especially samples might       * loading all Regions, DimensionRegions and especially samples might
6843       * 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
6844       * be interested in retrieving very superficial informations like the       * be interested in retrieving very superficial informations like the
# Line 6451  namespace { Line 6846  namespace {
6846       * automatic loading to avoid very slow response times.       * automatic loading to avoid very slow response times.
6847       *       *
6848       * @e CAUTION: by disabling this property many pointers (i.e. sample       * @e CAUTION: by disabling this property many pointers (i.e. sample
6849       * references) and informations will have invalid or even undefined       * references) and attributes will have invalid or even undefined
6850       * data! This feature is currently only intended for retrieving very       * data! This feature is currently only intended for retrieving very
6851       * 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
6852       * details like synthesis informations or even to modify .gig files!       * details like synthesis information or even to modify .gig files!
6853       */       */
6854      void File::SetAutoLoad(bool b) {      void File::SetAutoLoad(bool b) {
6855          bAutoLoad = b;          bAutoLoad = b;
Legend:
Removed from v.3198  
changed lines
  Added in v.3709
  ViewVC Help
Powered by ViewVC