/[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 3115 by schoenebeck, Sat Apr 15 20:17:05 2017 UTC revision 3623 by schoenebeck, Wed Oct 2 16:30:29 2019 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-2016 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 24  Line 24 
24  #include "gig.h"  #include "gig.h"
25    
26  #include "helper.h"  #include "helper.h"
27    #include "Serialization.h"
28    
29  #include <algorithm>  #include <algorithm>
30  #include <math.h>  #include <math.h>
# Line 55  Line 56 
56  #define GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(x)    ((x & 0x03) << 3)  #define GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(x)    ((x & 0x03) << 3)
57  #define GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(x)  ((x & 0x03) << 5)  #define GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(x)  ((x & 0x03) << 5)
58    
59    #define SRLZ(member) \
60        archive->serializeMember(*this, member, #member);
61    
62  namespace gig {  namespace gig {
63    
64  // *************** Internal functions for sample decompression ***************  // *************** Internal functions for sample decompression ***************
# Line 315  namespace { Line 319  namespace {
319    
320    
321    
322    // *************** leverage_ctrl_t ***************
323    // *
324    
325        void leverage_ctrl_t::serialize(Serialization::Archive* archive) {
326            SRLZ(type);
327            SRLZ(controller_number);
328        }
329    
330    
331    
332    // *************** crossfade_t ***************
333    // *
334    
335        void crossfade_t::serialize(Serialization::Archive* archive) {
336            SRLZ(in_start);
337            SRLZ(in_end);
338            SRLZ(out_start);
339            SRLZ(out_end);
340        }
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 365  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 374  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 420  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 1453  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 1686  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 1790  namespace { Line 1893  namespace {
1893          }          }
1894      }      }
1895    
1896        void DimensionRegion::serialize(Serialization::Archive* archive) {
1897            // in case this class will become backward incompatible one day,
1898            // then set a version and minimum version for this class like:
1899            //archive->setVersion(*this, 2);
1900            //archive->setMinVersion(*this, 1);
1901    
1902            SRLZ(VelocityUpperLimit);
1903            SRLZ(EG1PreAttack);
1904            SRLZ(EG1Attack);
1905            SRLZ(EG1Decay1);
1906            SRLZ(EG1Decay2);
1907            SRLZ(EG1InfiniteSustain);
1908            SRLZ(EG1Sustain);
1909            SRLZ(EG1Release);
1910            SRLZ(EG1Hold);
1911            SRLZ(EG1Controller);
1912            SRLZ(EG1ControllerInvert);
1913            SRLZ(EG1ControllerAttackInfluence);
1914            SRLZ(EG1ControllerDecayInfluence);
1915            SRLZ(EG1ControllerReleaseInfluence);
1916            SRLZ(LFO1WaveForm);
1917            SRLZ(LFO1Frequency);
1918            SRLZ(LFO1Phase);
1919            SRLZ(LFO1InternalDepth);
1920            SRLZ(LFO1ControlDepth);
1921            SRLZ(LFO1Controller);
1922            SRLZ(LFO1FlipPhase);
1923            SRLZ(LFO1Sync);
1924            SRLZ(EG2PreAttack);
1925            SRLZ(EG2Attack);
1926            SRLZ(EG2Decay1);
1927            SRLZ(EG2Decay2);
1928            SRLZ(EG2InfiniteSustain);
1929            SRLZ(EG2Sustain);
1930            SRLZ(EG2Release);
1931            SRLZ(EG2Controller);
1932            SRLZ(EG2ControllerInvert);
1933            SRLZ(EG2ControllerAttackInfluence);
1934            SRLZ(EG2ControllerDecayInfluence);
1935            SRLZ(EG2ControllerReleaseInfluence);
1936            SRLZ(LFO2WaveForm);
1937            SRLZ(LFO2Frequency);
1938            SRLZ(LFO2Phase);
1939            SRLZ(LFO2InternalDepth);
1940            SRLZ(LFO2ControlDepth);
1941            SRLZ(LFO2Controller);
1942            SRLZ(LFO2FlipPhase);
1943            SRLZ(LFO2Sync);
1944            SRLZ(EG3Attack);
1945            SRLZ(EG3Depth);
1946            SRLZ(LFO3WaveForm);
1947            SRLZ(LFO3Frequency);
1948            SRLZ(LFO3Phase);
1949            SRLZ(LFO3InternalDepth);
1950            SRLZ(LFO3ControlDepth);
1951            SRLZ(LFO3Controller);
1952            SRLZ(LFO3FlipPhase);
1953            SRLZ(LFO3Sync);
1954            SRLZ(VCFEnabled);
1955            SRLZ(VCFType);
1956            SRLZ(VCFCutoffController);
1957            SRLZ(VCFCutoffControllerInvert);
1958            SRLZ(VCFCutoff);
1959            SRLZ(VCFVelocityCurve);
1960            SRLZ(VCFVelocityScale);
1961            SRLZ(VCFVelocityDynamicRange);
1962            SRLZ(VCFResonance);
1963            SRLZ(VCFResonanceDynamic);
1964            SRLZ(VCFResonanceController);
1965            SRLZ(VCFKeyboardTracking);
1966            SRLZ(VCFKeyboardTrackingBreakpoint);
1967            SRLZ(VelocityResponseCurve);
1968            SRLZ(VelocityResponseDepth);
1969            SRLZ(VelocityResponseCurveScaling);
1970            SRLZ(ReleaseVelocityResponseCurve);
1971            SRLZ(ReleaseVelocityResponseDepth);
1972            SRLZ(ReleaseTriggerDecay);
1973            SRLZ(Crossfade);
1974            SRLZ(PitchTrack);
1975            SRLZ(DimensionBypass);
1976            SRLZ(Pan);
1977            SRLZ(SelfMask);
1978            SRLZ(AttenuationController);
1979            SRLZ(InvertAttenuationController);
1980            SRLZ(AttenuationControllerThreshold);
1981            SRLZ(ChannelOffset);
1982            SRLZ(SustainDefeat);
1983            SRLZ(MSDecode);
1984            //SRLZ(SampleStartOffset);
1985            SRLZ(SampleAttenuation);
1986            SRLZ(EG1Options);
1987            SRLZ(EG2Options);
1988            SRLZ(SustainReleaseTrigger);
1989            SRLZ(NoNoteOffReleaseTrigger);
1990    
1991            // derived attributes from DLS::Sampler
1992            SRLZ(FineTune);
1993            SRLZ(Gain);
1994        }
1995    
1996      /**      /**
1997       * Updates the respective member variable and updates @c SampleAttenuation       * Updates the respective member variable and updates @c SampleAttenuation
1998       * which depends on this value.       * which depends on this value.
# Line 1823  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 2090  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 2129  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 2504  namespace { Line 2810  namespace {
2810    
2811              // unknown controller type              // unknown controller type
2812              default:              default:
2813                  throw gig::Exception("Unknown leverage controller type.");                  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 2998  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 3008  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 3042  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 3051  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 3100  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;          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 3131  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 3274  namespace { Line 3586  namespace {
3586    
3587          // check if max. amount of dimensions reached          // check if max. amount of dimensions reached
3588          File* file = (File*) GetParent()->GetParent();          File* file = (File*) GetParent()->GetParent();
3589          const int iMaxDimensions = (file->pVersion && file->pVersion->major == 3) ? 8 : 5;          const int iMaxDimensions = (file->pVersion && file->pVersion->major > 2) ? 8 : 5;
3590          if (Dimensions >= iMaxDimensions)          if (Dimensions >= iMaxDimensions)
3591              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");
3592          // check if max. amount of dimension bits reached          // check if max. amount of dimension bits reached
# Line 3566  namespace { Line 3878  namespace {
3878          }          }
3879    
3880          // delete temporary region          // delete temporary region
3881            tempRgn->DeleteChunks();
3882          delete tempRgn;          delete tempRgn;
3883    
3884          UpdateVelocityTable();          UpdateVelocityTable();
# Line 3705  namespace { Line 4018  namespace {
4018          }          }
4019    
4020          // delete temporary region          // delete temporary region
4021            tempRgn->DeleteChunks();
4022          delete tempRgn;          delete tempRgn;
4023    
4024          UpdateVelocityTable();          UpdateVelocityTable();
# Line 3932  namespace { Line 4246  namespace {
4246          if ((int32_t)WavePoolTableIndex == -1) return NULL;          if ((int32_t)WavePoolTableIndex == -1) return NULL;
4247          File* file = (File*) GetParent()->GetParent();          File* file = (File*) GetParent()->GetParent();
4248          if (!file->pWavePoolTable) return NULL;          if (!file->pWavePoolTable) return NULL;
4249            if (WavePoolTableIndex + 1 > file->WavePoolCount) return NULL;
4250          // 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
4251          if (file->pRIFF->IsNew() || (file->pRIFF->GetCurrentFileSize() >> 31)) {          if (file->pRIFF->IsNew() || (file->pRIFF->GetCurrentFileSize() >> 31)) {
4252              // use 64 bit wave pool offsets (treating this as large file)              // use 64 bit wave pool offsets (treating this as large file)
# Line 4182  namespace { Line 4497  namespace {
4497          pGroup = group;          pGroup = group;
4498          pChunk = ckScri;          pChunk = ckScri;
4499          if (ckScri) { // object is loaded from file ...          if (ckScri) { // object is loaded from file ...
4500                ckScri->SetPos(0);
4501    
4502              // read header              // read header
4503              uint32_t headerSize = ckScri->ReadUint32();              uint32_t headerSize = ckScri->ReadUint32();
4504              Compression = (Compression_t) ckScri->ReadUint32();              Compression = (Compression_t) ckScri->ReadUint32();
# Line 4234  namespace { Line 4551  namespace {
4551          memcpy(&data[0], &text[0], text.size());          memcpy(&data[0], &text[0], text.size());
4552      }      }
4553    
4554        /** @brief Remove all RIFF chunks associated with this Script object.
4555         *
4556         * At the moment Script::DeleteChunks() does nothing. It is
4557         * recommended to call this method explicitly though from deriving classes's
4558         * own overridden implementation of this method to avoid potential future
4559         * compatiblity issues.
4560         *
4561         * See DLS::Storage::DeleteChunks() for details.
4562         */
4563        void Script::DeleteChunks() {
4564        }
4565    
4566      /**      /**
4567       * Apply this script to the respective RIFF chunks. You have to call       * Apply this script to the respective RIFF chunks. You have to call
4568       * File::Save() to make changes persistent.       * File::Save() to make changes persistent.
# Line 4298  namespace { Line 4627  namespace {
4627          return pGroup;          return pGroup;
4628      }      }
4629    
4630        /**
4631         * Make a (semi) deep copy of the Script object given by @a orig
4632         * and assign it to this object. Note: the ScriptGroup this Script
4633         * object belongs to remains untouched by this call.
4634         *
4635         * @param orig - original Script object to be copied from
4636         */
4637        void Script::CopyAssign(const Script* orig) {
4638            Name        = orig->Name;
4639            Compression = orig->Compression;
4640            Encoding    = orig->Encoding;
4641            Language    = orig->Language;
4642            Bypass      = orig->Bypass;
4643            data        = orig->data;
4644        }
4645    
4646      void Script::RemoveAllScriptReferences() {      void Script::RemoveAllScriptReferences() {
4647          File* pFile = pGroup->pFile;          File* pFile = pGroup->pFile;
4648          for (int i = 0; pFile->GetInstrument(i); ++i) {          for (int i = 0; pFile->GetInstrument(i); ++i) {
# Line 4333  namespace { Line 4678  namespace {
4678          }          }
4679      }      }
4680    
4681        /** @brief Remove all RIFF chunks associated with this ScriptGroup object.
4682         *
4683         * At the moment ScriptGroup::DeleteChunks() does nothing. It is
4684         * recommended to call this method explicitly though from deriving classes's
4685         * own overridden implementation of this method to avoid potential future
4686         * compatiblity issues.
4687         *
4688         * See DLS::Storage::DeleteChunks() for details.
4689         */
4690        void ScriptGroup::DeleteChunks() {
4691        }
4692    
4693      /**      /**
4694       * 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
4695       * File::Save() to make changes persistent.       * File::Save() to make changes persistent.
# Line 4457  namespace { Line 4814  namespace {
4814          if (lart) {          if (lart) {
4815              RIFF::Chunk* _3ewg = lart->GetSubChunk(CHUNK_ID_3EWG);              RIFF::Chunk* _3ewg = lart->GetSubChunk(CHUNK_ID_3EWG);
4816              if (_3ewg) {              if (_3ewg) {
4817                    _3ewg->SetPos(0);
4818    
4819                  EffectSend             = _3ewg->ReadUint16();                  EffectSend             = _3ewg->ReadUint16();
4820                  Attenuation            = _3ewg->ReadInt32();                  Attenuation            = _3ewg->ReadInt32();
4821                  FineTune               = _3ewg->ReadInt16();                  FineTune               = _3ewg->ReadInt16();
# Line 4501  namespace { Line 4860  namespace {
4860                  RIFF::List* rgn = lrgn->GetFirstSubList();                  RIFF::List* rgn = lrgn->GetFirstSubList();
4861                  while (rgn) {                  while (rgn) {
4862                      if (rgn->GetListType() == LIST_TYPE_RGN) {                      if (rgn->GetListType() == LIST_TYPE_RGN) {
4863                          __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);                          if (pProgress)
4864                                __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);
4865                          pRegions->push_back(new Region(this, rgn));                          pRegions->push_back(new Region(this, rgn));
4866                      }                      }
4867                      rgn = lrgn->GetNextSubList();                      rgn = lrgn->GetNextSubList();
# Line 4516  namespace { Line 4876  namespace {
4876          if (lst3LS) {          if (lst3LS) {
4877              RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);              RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);
4878              if (ckSCSL) {              if (ckSCSL) {
4879                    ckSCSL->SetPos(0);
4880    
4881                  int headerSize = ckSCSL->ReadUint32();                  int headerSize = ckSCSL->ReadUint32();
4882                  int slotCount  = ckSCSL->ReadUint32();                  int slotCount  = ckSCSL->ReadUint32();
4883                  if (slotCount) {                  if (slotCount) {
# Line 4533  namespace { Line 4895  namespace {
4895              }              }
4896          }          }
4897    
4898          __notify_progress(pProgress, 1.0f); // notify done          if (pProgress)
4899                __notify_progress(pProgress, 1.0f); // notify done
4900      }      }
4901    
4902      void Instrument::UpdateRegionKeyTable() {      void Instrument::UpdateRegionKeyTable() {
# Line 4542  namespace { Line 4905  namespace {
4905          RegionList::iterator end  = pRegions->end();          RegionList::iterator end  = pRegions->end();
4906          for (; iter != end; ++iter) {          for (; iter != end; ++iter) {
4907              gig::Region* pRegion = static_cast<gig::Region*>(*iter);              gig::Region* pRegion = static_cast<gig::Region*>(*iter);
4908              for (int iKey = pRegion->KeyRange.low; iKey <= pRegion->KeyRange.high; iKey++) {              const int low  = std::max(int(pRegion->KeyRange.low), 0);
4909                const int high = std::min(int(pRegion->KeyRange.high), 127);
4910                for (int iKey = low; iKey <= high; iKey++) {
4911                  RegionKeyTable[iKey] = pRegion;                  RegionKeyTable[iKey] = pRegion;
4912              }              }
4913          }          }
# Line 4587  namespace { Line 4952  namespace {
4952              File* pFile = (File*) GetParent();              File* pFile = (File*) GetParent();
4953    
4954              // 3ewg is bigger in gig3, as it includes the iMIDI rules              // 3ewg is bigger in gig3, as it includes the iMIDI rules
4955              int size = (pFile->pVersion && pFile->pVersion->major == 3) ? 16416 : 12;              int size = (pFile->pVersion && pFile->pVersion->major > 2) ? 16416 : 12;
4956              _3ewg = lart->AddSubChunk(CHUNK_ID_3EWG, size);              _3ewg = lart->AddSubChunk(CHUNK_ID_3EWG, size);
4957              memset(_3ewg->LoadChunkData(), 0, size);              memset(_3ewg->LoadChunkData(), 0, size);
4958          }          }
# Line 5144  namespace { Line 5509  namespace {
5509          ::LoadString(pNameChunk, Name);          ::LoadString(pNameChunk, Name);
5510      }      }
5511    
5512        /** @brief Destructor.
5513         *
5514         * Currently this destructor implementation does nothing.
5515         */
5516      Group::~Group() {      Group::~Group() {
5517          // remove the chunk associated with this group (if any)      }
5518          if (pNameChunk) pNameChunk->GetParent()->DeleteSubChunk(pNameChunk);  
5519        /** @brief Remove all RIFF chunks associated with this Group object.
5520         *
5521         * See DLS::Storage::DeleteChunks() for details.
5522         */
5523        void Group::DeleteChunks() {
5524            // handle own RIFF chunks
5525            if (pNameChunk) {
5526                pNameChunk->GetParent()->DeleteSubChunk(pNameChunk);
5527                pNameChunk = NULL;
5528            }
5529      }      }
5530    
5531      /** @brief Update chunks with current group settings.      /** @brief Update chunks with current group settings.
# Line 5169  namespace { Line 5548  namespace {
5548          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);
5549          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);
5550    
5551          if (!pNameChunk && pFile->pVersion && pFile->pVersion->major == 3) {          if (!pNameChunk && pFile->pVersion && pFile->pVersion->major > 2) {
5552              // v3 has a fixed list of 128 strings, find a free one              // v3 has a fixed list of 128 strings, find a free one
5553              for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {              for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {
5554                  if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {                  if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {
# Line 5264  namespace { Line 5643  namespace {
5643          0, 3, 20030331 & 0xffff, 20030331 >> 16          0, 3, 20030331 & 0xffff, 20030331 >> 16
5644      };      };
5645    
5646        /// Reflects Gigasampler file format version 4.0 (2007-10-12).
5647        const DLS::version_t File::VERSION_4 = {
5648            0, 4, 20071012 & 0xffff, 20071012 >> 16
5649        };
5650    
5651      static const DLS::Info::string_length_t _FileFixedStringLengths[] = {      static const DLS::Info::string_length_t _FileFixedStringLengths[] = {
5652          { CHUNK_ID_IARL, 256 },          { CHUNK_ID_IARL, 256 },
5653          { CHUNK_ID_IART, 128 },          { CHUNK_ID_IART, 128 },
# Line 5360  namespace { Line 5744  namespace {
5744          return static_cast<gig::Sample*>( *it );          return static_cast<gig::Sample*>( *it );
5745      }      }
5746    
5747        /**
5748         * Returns the total amount of samples of this gig file.
5749         *
5750         * Note that this method might block for a long time in case it is required
5751         * to load the sample info for the first time.
5752         *
5753         * @returns total amount of samples
5754         */
5755        size_t File::CountSamples() {
5756            if (!pSamples) LoadSamples();
5757            if (!pSamples) return 0;
5758            return pSamples->size();
5759        }
5760    
5761      /** @brief Add a new sample.      /** @brief Add a new sample.
5762       *       *
5763       * 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 5398  namespace { Line 5796  namespace {
5796          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");
5797          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation
5798          pSamples->erase(iter);          pSamples->erase(iter);
5799            pSample->DeleteChunks();
5800          delete pSample;          delete pSample;
5801    
5802          SampleList::iterator tmp = SamplesIterator;          SampleList::iterator tmp = SamplesIterator;
# Line 5435  namespace { Line 5834  namespace {
5834          int iSampleIndex  = 0;          int iSampleIndex  = 0;
5835          int iTotalSamples = WavePoolCount;          int iTotalSamples = WavePoolCount;
5836    
5837          // check if samples should be loaded from extension files          // just for assembling path of optional extension files to be read
5838          // (only for old gig files < 2 GB)          const std::string folder = parentPath(pRIFF->GetFileName());
5839          int lastFileNo = 0;          const std::string baseName = pathWithoutExtension(pRIFF->GetFileName());
5840          if (!file->IsNew() && !(file->GetCurrentFileSize() >> 31)) {  
5841              for (int i = 0 ; i < WavePoolCount ; i++) {          // the main gig file and the extension files (.gx01, ... , .gx98) may
5842                  if (pWavePoolTableHi[i] > lastFileNo) lastFileNo = pWavePoolTableHi[i];          // contain wave data (wave pool)
5843              }          std::vector<RIFF::File*> poolFiles;
5844          }          poolFiles.push_back(pRIFF);
5845          String name(pRIFF->GetFileName());  
5846          int nameLen = (int) name.length();          // get info about all extension files
5847          char suffix[6];          RIFF::Chunk* ckXfil = pRIFF->GetSubChunk(CHUNK_ID_XFIL);
5848          if (nameLen > 4 && name.substr(nameLen - 4) == ".gig") nameLen -= 4;          if (ckXfil) { // there are extension files (.gx01, ... , .gx98) ...
5849                const uint32_t n = ckXfil->ReadInt32();
5850          for (int fileNo = 0 ; ; ) {              for (int i = 0; i < n; i++) {
5851                    // read the filename and load the extension file
5852                    std::string name;
5853                    ckXfil->ReadString(name, 128);
5854                    std::string path = concatPath(folder, name);
5855                    RIFF::File* pExtFile = new RIFF::File(path);
5856                    // check that the dlsids match
5857                    RIFF::Chunk* ckDLSID = pExtFile->GetSubChunk(CHUNK_ID_DLID);
5858                    if (ckDLSID) {
5859                        ::DLS::dlsid_t idExpected;
5860                        idExpected.ulData1 = ckXfil->ReadInt32();
5861                        idExpected.usData2 = ckXfil->ReadInt16();
5862                        idExpected.usData3 = ckXfil->ReadInt16();
5863                        ckXfil->Read(idExpected.abData, 8, 1);
5864                        ::DLS::dlsid_t idFound;
5865                        ckDLSID->Read(&idFound.ulData1, 1, 4);
5866                        ckDLSID->Read(&idFound.usData2, 1, 2);
5867                        ckDLSID->Read(&idFound.usData3, 1, 2);
5868                        ckDLSID->Read(idFound.abData, 8, 1);
5869                        if (memcmp(&idExpected, &idFound, 16) != 0)
5870                            throw gig::Exception("dlsid mismatch for extension file: %s", path.c_str());
5871                    }
5872                    poolFiles.push_back(pExtFile);
5873                    ExtensionFiles.push_back(pExtFile);
5874                }
5875            }
5876    
5877            // check if a .gx99 (GigaPulse) file exists
5878            RIFF::Chunk* ckDoxf = pRIFF->GetSubChunk(CHUNK_ID_DOXF);
5879            if (ckDoxf) { // there is a .gx99 (GigaPulse) file ...
5880                std::string path = baseName + ".gx99";
5881                RIFF::File* pExtFile = new RIFF::File(path);
5882    
5883                // skip unused int and filename
5884                ckDoxf->SetPos(132, RIFF::stream_curpos);
5885    
5886                // check that the dlsids match
5887                RIFF::Chunk* ckDLSID = pExtFile->GetSubChunk(CHUNK_ID_DLID);
5888                if (ckDLSID) {
5889                    ::DLS::dlsid_t idExpected;
5890                    idExpected.ulData1 = ckDoxf->ReadInt32();
5891                    idExpected.usData2 = ckDoxf->ReadInt16();
5892                    idExpected.usData3 = ckDoxf->ReadInt16();
5893                    ckDoxf->Read(idExpected.abData, 8, 1);
5894                    ::DLS::dlsid_t idFound;
5895                    ckDLSID->Read(&idFound.ulData1, 1, 4);
5896                    ckDLSID->Read(&idFound.usData2, 1, 2);
5897                    ckDLSID->Read(&idFound.usData3, 1, 2);
5898                    ckDLSID->Read(idFound.abData, 8, 1);
5899                    if (memcmp(&idExpected, &idFound, 16) != 0)
5900                        throw gig::Exception("dlsid mismatch for GigaPulse file: %s", path.c_str());
5901                }
5902                poolFiles.push_back(pExtFile);
5903                ExtensionFiles.push_back(pExtFile);
5904            }
5905    
5906            // load samples from extension files (if required)
5907            for (int i = 0; i < poolFiles.size(); i++) {
5908                RIFF::File* file = poolFiles[i];
5909              RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);              RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);
5910              if (wvpl) {              if (wvpl) {
5911                  file_offset_t wvplFileOffset = wvpl->GetFilePos();                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -
5912                                                   wvpl->GetPos(); // should be zero, but just to be sure
5913                  RIFF::List* wave = wvpl->GetFirstSubList();                  RIFF::List* wave = wvpl->GetFirstSubList();
5914                  while (wave) {                  while (wave) {
5915                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
5916                          // notify current progress                          // notify current progress
5917                          const float subprogress = (float) iSampleIndex / (float) iTotalSamples;                          if (pProgress) {
5918                          __notify_progress(pProgress, subprogress);                              const float subprogress = (float) iSampleIndex / (float) iTotalSamples;
5919                                __notify_progress(pProgress, subprogress);
5920                            }
5921    
5922                          file_offset_t waveFileOffset = wave->GetFilePos();                          file_offset_t waveFileOffset = wave->GetFilePos();
5923                          pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, fileNo, iSampleIndex));                          pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, i, iSampleIndex));
5924    
5925                          iSampleIndex++;                          iSampleIndex++;
5926                      }                      }
5927                      wave = wvpl->GetNextSubList();                      wave = wvpl->GetNextSubList();
5928                  }                  }
5929                }
                 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;  
5930          }          }
5931    
5932          __notify_progress(pProgress, 1.0); // notify done          if (pProgress)
5933                __notify_progress(pProgress, 1.0); // notify done
5934      }      }
5935    
5936      Instrument* File::GetFirstInstrument() {      Instrument* File::GetFirstInstrument() {
# Line 5495  namespace { Line 5947  namespace {
5947      }      }
5948    
5949      /**      /**
5950         * Returns the total amount of instruments of this gig file.
5951         *
5952         * Note that this method might block for a long time in case it is required
5953         * to load the instruments info for the first time.
5954         *
5955         * @returns total amount of instruments
5956         */
5957        size_t File::CountInstruments() {
5958            if (!pInstruments) LoadInstruments();
5959            if (!pInstruments) return 0;
5960            return pInstruments->size();
5961        }
5962    
5963        /**
5964       * Returns the instrument with the given index.       * Returns the instrument with the given index.
5965       *       *
5966       * @param index     - number of the sought instrument (0..n)       * @param index     - number of the sought instrument (0..n)
# Line 5505  namespace { Line 5971  namespace {
5971          if (!pInstruments) {          if (!pInstruments) {
5972              // 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)
5973    
5974              // sample loading subtask              if (pProgress) {
5975              progress_t subprogress;                  // sample loading subtask
5976              __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask                  progress_t subprogress;
5977              __notify_progress(&subprogress, 0.0f);                  __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask
5978              if (GetAutoLoad())                  __notify_progress(&subprogress, 0.0f);
5979                  GetFirstSample(&subprogress); // now force all samples to be loaded                  if (GetAutoLoad())
5980              __notify_progress(&subprogress, 1.0f);                      GetFirstSample(&subprogress); // now force all samples to be loaded
5981                    __notify_progress(&subprogress, 1.0f);
5982              // instrument loading subtask  
5983              if (pProgress && pProgress->callback) {                  // instrument loading subtask
5984                  subprogress.__range_min = subprogress.__range_max;                  if (pProgress->callback) {
5985                  subprogress.__range_max = pProgress->__range_max; // schedule remaining percentage for this subtask                      subprogress.__range_min = subprogress.__range_max;
5986              }                      subprogress.__range_max = pProgress->__range_max; // schedule remaining percentage for this subtask
5987              __notify_progress(&subprogress, 0.0f);                  }
5988              LoadInstruments(&subprogress);                  __notify_progress(&subprogress, 0.0f);
5989              __notify_progress(&subprogress, 1.0f);                  LoadInstruments(&subprogress);
5990                    __notify_progress(&subprogress, 1.0f);
5991                } else {
5992                    // sample loading subtask
5993                    if (GetAutoLoad())
5994                        GetFirstSample(); // now force all samples to be loaded
5995    
5996                    // instrument loading subtask
5997                    LoadInstruments();
5998                }
5999          }          }
6000          if (!pInstruments) return NULL;          if (!pInstruments) return NULL;
6001          InstrumentsIterator = pInstruments->begin();          InstrumentsIterator = pInstruments->begin();
# Line 5613  namespace { Line 6088  namespace {
6088              mGroups[pFile->GetSample(i)->GetGroup()]->AddSample(s);              mGroups[pFile->GetSample(i)->GetGroup()]->AddSample(s);
6089              mSamples[pFile->GetSample(i)] = s;              mSamples[pFile->GetSample(i)] = s;
6090          }          }
6091            
6092            // clone script groups and their scripts
6093            for (int iGroup = 0; pFile->GetScriptGroup(iGroup); ++iGroup) {
6094                ScriptGroup* sg = pFile->GetScriptGroup(iGroup);
6095                ScriptGroup* dg = AddScriptGroup();
6096                dg->Name = "COPY" + ToString(iCallCount) + "_" + sg->Name;
6097                for (int iScript = 0; sg->GetScript(iScript); ++iScript) {
6098                    Script* ss = sg->GetScript(iScript);
6099                    Script* ds = dg->AddScript();
6100                    ds->CopyAssign(ss);
6101                }
6102            }
6103    
6104          //BUG: For some reason this method only works with this additional          //BUG: For some reason this method only works with this additional
6105          //     Save() call in between here.          //     Save() call in between here.
6106          //          //
# Line 5657  namespace { Line 6144  namespace {
6144          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), (DLS::Instrument*) pInstrument);          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), (DLS::Instrument*) pInstrument);
6145          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");
6146          pInstruments->erase(iter);          pInstruments->erase(iter);
6147            pInstrument->DeleteChunks();
6148          delete pInstrument;          delete pInstrument;
6149      }      }
6150    
# Line 5672  namespace { Line 6160  namespace {
6160              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();
6161              while (lstInstr) {              while (lstInstr) {
6162                  if (lstInstr->GetListType() == LIST_TYPE_INS) {                  if (lstInstr->GetListType() == LIST_TYPE_INS) {
6163                      // notify current progress                      if (pProgress) {
6164                      const float localProgress = (float) iInstrumentIndex / (float) Instruments;                          // notify current progress
6165                      __notify_progress(pProgress, localProgress);                          const float localProgress = (float) iInstrumentIndex / (float) Instruments;
6166                            __notify_progress(pProgress, localProgress);
                     // divide local progress into subprogress for loading current Instrument  
                     progress_t subprogress;  
                     __divide_progress(pProgress, &subprogress, Instruments, iInstrumentIndex);  
6167    
6168                      pInstruments->push_back(new Instrument(this, lstInstr, &subprogress));                          // divide local progress into subprogress for loading current Instrument
6169                            progress_t subprogress;
6170                            __divide_progress(pProgress, &subprogress, Instruments, iInstrumentIndex);
6171    
6172                            pInstruments->push_back(new Instrument(this, lstInstr, &subprogress));
6173                        } else {
6174                            pInstruments->push_back(new Instrument(this, lstInstr));
6175                        }
6176    
6177                      iInstrumentIndex++;                      iInstrumentIndex++;
6178                  }                  }
6179                  lstInstr = lstInstruments->GetNextSubList();                  lstInstr = lstInstruments->GetNextSubList();
6180              }              }
6181              __notify_progress(pProgress, 1.0); // notify done              if (pProgress)
6182                    __notify_progress(pProgress, 1.0); // notify done
6183          }          }
6184      }      }
6185    
# Line 5801  namespace { Line 6294  namespace {
6294              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);
6295              // 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
6296              RIFF::Chunk* einf = pRIFF->GetSubChunk(CHUNK_ID_EINF);              RIFF::Chunk* einf = pRIFF->GetSubChunk(CHUNK_ID_EINF);
6297              if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);              if (einf && pVersion && pVersion->major > 2) pRIFF->MoveSubChunk(_3crc, einf);
6298              bRequiresSave = true;              bRequiresSave = true;
6299          } else if (_3crc->GetNewSize() != pSamples->size() * 8) {          } else if (_3crc->GetNewSize() != pSamples->size() * 8) {
6300              _3crc->Resize(pSamples->size() * 8);              _3crc->Resize(pSamples->size() * 8);
# Line 5916  namespace { Line 6409  namespace {
6409          }          }
6410          // now delete this group object          // now delete this group object
6411          pGroups->erase(iter);          pGroups->erase(iter);
6412            pGroup->DeleteChunks();
6413          delete pGroup;          delete pGroup;
6414      }      }
6415    
# Line 5937  namespace { Line 6431  namespace {
6431          // move all members of this group to another group          // move all members of this group to another group
6432          pGroup->MoveAll();          pGroup->MoveAll();
6433          pGroups->erase(iter);          pGroups->erase(iter);
6434            pGroup->DeleteChunks();
6435          delete pGroup;          delete pGroup;
6436      }      }
6437    
# Line 5950  namespace { Line 6445  namespace {
6445                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();
6446                  while (ck) {                  while (ck) {
6447                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {
6448                          if (pVersion && pVersion->major == 3 &&                          if (pVersion && pVersion->major > 2 &&
6449                              strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;                              strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;
6450    
6451                          pGroups->push_back(new Group(this, ck));                          pGroups->push_back(new Group(this, ck));
# Line 6036  namespace { Line 6531  namespace {
6531              pScriptGroup->DeleteScript(pScriptGroup->GetScript(i));              pScriptGroup->DeleteScript(pScriptGroup->GetScript(i));
6532          if (pScriptGroup->pList)          if (pScriptGroup->pList)
6533              pScriptGroup->pList->GetParent()->DeleteSubChunk(pScriptGroup->pList);              pScriptGroup->pList->GetParent()->DeleteSubChunk(pScriptGroup->pList);
6534            pScriptGroup->DeleteChunks();
6535          delete pScriptGroup;          delete pScriptGroup;
6536      }      }
6537    
# Line 6126  namespace { Line 6622  namespace {
6622    
6623              // v3: make sure the file has 128 3gnm chunks              // v3: make sure the file has 128 3gnm chunks
6624              // (before updating the Group chunks)              // (before updating the Group chunks)
6625              if (pVersion && pVersion->major == 3) {              if (pVersion && pVersion->major > 2) {
6626                  RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();                  RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();
6627                  for (int i = 0 ; i < 128 ; i++) {                  for (int i = 0 ; i < 128 ; i++) {
6628                      if (i >= pGroups->size()) ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);                      if (i >= pGroups->size()) ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);
# Line 6272  namespace { Line 6768  namespace {
6768          } else /*if (newFile)*/ {          } else /*if (newFile)*/ {
6769              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);
6770              // 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
6771              if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);              if (einf && pVersion && pVersion->major > 2) pRIFF->MoveSubChunk(_3crc, einf);
6772          }          }
6773          { // must be performed in RAM here ...          { // must be performed in RAM here ...
6774              uint32_t* pData = (uint32_t*) _3crc->LoadChunkData();              uint32_t* pData = (uint32_t*) _3crc->LoadChunkData();
# Line 6299  namespace { Line 6795  namespace {
6795      }      }
6796    
6797      /**      /**
6798       * Enable / disable automatic loading. By default this properyt is       * Enable / disable automatic loading. By default this property is
6799       * enabled and all informations are loaded automatically. However       * enabled and every information is loaded automatically. However
6800       * loading all Regions, DimensionRegions and especially samples might       * loading all Regions, DimensionRegions and especially samples might
6801       * 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
6802       * be interested in retrieving very superficial informations like the       * be interested in retrieving very superficial informations like the
# Line 6308  namespace { Line 6804  namespace {
6804       * automatic loading to avoid very slow response times.       * automatic loading to avoid very slow response times.
6805       *       *
6806       * @e CAUTION: by disabling this property many pointers (i.e. sample       * @e CAUTION: by disabling this property many pointers (i.e. sample
6807       * references) and informations will have invalid or even undefined       * references) and attributes will have invalid or even undefined
6808       * data! This feature is currently only intended for retrieving very       * data! This feature is currently only intended for retrieving very
6809       * 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
6810       * details like synthesis informations or even to modify .gig files!       * details like synthesis information or even to modify .gig files!
6811       */       */
6812      void File::SetAutoLoad(bool b) {      void File::SetAutoLoad(bool b) {
6813          bAutoLoad = b;          bAutoLoad = b;
# Line 6330  namespace { Line 6826  namespace {
6826  // *************** Exception ***************  // *************** Exception ***************
6827  // *  // *
6828    
6829      Exception::Exception(String Message) : DLS::Exception(Message) {      Exception::Exception() : DLS::Exception() {
6830        }
6831    
6832        Exception::Exception(String format, ...) : DLS::Exception() {
6833            va_list arg;
6834            va_start(arg, format);
6835            Message = assemble(format, arg);
6836            va_end(arg);
6837        }
6838    
6839        Exception::Exception(String format, va_list arg) : DLS::Exception() {
6840            Message = assemble(format, arg);
6841      }      }
6842    
6843      void Exception::PrintMessage() {      void Exception::PrintMessage() {
Legend:
Removed from v.3115  
changed lines
  Added in v.3623
  ViewVC Help
Powered by ViewVC