/[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 3709 by schoenebeck, Fri Jan 10 11:21:59 2020 UTC revision 3928 by schoenebeck, Tue Jun 15 11:38:38 2021 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-2019 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2021 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 482  namespace { Line 482  namespace {
482              ScanCompressedSample();              ScanCompressedSample();
483          }          }
484    
485          // we use a buffer for decompression and for truncating 24 bit samples to 16 bit          // we use a buffer for decompression only
486          if ((Compressed || BitDepth == 24) && !InternalDecompressionBuffer.Size) {          if (Compressed && !InternalDecompressionBuffer.Size) {
487              InternalDecompressionBuffer.pStart = new unsigned char[INITIAL_SAMPLE_BUFFER_SIZE];              InternalDecompressionBuffer.pStart = new unsigned char[INITIAL_SAMPLE_BUFFER_SIZE];
488              InternalDecompressionBuffer.Size   = INITIAL_SAMPLE_BUFFER_SIZE;              InternalDecompressionBuffer.Size   = INITIAL_SAMPLE_BUFFER_SIZE;
489          }          }
# Line 3460  namespace { Line 3460  namespace {
3460              store32(&pData[iWavePoolOffset + i * 4], iWaveIndex);              store32(&pData[iWavePoolOffset + i * 4], iWaveIndex);
3461          }          }
3462    
3463          if (versiongt2) {          // The following chunks are just added for compatibility with the
3464            // GigaStudio software, which would show a warning if these were
3465            // missing. However currently these chunks don't cover any useful
3466            // data. So if this gig file uses any of our own gig format
3467            // extensions which would cause this gig file to be unloadable
3468            // with GSt software anyway, then just skip these GSt compatibility
3469            // chunks here as well.
3470            if (versiongt2 && !UsesAnyGigFormatExtension()) {
3471              // add 3dnm list which always seems to be empty              // add 3dnm list which always seems to be empty
3472              RIFF::List* _3dnm = pCkRegion->GetSubList(LIST_TYPE_3DNM);              RIFF::List* _3dnm = pCkRegion->GetSubList(LIST_TYPE_3DNM);
3473              if (!_3dnm) _3dnm = pCkRegion->AddSubList(LIST_TYPE_3DNM);              if (!_3dnm) _3dnm = pCkRegion->AddSubList(LIST_TYPE_3DNM);
# Line 3491  namespace { Line 3498  namespace {
3498          RIFF::List* _3prg = rgn->GetSubList(LIST_TYPE_3PRG);          RIFF::List* _3prg = rgn->GetSubList(LIST_TYPE_3PRG);
3499          if (_3prg) {          if (_3prg) {
3500              int dimensionRegionNr = 0;              int dimensionRegionNr = 0;
3501              RIFF::List* _3ewl = _3prg->GetFirstSubList();              size_t i = 0;
3502              while (_3ewl) {              for (RIFF::List* _3ewl = _3prg->GetSubListAt(i); _3ewl;
3503                     _3ewl = _3prg->GetSubListAt(++i))
3504                {
3505                  if (_3ewl->GetListType() == LIST_TYPE_3EWL) {                  if (_3ewl->GetListType() == LIST_TYPE_3EWL) {
3506                      pDimensionRegions[dimensionRegionNr] = new DimensionRegion(this, _3ewl);                      pDimensionRegions[dimensionRegionNr] = new DimensionRegion(this, _3ewl);
3507                      dimensionRegionNr++;                      dimensionRegionNr++;
3508                  }                  }
                 _3ewl = _3prg->GetNextSubList();  
3509              }              }
3510              if (dimensionRegionNr == 0) throw gig::Exception("No dimension region found.");              if (dimensionRegionNr == 0) throw gig::Exception("No dimension region found.");
3511          }          }
# Line 3800  namespace { Line 3808  namespace {
3808       * @throws gig::Exception if requested zone could not be deleted       * @throws gig::Exception if requested zone could not be deleted
3809       */       */
3810      void Region::DeleteDimensionZone(dimension_t type, int zone) {      void Region::DeleteDimensionZone(dimension_t type, int zone) {
3811            if (!Dimensions)
3812                throw gig::Exception("Could not delete dimension zone, because there is no dimension at all.");
3813          dimension_def_t* oldDef = GetDimensionDefinition(type);          dimension_def_t* oldDef = GetDimensionDefinition(type);
3814          if (!oldDef)          if (!oldDef)
3815              throw gig::Exception("Could not delete dimension zone, no such dimension of given type");              throw gig::Exception("Could not delete dimension zone, no such dimension of given type");
# Line 3828  namespace { Line 3838  namespace {
3838          // requested by the arguments of this method call) to the temporary          // requested by the arguments of this method call) to the temporary
3839          // region, and don't use Region::CopyAssign() here for this task, since          // region, and don't use Region::CopyAssign() here for this task, since
3840          // it would also alter fast lookup helper variables here and there          // it would also alter fast lookup helper variables here and there
3841          dimension_def_t newDef;          dimension_def_t newDef = {};
3842          for (int i = 0; i < Dimensions; ++i) {          for (int i = 0; i < Dimensions; ++i) {
3843              dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference              dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference
3844              // is this the dimension requested by the method arguments? ...              // is this the dimension requested by the method arguments? ...
# Line 3839  namespace { Line 3849  namespace {
3849              }              }
3850              tempRgn->AddDimension(&def);              tempRgn->AddDimension(&def);
3851          }          }
3852            // silence clang sanitizer warning
3853            if (newDef.dimension == dimension_none)
3854                throw gig::Exception("Unexpected internal failure resolving dimension in DeleteDimensionZone() [this is a bug].");
3855    
3856          // find the dimension index in the tempRegion which is the dimension          // find the dimension index in the tempRegion which is the dimension
3857          // type passed to this method (paranoidly expecting different order)          // type passed to this method (paranoidly expecting different order)
# Line 3883  namespace { Line 3896  namespace {
3896          // now tempRegion's dimensions and DimensionRegions basically reflect          // now tempRegion's dimensions and DimensionRegions basically reflect
3897          // 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
3898          // delete and recreate the dimension in question with the new amount          // delete and recreate the dimension in question with the new amount
3899          // zones and then copy back from tempRegion                // zones and then copy back from tempRegion. we're actually deleting and
3900          DeleteDimension(oldDef);          // recreating all dimensions here, to avoid altering the precise order
3901          AddDimension(&newDef);          // of the dimensions (which would not be an error per se, but it would
3902            // cause usability issues with instrument editors)
3903            {
3904                std::vector<dimension_def_t> oldDefs;
3905                for (int i = 0; i < Dimensions; ++i)
3906                    oldDefs.push_back(pDimensionDefinitions[i]); // copy, don't reference
3907                for (int i = Dimensions - 1; i >= 0; --i)
3908                    DeleteDimension(&pDimensionDefinitions[i]);
3909                for (int i = 0; i < oldDefs.size(); ++i) {
3910                    dimension_def_t& def = oldDefs[i];
3911                    AddDimension(
3912                        (def.dimension == newDef.dimension) ? &newDef : &def
3913                    );
3914                }
3915            }
3916          for (int iSrc = 0; iSrc < 256; ++iSrc) {          for (int iSrc = 0; iSrc < 256; ++iSrc) {
3917              DimensionRegion* srcDimRgn = tempRgn->pDimensionRegions[iSrc];              DimensionRegion* srcDimRgn = tempRgn->pDimensionRegions[iSrc];
3918              if (!srcDimRgn) continue;              if (!srcDimRgn) continue;
# Line 3925  namespace { Line 3952  namespace {
3952       * @throws gig::Exception if requested zone could not be splitted       * @throws gig::Exception if requested zone could not be splitted
3953       */       */
3954      void Region::SplitDimensionZone(dimension_t type, int zone) {      void Region::SplitDimensionZone(dimension_t type, int zone) {
3955            if (!Dimensions)
3956                throw gig::Exception("Could not split dimension zone, because there is no dimension at all.");
3957          dimension_def_t* oldDef = GetDimensionDefinition(type);          dimension_def_t* oldDef = GetDimensionDefinition(type);
3958          if (!oldDef)          if (!oldDef)
3959              throw gig::Exception("Could not split dimension zone, no such dimension of given type");              throw gig::Exception("Could not split dimension zone, no such dimension of given type");
# Line 3951  namespace { Line 3980  namespace {
3980          // requested by the arguments of this method call) to the temporary          // requested by the arguments of this method call) to the temporary
3981          // region, and don't use Region::CopyAssign() here for this task, since          // region, and don't use Region::CopyAssign() here for this task, since
3982          // it would also alter fast lookup helper variables here and there          // it would also alter fast lookup helper variables here and there
3983          dimension_def_t newDef;          dimension_def_t newDef = {};
3984          for (int i = 0; i < Dimensions; ++i) {          for (int i = 0; i < Dimensions; ++i) {
3985              dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference              dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference
3986              // is this the dimension requested by the method arguments? ...              // is this the dimension requested by the method arguments? ...
# Line 3962  namespace { Line 3991  namespace {
3991              }              }
3992              tempRgn->AddDimension(&def);              tempRgn->AddDimension(&def);
3993          }          }
3994            // silence clang sanitizer warning
3995            if (newDef.dimension == dimension_none)
3996                throw gig::Exception("Unexpected internal failure resolving dimension in SplitDimensionZone() [this is a bug].");
3997    
3998          // find the dimension index in the tempRegion which is the dimension          // find the dimension index in the tempRegion which is the dimension
3999          // type passed to this method (paranoidly expecting different order)          // type passed to this method (paranoidly expecting different order)
# Line 4025  namespace { Line 4057  namespace {
4057          // delete and recreate the dimension in question with the new amount          // delete and recreate the dimension in question with the new amount
4058          // zones and then copy back from tempRegion. we're actually deleting and          // zones and then copy back from tempRegion. we're actually deleting and
4059          // recreating all dimensions here, to avoid altering the precise order          // recreating all dimensions here, to avoid altering the precise order
4060          // of the dimensions (which would not be an error per so, but it would          // of the dimensions (which would not be an error per se, but it would
4061          // cause usability issues with instrument editors)          // cause usability issues with instrument editors)
4062          {          {
4063              std::vector<dimension_def_t> oldDefs;              std::vector<dimension_def_t> oldDefs;
# Line 4363  namespace { Line 4395  namespace {
4395          Layers = orig->Layers;          Layers = orig->Layers;
4396      }      }
4397    
4398        /**
4399         * Returns @c true in case this Region object uses any gig format
4400         * extension, that is e.g. whether any DimensionRegion object currently
4401         * has any setting effective that would require our "LSDE" RIFF chunk to
4402         * be stored to the gig file.
4403         *
4404         * Right now this is a private method. It is considerable though this method
4405         * to become (in slightly modified form) a public API method in future, i.e.
4406         * to allow instrument editors to visualize and/or warn the user of any gig
4407         * format extension being used. See also comments on
4408         * DimensionRegion::UsesAnyGigFormatExtension() for details about such a
4409         * potential public API change in future.
4410         */
4411        bool Region::UsesAnyGigFormatExtension() const {
4412            for (int i = 0; i < 256; i++) {
4413                if (pDimensionRegions[i]) {
4414                    if (pDimensionRegions[i]->UsesAnyGigFormatExtension())
4415                        return true;
4416                }
4417            }
4418            return false;
4419        }
4420    
4421    
4422  // *************** MidiRule ***************  // *************** MidiRule ***************
4423  // *  // *
# Line 4544  namespace { Line 4599  namespace {
4599              Compression = (Compression_t) ckScri->ReadUint32();              Compression = (Compression_t) ckScri->ReadUint32();
4600              Encoding    = (Encoding_t) ckScri->ReadUint32();              Encoding    = (Encoding_t) ckScri->ReadUint32();
4601              Language    = (Language_t) ckScri->ReadUint32();              Language    = (Language_t) ckScri->ReadUint32();
4602              Bypass      = (Language_t) ckScri->ReadUint32() & 1;              Bypass      = ckScri->ReadUint32() & 1;
4603              crc         = ckScri->ReadUint32();              crc         = ckScri->ReadUint32();
4604              uint32_t nameSize = ckScri->ReadUint32();              uint32_t nameSize = ckScri->ReadUint32();
4605              Name.resize(nameSize, ' ');              Name.resize(nameSize, ' ');
4606              for (int i = 0; i < nameSize; ++i)              for (int i = 0; i < nameSize; ++i)
4607                  Name[i] = ckScri->ReadUint8();                  Name[i] = ckScri->ReadUint8();
4608                // check if an uuid was already stored along with this script
4609                if (headerSize >= 6*sizeof(int32_t) + nameSize + 16) { // yes ...
4610                    for (uint i = 0; i < 16; ++i) {
4611                        Uuid[i] = ckScri->ReadUint8();
4612                    }
4613                } else { // no uuid yet, generate one now ...
4614                    GenerateUuid();
4615                }
4616              // to handle potential future extensions of the header              // to handle potential future extensions of the header
4617              ckScri->SetPos(sizeof(int32_t) + headerSize);              ckScri->SetPos(sizeof(int32_t) + headerSize);
4618              // read actual script data              // read actual script data
# Line 4564  namespace { Line 4627  namespace {
4627              Bypass   = false;              Bypass   = false;
4628              crc      = 0;              crc      = 0;
4629              Name     = "Unnamed Script";              Name     = "Unnamed Script";
4630                GenerateUuid();
4631          }          }
4632      }      }
4633    
# Line 4618  namespace { Line 4682  namespace {
4682          __calculateCRC(&data[0], data.size(), crc);          __calculateCRC(&data[0], data.size(), crc);
4683          __finalizeCRC(crc);          __finalizeCRC(crc);
4684          // make sure chunk exists and has the required size          // make sure chunk exists and has the required size
4685          const file_offset_t chunkSize = (file_offset_t) 7*sizeof(int32_t) + Name.size() + data.size();          const file_offset_t chunkSize =
4686                (file_offset_t) 7*sizeof(int32_t) + Name.size() + 16 + data.size();
4687          if (!pChunk) pChunk = pGroup->pList->AddSubChunk(CHUNK_ID_SCRI, chunkSize);          if (!pChunk) pChunk = pGroup->pList->AddSubChunk(CHUNK_ID_SCRI, chunkSize);
4688          else pChunk->Resize(chunkSize);          else pChunk->Resize(chunkSize);
4689          // fill the chunk data to be written to disk          // fill the chunk data to be written to disk
4690          uint8_t* pData = (uint8_t*) pChunk->LoadChunkData();          uint8_t* pData = (uint8_t*) pChunk->LoadChunkData();
4691          int pos = 0;          int pos = 0;
4692          store32(&pData[pos], uint32_t(6*sizeof(int32_t) + Name.size())); // total header size          store32(&pData[pos], uint32_t(6*sizeof(int32_t) + Name.size() + 16)); // total header size
4693          pos += sizeof(int32_t);          pos += sizeof(int32_t);
4694          store32(&pData[pos], Compression);          store32(&pData[pos], Compression);
4695          pos += sizeof(int32_t);          pos += sizeof(int32_t);
# Line 4640  namespace { Line 4705  namespace {
4705          pos += sizeof(int32_t);          pos += sizeof(int32_t);
4706          for (int i = 0; i < Name.size(); ++i, ++pos)          for (int i = 0; i < Name.size(); ++i, ++pos)
4707              pData[pos] = Name[i];              pData[pos] = Name[i];
4708            for (int i = 0; i < 16; ++i, ++pos)
4709                pData[pos] = Uuid[i];
4710          for (int i = 0; i < data.size(); ++i, ++pos)          for (int i = 0; i < data.size(); ++i, ++pos)
4711              pData[pos] = data[i];              pData[pos] = data[i];
4712      }      }
4713    
4714      /**      /**
4715         * Generate a new Universally Unique Identifier (UUID) for this script.
4716         */
4717        void Script::GenerateUuid() {
4718            DLS::dlsid_t dlsid;
4719            DLS::Resource::GenerateDLSID(&dlsid);
4720            Uuid[0]  = dlsid.ulData1       & 0xff;
4721            Uuid[1]  = dlsid.ulData1 >>  8 & 0xff;
4722            Uuid[2]  = dlsid.ulData1 >> 16 & 0xff;
4723            Uuid[3]  = dlsid.ulData1 >> 24 & 0xff;
4724            Uuid[4]  = dlsid.usData2       & 0xff;
4725            Uuid[5]  = dlsid.usData2 >>  8 & 0xff;
4726            Uuid[6]  = dlsid.usData3       & 0xff;
4727            Uuid[7]  = dlsid.usData3 >>  8 & 0xff;
4728            Uuid[8]  = dlsid.abData[0];
4729            Uuid[9]  = dlsid.abData[1];
4730            Uuid[10] = dlsid.abData[2];
4731            Uuid[11] = dlsid.abData[3];
4732            Uuid[12] = dlsid.abData[4];
4733            Uuid[13] = dlsid.abData[5];
4734            Uuid[14] = dlsid.abData[6];
4735            Uuid[15] = dlsid.abData[7];
4736        }
4737    
4738        /**
4739       * Move this script from its current ScriptGroup to another ScriptGroup       * Move this script from its current ScriptGroup to another ScriptGroup
4740       * given by @a pGroup.       * given by @a pGroup.
4741       *       *
# Line 4816  namespace { Line 4907  namespace {
4907          pScripts = new std::list<Script*>;          pScripts = new std::list<Script*>;
4908          if (!pList) return;          if (!pList) return;
4909    
4910          for (RIFF::Chunk* ck = pList->GetFirstSubChunk(); ck;          size_t i = 0;
4911               ck = pList->GetNextSubChunk())          for (RIFF::Chunk* ck = pList->GetSubChunkAt(i); ck;
4912                 ck = pList->GetSubChunkAt(++i))
4913          {          {
4914              if (ck->GetChunkID() == CHUNK_ID_SCRI) {              if (ck->GetChunkID() == CHUNK_ID_SCRI) {
4915                  pScripts->push_back(new Script(this, ck));                  pScripts->push_back(new Script(this, ck));
# Line 4897  namespace { Line 4989  namespace {
4989              if (!pRegions) pRegions = new RegionList;              if (!pRegions) pRegions = new RegionList;
4990              RIFF::List* lrgn = insList->GetSubList(LIST_TYPE_LRGN);              RIFF::List* lrgn = insList->GetSubList(LIST_TYPE_LRGN);
4991              if (lrgn) {              if (lrgn) {
4992                  RIFF::List* rgn = lrgn->GetFirstSubList();                  size_t i = 0;
4993                  while (rgn) {                  for (RIFF::List* rgn = lrgn->GetSubListAt(i); rgn;
4994                         rgn = lrgn->GetSubListAt(++i))
4995                    {
4996                      if (rgn->GetListType() == LIST_TYPE_RGN) {                      if (rgn->GetListType() == LIST_TYPE_RGN) {
4997                          if (pProgress)                          if (pProgress)
4998                              __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);                              __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);
4999                          pRegions->push_back(new Region(this, rgn));                          pRegions->push_back(new Region(this, rgn));
5000                      }                      }
                     rgn = lrgn->GetNextSubList();  
5001                  }                  }
5002                  // Creating Region Key Table for fast lookup                  // Creating Region Key Table for fast lookup
5003                  UpdateRegionKeyTable();                  UpdateRegionKeyTable();
# Line 4914  namespace { Line 5007  namespace {
5007          // own gig format extensions          // own gig format extensions
5008          RIFF::List* lst3LS = insList->GetSubList(LIST_TYPE_3LS);          RIFF::List* lst3LS = insList->GetSubList(LIST_TYPE_3LS);
5009          if (lst3LS) {          if (lst3LS) {
5010                // script slots (that is references to instrument scripts)
5011              RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);              RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);
5012              if (ckSCSL) {              if (ckSCSL) {
5013                  ckSCSL->SetPos(0);                  ckSCSL->SetPos(0);
# Line 4933  namespace { Line 5027  namespace {
5027                      }                      }
5028                  }                  }
5029              }              }
5030    
5031                // overridden script 'patch' variables
5032                RIFF::Chunk* ckSCPV = lst3LS->GetSubChunk(CHUNK_ID_SCPV);
5033                if (ckSCPV) {
5034                    ckSCPV->SetPos(0);
5035    
5036                    int nScripts = ckSCPV->ReadUint32();
5037                    for (int iScript = 0; iScript < nScripts; ++iScript) {
5038                        _UUID uuid;
5039                        for (int i = 0; i < 16; ++i)
5040                            uuid[i] = ckSCPV->ReadUint8();
5041                        uint slot = ckSCPV->ReadUint32();
5042                        ckSCPV->ReadUint32(); // unused, reserved 32 bit
5043                        int nVars = ckSCPV->ReadUint32();
5044                        for (int iVar = 0; iVar < nVars; ++iVar) {
5045                            uint8_t type = ckSCPV->ReadUint8();
5046                            ckSCPV->ReadUint8();  // unused, reserved byte
5047                            int blobSize = ckSCPV->ReadUint16();
5048                            RIFF::file_offset_t pos = ckSCPV->GetPos();
5049                            // assuming 1st bit is set in 'type', otherwise blob not
5050                            // supported for decoding
5051                            if (type & 1) {
5052                                String name, value;
5053                                int len = ckSCPV->ReadUint16();
5054                                for (int i = 0; i < len; ++i)
5055                                    name += (char) ckSCPV->ReadUint8();
5056                                len = ckSCPV->ReadUint16();
5057                                for (int i = 0; i < len; ++i)
5058                                    value += (char) ckSCPV->ReadUint8();
5059                                if (!name.empty()) // 'name' should never be empty, but just to be sure
5060                                    scriptVars[uuid][slot][name] = value;
5061                            }
5062                            // also for potential future extensions: seek forward
5063                            // according to blob size
5064                            ckSCPV->SetPos(pos + blobSize);
5065                        }
5066                    }
5067                }
5068          }          }
5069    
5070          if (pProgress)          if (pProgress)
# Line 5024  namespace { Line 5156  namespace {
5156    
5157             RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);             RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);
5158             if (!lst3LS) lst3LS = pCkInstrument->AddSubList(LIST_TYPE_3LS);             if (!lst3LS) lst3LS = pCkInstrument->AddSubList(LIST_TYPE_3LS);
5159    
5160               // save script slots (that is references to instrument scripts)
5161             const int slotCount = (int) pScriptRefs->size();             const int slotCount = (int) pScriptRefs->size();
5162             const int headerSize = 3 * sizeof(uint32_t);             const int headerSize = 3 * sizeof(uint32_t);
5163             const int slotSize  = 2 * sizeof(uint32_t);             const int slotSize  = 2 * sizeof(uint32_t);
# Line 5048  namespace { Line 5182  namespace {
5182                 store32(&pData[pos], (*pScriptRefs)[i].bypass ? 1 : 0);                 store32(&pData[pos], (*pScriptRefs)[i].bypass ? 1 : 0);
5183                 pos += sizeof(uint32_t);                 pos += sizeof(uint32_t);
5184             }             }
5185    
5186               // save overridden script 'patch' variables ...
5187    
5188               // the actual 'scriptVars' member variable might contain variables of
5189               // scripts which are currently no longer assigned to any script slot
5190               // of this instrument, we need to get rid of these variables here to
5191               // prevent saving those persistently, however instead of touching the
5192               // member variable 'scriptVars' directly, rather strip a separate
5193               // copy such that the overridden values are not lost during an
5194               // instrument editor session (i.e. if script might be re-assigned)
5195               _VarsByScript vars = stripScriptVars();
5196               if (!vars.empty()) {
5197                   // determine total size required for 'SCPV' RIFF chunk, and the
5198                   // total amount of scripts being overridden (the latter is
5199                   // required because a script might be used on several script
5200                   // slots, hence vars.size() could then not be used here instead)
5201                   size_t totalChunkSize = 4;
5202                   size_t totalScriptsOverridden = 0;
5203                   for (const auto& script : vars) {
5204                       for (const auto& slot : script.second) {
5205                           totalScriptsOverridden++;
5206                           totalChunkSize += 16 + 4 + 4 + 4;
5207                           for (const auto& var : slot.second) {
5208                               totalChunkSize += 4 + 2 + var.first.length() +
5209                                                     2 + var.second.length();
5210                           }
5211                       }
5212                   }
5213    
5214                   // ensure 'SCPV' RIFF chunk exists (with required size)
5215                   RIFF::Chunk* ckSCPV = lst3LS->GetSubChunk(CHUNK_ID_SCPV);
5216                   if (!ckSCPV) ckSCPV = lst3LS->AddSubChunk(CHUNK_ID_SCPV, totalChunkSize);
5217                   else ckSCPV->Resize(totalChunkSize);
5218    
5219                   // store the actual data to 'SCPV' RIFF chunk
5220                   uint8_t* pData = (uint8_t*) ckSCPV->LoadChunkData();
5221                   int pos = 0;
5222                   store32(&pData[pos], (uint32_t) totalScriptsOverridden); // scripts count
5223                   pos += 4;
5224                   for (const auto& script : vars) {
5225                       for (const auto& slot : script.second) {
5226                           for (int i = 0; i < 16; ++i)
5227                               pData[pos+i] = script.first[i]; // uuid
5228                           pos += 16;
5229                           store32(&pData[pos], (uint32_t) slot.first); // slot index
5230                           pos += 4;
5231                           store32(&pData[pos], (uint32_t) 0); // unused, reserved 32 bit
5232                           pos += 4;
5233                           store32(&pData[pos], (uint32_t) slot.second.size()); // variables count
5234                           pos += 4;
5235                           for (const auto& var : slot.second) {
5236                               pData[pos++] = 1; // type
5237                               pData[pos++] = 0; // reserved byte
5238                               store16(&pData[pos], 2 + var.first.size() + 2 + var.second.size()); // blob size
5239                               pos += 2;
5240                               store16(&pData[pos], var.first.size()); // variable name length
5241                               pos += 2;
5242                               for (int i = 0; i < var.first.size(); ++i)
5243                                   pData[pos++] = var.first[i];
5244                               store16(&pData[pos], var.second.size()); // variable value length
5245                               pos += 2;
5246                               for (int i = 0; i < var.second.size(); ++i)
5247                                   pData[pos++] = var.second[i];
5248                           }
5249                       }
5250                   }
5251               } else {
5252                   // no script variable overridden by this instrument, so get rid
5253                   // of 'SCPV' RIFF chunk (if any)
5254                   RIFF::Chunk* ckSCPV = lst3LS->GetSubChunk(CHUNK_ID_SCPV);
5255                   if (ckSCPV) lst3LS->DeleteSubChunk(ckSCPV);
5256               }
5257         } else {         } else {
5258             // no script slots, so get rid of any LS custom RIFF chunks (if any)             // no script slots, so get rid of any LS custom RIFF chunks (if any)
5259             RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);             RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);
# Line 5095  namespace { Line 5301  namespace {
5301      }      }
5302    
5303      /**      /**
5304         * Returns Region at supplied @a pos position within the region list of
5305         * this instrument. If supplied @a pos is out of bounds then @c NULL is
5306         * returned.
5307         *
5308         * @param pos - position of sought Region in region list
5309         * @returns pointer address to requested region or @c NULL if @a pos is
5310         *          out of bounds
5311         */
5312        Region* Instrument::GetRegionAt(size_t pos) {
5313            if (!pRegions) return NULL;
5314            if (pos >= pRegions->size()) return NULL;
5315            return static_cast<gig::Region*>( (*pRegions)[pos] );
5316        }
5317    
5318        /**
5319       * Returns the first Region of the instrument. You have to call this       * Returns the first Region of the instrument. You have to call this
5320       * method once before you use GetNextRegion().       * method once before you use GetNextRegion().
5321       *       *
5322       * @returns  pointer address to first region or NULL if there is none       * @returns  pointer address to first region or NULL if there is none
5323       * @see      GetNextRegion()       * @see      GetNextRegion()
5324         * @deprecated  This method is not reentrant-safe, use GetRegionAt()
5325         *              instead.
5326       */       */
5327      Region* Instrument::GetFirstRegion() {      Region* Instrument::GetFirstRegion() {
5328          if (!pRegions) return NULL;          if (!pRegions) return NULL;
# Line 5114  namespace { Line 5337  namespace {
5337       *       *
5338       * @returns  pointer address to the next region or NULL if end reached       * @returns  pointer address to the next region or NULL if end reached
5339       * @see      GetFirstRegion()       * @see      GetFirstRegion()
5340         * @deprecated  This method is not reentrant-safe, use GetRegionAt()
5341         *              instead.
5342       */       */
5343      Region* Instrument::GetNextRegion() {      Region* Instrument::GetNextRegion() {
5344          if (!pRegions) return NULL;          if (!pRegions) return NULL;
# Line 5472  namespace { Line 5697  namespace {
5697              scriptPoolFileOffsets.at(index).bypass = bBypass;              scriptPoolFileOffsets.at(index).bypass = bBypass;
5698      }      }
5699    
5700        /// type cast (by copy) uint8_t[16] -> std::array<uint8_t,16>
5701        inline std::array<uint8_t,16> _UUIDFromCArray(const uint8_t* pData) {
5702            std::array<uint8_t,16> uuid;
5703            memcpy(&uuid[0], pData, 16);
5704            return uuid;
5705        }
5706    
5707        /**
5708         * Returns true if this @c Instrument has any script slot which references
5709         * the @c Script identified by passed @p uuid.
5710         */
5711        bool Instrument::ReferencesScriptWithUuid(const _UUID& uuid) {
5712            const uint nSlots = ScriptSlotCount();
5713            for (uint iSlot = 0; iSlot < nSlots; ++iSlot)
5714                if (_UUIDFromCArray(&GetScriptOfSlot(iSlot)->Uuid[0]) == uuid)
5715                    return true;
5716            return false;
5717        }
5718    
5719        /** @brief Checks whether a certain script 'patch' variable value is set.
5720         *
5721         * Returns @c true if the initial value for the requested script variable is
5722         * currently overridden by this instrument.
5723         *
5724         * @remarks Real-time instrument scripts allow to declare special 'patch'
5725         * variables, which essentially behave like regular variables of their data
5726         * type, however their initial value may optionally be overridden on a per
5727         * instrument basis. That allows to share scripts between instruments while
5728         * still being able to fine tune certain aspects of the script for each
5729         * instrument individually.
5730         *
5731         * @note This is an own format extension which did not exist i.e. in the
5732         * GigaStudio 4 software. It will currently only work with LinuxSampler and
5733         * Gigedit.
5734         *
5735         * @param slot - script slot index of the variable to be retrieved
5736         * @param variable - name of the 'patch' variable in that script
5737         */
5738        bool Instrument::IsScriptPatchVariableSet(int slot, String variable) {
5739            if (variable.empty()) return false;
5740            Script* script = GetScriptOfSlot(slot);
5741            if (!script) return false;
5742            const _UUID uuid = _UUIDFromCArray(&script->Uuid[0]);
5743            if (!scriptVars.count(uuid)) return false;
5744            const _VarsBySlot& slots = scriptVars.find(uuid)->second;
5745            if (slots.empty()) return false;
5746            if (slots.count(slot))
5747                return slots.find(slot)->second.count(variable);
5748            else
5749                return slots.begin()->second.count(variable);
5750        }
5751    
5752        /** @brief Get all overridden script 'patch' variables.
5753         *
5754         * Returns map of key-value pairs reflecting all patch variables currently
5755         * being overridden by this instrument for the given script @p slot, where
5756         * key is the variable name and value is the hereby currently overridden
5757         * value for that variable.
5758         *
5759         * @remarks Real-time instrument scripts allow to declare special 'patch'
5760         * variables, which essentially behave like regular variables of their data
5761         * type, however their initial value may optionally be overridden on a per
5762         * instrument basis. That allows to share scripts between instruments while
5763         * still being able to fine tune certain aspects of the script for each
5764         * instrument individually.
5765         *
5766         * @note This is an own format extension which did not exist i.e. in the
5767         * GigaStudio 4 software. It will currently only work with LinuxSampler and
5768         * Gigedit.
5769         *
5770         * @param slot - script slot index of the variable to be retrieved
5771         */
5772        std::map<String,String> Instrument::GetScriptPatchVariables(int slot) {
5773            Script* script = GetScriptOfSlot(slot);
5774            if (!script) return std::map<String,String>();
5775            const _UUID uuid = _UUIDFromCArray(&script->Uuid[0]);
5776            if (!scriptVars.count(uuid)) return std::map<String,String>();
5777            const _VarsBySlot& slots = scriptVars.find(uuid)->second;
5778            if (slots.empty()) return std::map<String,String>();
5779            const _PatchVars& vars =
5780                (slots.count(slot)) ?
5781                    slots.find(slot)->second : slots.begin()->second;
5782            return vars;
5783        }
5784    
5785        /** @brief Get overridden initial value for 'patch' variable.
5786         *
5787         * Returns current initial value for the requested script variable being
5788         * overridden by this instrument.
5789         *
5790         * @remarks Real-time instrument scripts allow to declare special 'patch'
5791         * variables, which essentially behave like regular variables of their data
5792         * type, however their initial value may optionally be overridden on a per
5793         * instrument basis. That allows to share scripts between instruments while
5794         * still being able to fine tune certain aspects of the script for each
5795         * instrument individually.
5796         *
5797         * @note This is an own format extension which did not exist i.e. in the
5798         * GigaStudio 4 software. It will currently only work with LinuxSampler and
5799         * Gigedit.
5800         *
5801         * @param slot - script slot index of the variable to be retrieved
5802         * @param variable - name of the 'patch' variable in that script
5803         */
5804        String Instrument::GetScriptPatchVariable(int slot, String variable) {
5805            std::map<String,String> vars = GetScriptPatchVariables(slot);
5806            return (vars.count(variable)) ? vars.find(variable)->second : "";
5807        }
5808    
5809        /** @brief Override initial value for 'patch' variable.
5810         *
5811         * Overrides initial value for the requested script variable for this
5812         * instrument with the passed value.
5813         *
5814         * @remarks Real-time instrument scripts allow to declare special 'patch'
5815         * variables, which essentially behave like regular variables of their data
5816         * type, however their initial value may optionally be overridden on a per
5817         * instrument basis. That allows to share scripts between instruments while
5818         * still being able to fine tune certain aspects of the script for each
5819         * instrument individually.
5820         *
5821         * @note This is an own format extension which did not exist i.e. in the
5822         * GigaStudio 4 software. It will currently only work with LinuxSampler and
5823         * Gigedit.
5824         *
5825         * @param slot - script slot index of the variable to be set
5826         * @param variable - name of the 'patch' variable in that script
5827         * @param value - overridden initial value for that script variable
5828         * @throws gig::Exception if given script @p slot index is invalid or given
5829         *         @p variable name is empty
5830         */
5831        void Instrument::SetScriptPatchVariable(int slot, String variable, String value) {
5832            if (variable.empty())
5833                throw Exception("Variable name must not be empty");
5834            Script* script = GetScriptOfSlot(slot);
5835            if (!script)
5836                throw Exception("No script slot with index " + ToString(slot));
5837            const _UUID uuid = _UUIDFromCArray(&script->Uuid[0]);
5838            scriptVars[uuid][slot][variable] = value;
5839        }
5840    
5841        /** @brief Drop overridden initial value(s) for 'patch' variable(s).
5842         *
5843         * Reverts initial value(s) for requested script variable(s) back to their
5844         * default initial value(s) defined in the script itself.
5845         *
5846         * Both arguments of this method are optional. The most obvious use case of
5847         * this method would be passing a valid script @p slot index and a
5848         * (non-emtpy string as) @p variable name to this method, which would cause
5849         * that single variable to be unset for that specific script slot (on this
5850         * @c Instrument level).
5851         *
5852         * Not passing a value (or @c -1 for @p slot and/or empty string for
5853         * @p variable) means 'wildcard'. So accordingly absence of argument(s) will
5854         * cause all variables and/or for all script slots being unset. Hence this
5855         * method serves 2^2 = 4 possible use cases in total and accordingly covers
5856         * 4 different behaviours in one method.
5857         *
5858         * @remarks Real-time instrument scripts allow to declare special 'patch'
5859         * variables, which essentially behave like regular variables of their data
5860         * type, however their initial value may optionally be overridden on a per
5861         * instrument basis. That allows to share scripts between instruments while
5862         * still being able to fine tune certain aspects of the script for each
5863         * instrument individually.
5864         *
5865         * @note This is an own format extension which did not exist i.e. in the
5866         * GigaStudio 4 software. It will currently only work with LinuxSampler and
5867         * Gigedit.
5868         *
5869         * @param slot - script slot index of the variable to be unset
5870         * @param variable - name of the 'patch' variable in that script
5871         */
5872        void Instrument::UnsetScriptPatchVariable(int slot, String variable) {
5873            Script* script = GetScriptOfSlot(slot);
5874    
5875            // option 1: unset a particular variable of one particular script slot
5876            if (slot != -1 && !variable.empty()) {
5877                if (!script) return;
5878                const _UUID uuid = _UUIDFromCArray(&script->Uuid[0]);
5879                if (!scriptVars.count(uuid)) return;
5880                if (!scriptVars[uuid].count(slot)) return;
5881                if (scriptVars[uuid][slot].count(variable))
5882                    scriptVars[uuid][slot].erase(
5883                        scriptVars[uuid][slot].find(variable)
5884                    );
5885                if (scriptVars[uuid][slot].empty())
5886                    scriptVars[uuid].erase( scriptVars[uuid].find(slot) );
5887                if (scriptVars[uuid].empty())
5888                    scriptVars.erase( scriptVars.find(uuid) );
5889                return;
5890            }
5891    
5892            // option 2: unset all variables of all script slots
5893            if (slot == -1 && variable.empty()) {
5894                scriptVars.clear();
5895                return;
5896            }
5897    
5898            // option 3: unset all variables of one particular script slot only
5899            if (slot != -1) {
5900                if (!script) return;
5901                const _UUID uuid = _UUIDFromCArray(&script->Uuid[0]);
5902                if (scriptVars.count(uuid))
5903                    scriptVars.erase( scriptVars.find(uuid) );
5904                return;
5905            }
5906    
5907            // option 4: unset a particular variable of all script slots
5908            _VarsByScript::iterator itScript = scriptVars.begin();
5909            _VarsByScript::iterator endScript = scriptVars.end();
5910            while (itScript != endScript) {
5911                _VarsBySlot& slots = itScript->second;
5912                _VarsBySlot::iterator itSlot = slots.begin();
5913                _VarsBySlot::iterator endSlot = slots.end();
5914                while (itSlot != endSlot) {
5915                    _PatchVars& vars = itSlot->second;
5916                    if (vars.count(variable))
5917                        vars.erase( vars.find(variable) );
5918                    if (vars.empty())
5919                        slots.erase(itSlot++); // postfix increment to avoid iterator invalidation
5920                    else
5921                        ++itSlot;
5922                }
5923                if (slots.empty())
5924                    scriptVars.erase(itScript++); // postfix increment to avoid iterator invalidation
5925                else
5926                    ++itScript;
5927            }
5928        }
5929    
5930        /**
5931         * Returns stripped version of member variable @c scriptVars, where scripts
5932         * no longer referenced by this @c Instrument are filtered out, and so are
5933         * variables of meanwhile obsolete slots (i.e. a script still being
5934         * referenced, but previously overridden on a script slot which either no
5935         * longer exists or is hosting another script now).
5936         */
5937        Instrument::_VarsByScript Instrument::stripScriptVars() {
5938            _VarsByScript vars;
5939            _VarsByScript::const_iterator itScript = scriptVars.begin();
5940            _VarsByScript::const_iterator endScript = scriptVars.end();
5941            for (; itScript != endScript; ++itScript) {
5942                const _UUID& uuid = itScript->first;
5943                if (!ReferencesScriptWithUuid(uuid))
5944                    continue;
5945                const _VarsBySlot& slots = itScript->second;
5946                _VarsBySlot::const_iterator itSlot = slots.begin();
5947                _VarsBySlot::const_iterator endSlot = slots.end();
5948                for (; itSlot != endSlot; ++itSlot) {
5949                    Script* script = GetScriptOfSlot(itSlot->first);
5950                    if (!script) continue;
5951                    if (_UUIDFromCArray(&script->Uuid[0]) != uuid) continue;
5952                    if (itSlot->second.empty()) continue;
5953                    vars[uuid][itSlot->first] = itSlot->second;
5954                }
5955            }
5956            return vars;
5957        }
5958    
5959      /**      /**
5960       * Make a (semi) deep copy of the Instrument object given by @a orig       * Make a (semi) deep copy of the Instrument object given by @a orig
5961       * and assign it to this object.       * and assign it to this object.
# Line 5506  namespace { Line 5990  namespace {
5990          PianoReleaseMode = orig->PianoReleaseMode;          PianoReleaseMode = orig->PianoReleaseMode;
5991          DimensionKeyRange = orig->DimensionKeyRange;          DimensionKeyRange = orig->DimensionKeyRange;
5992          scriptPoolFileOffsets = orig->scriptPoolFileOffsets;          scriptPoolFileOffsets = orig->scriptPoolFileOffsets;
5993          pScriptRefs = orig->pScriptRefs;          // deep copy of pScriptRefs required (to avoid undefined behaviour)
5994            if (pScriptRefs) delete pScriptRefs;
5995            pScriptRefs = new std::vector<_ScriptPooolRef>;
5996            if (orig->pScriptRefs)
5997                *pScriptRefs = *orig->pScriptRefs;
5998            scriptVars = orig->scriptVars;
5999                    
6000          // free old midi rules          // free old midi rules
6001          for (int i = 0 ; pMidiRules[i] ; i++) {          for (int i = 0 ; pMidiRules[i] ; i++) {
# Line 5516  namespace { Line 6005  namespace {
6005          pMidiRules[0] = NULL;          pMidiRules[0] = NULL;
6006                    
6007          // delete all old regions          // delete all old regions
6008          while (Regions) DeleteRegion(GetFirstRegion());          while (Regions) DeleteRegion(GetRegionAt(0));
6009          // create new regions and copy them from original          // create new regions and copy them from original
6010          {          {
6011              RegionList::const_iterator it = orig->pRegions->begin();              RegionList::const_iterator it = orig->pRegions->begin();
# Line 5533  namespace { Line 6022  namespace {
6022          UpdateRegionKeyTable();          UpdateRegionKeyTable();
6023      }      }
6024    
6025        /**
6026         * Returns @c true in case this Instrument object uses any gig format
6027         * extension, that is e.g. whether any DimensionRegion object currently
6028         * has any setting effective that would require our "LSDE" RIFF chunk to
6029         * be stored to the gig file.
6030         *
6031         * Right now this is a private method. It is considerable though this method
6032         * to become (in slightly modified form) a public API method in future, i.e.
6033         * to allow instrument editors to visualize and/or warn the user of any gig
6034         * format extension being used. See also comments on
6035         * DimensionRegion::UsesAnyGigFormatExtension() for details about such a
6036         * potential public API change in future.
6037         */
6038        bool Instrument::UsesAnyGigFormatExtension() const {
6039            if (!pRegions) return false;
6040            if (!scriptVars.empty()) return true;
6041            RegionList::const_iterator iter = pRegions->begin();
6042            RegionList::const_iterator end  = pRegions->end();
6043            for (; iter != end; ++iter) {
6044                gig::Region* rgn = static_cast<gig::Region*>(*iter);
6045                if (rgn->UsesAnyGigFormatExtension())
6046                    return true;
6047            }
6048            return false;
6049        }
6050    
6051    
6052  // *************** Group ***************  // *************** Group ***************
6053  // *  // *
# Line 5590  namespace { Line 6105  namespace {
6105    
6106          if (!pNameChunk && pFile->pVersion && pFile->pVersion->major > 2) {          if (!pNameChunk && pFile->pVersion && pFile->pVersion->major > 2) {
6107              // v3 has a fixed list of 128 strings, find a free one              // v3 has a fixed list of 128 strings, find a free one
6108              for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {              size_t i = 0;
6109                for (RIFF::Chunk* ck = _3gnl->GetSubChunkAt(i); ck; ck = _3gnl->GetSubChunkAt(++i)) {
6110                  if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {                  if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {
6111                      pNameChunk = ck;                      pNameChunk = ck;
6112                      break;                      break;
# Line 5754  namespace { Line 6270  namespace {
6270          }          }
6271      }      }
6272    
6273        /**
6274         * Returns a pointer to the first <i>Sample</i> object of the file,
6275         * <i>NULL</i> otherwise.
6276         *
6277         * @param pProgress - optional: callback function for progress notification
6278         * @deprecated  This method is not reentrant-safe, use GetSample()
6279         *              instead.
6280         */
6281      Sample* File::GetFirstSample(progress_t* pProgress) {      Sample* File::GetFirstSample(progress_t* pProgress) {
6282          if (!pSamples) LoadSamples(pProgress);          if (!pSamples) LoadSamples(pProgress);
6283          if (!pSamples) return NULL;          if (!pSamples) return NULL;
# Line 5761  namespace { Line 6285  namespace {
6285          return static_cast<gig::Sample*>( (SamplesIterator != pSamples->end()) ? *SamplesIterator : NULL );          return static_cast<gig::Sample*>( (SamplesIterator != pSamples->end()) ? *SamplesIterator : NULL );
6286      }      }
6287    
6288        /**
6289         * Returns a pointer to the next <i>Sample</i> object of the file,
6290         * <i>NULL</i> otherwise.
6291         *
6292         * @deprecated  This method is not reentrant-safe, use GetSample()
6293         *              instead.
6294         */
6295      Sample* File::GetNextSample() {      Sample* File::GetNextSample() {
6296          if (!pSamples) return NULL;          if (!pSamples) return NULL;
6297          SamplesIterator++;          SamplesIterator++;
# Line 5770  namespace { Line 6301  namespace {
6301      /**      /**
6302       * Returns Sample object of @a index.       * Returns Sample object of @a index.
6303       *       *
6304         * @param index - position of sample in sample list (0..n)
6305         * @param pProgress - optional: callback function for progress notification
6306       * @returns sample object or NULL if index is out of bounds       * @returns sample object or NULL if index is out of bounds
6307       */       */
6308      Sample* File::GetSample(uint index) {      Sample* File::GetSample(size_t index, progress_t* pProgress) {
6309          if (!pSamples) LoadSamples();          if (!pSamples) LoadSamples(pProgress);
6310          if (!pSamples) return NULL;          if (!pSamples) return NULL;
6311          DLS::File::SampleList::iterator it = pSamples->begin();          if (index >= pSamples->size()) return NULL;
6312          for (int i = 0; i < index; ++i) {          return static_cast<gig::Sample*>( (*pSamples)[index] );
             ++it;  
             if (it == pSamples->end()) return NULL;  
         }  
         if (it == pSamples->end()) return NULL;  
         return static_cast<gig::Sample*>( *it );  
6313      }      }
6314    
6315      /**      /**
# Line 5843  namespace { Line 6371  namespace {
6371          // remove all references to the sample          // remove all references to the sample
6372          for (Instrument* instrument = GetFirstInstrument() ; instrument ;          for (Instrument* instrument = GetFirstInstrument() ; instrument ;
6373               instrument = GetNextInstrument()) {               instrument = GetNextInstrument()) {
6374              for (Region* region = instrument->GetFirstRegion() ; region ;              size_t iRgn = 0;
6375                   region = instrument->GetNextRegion()) {              for (Region* region = instrument->GetRegionAt(iRgn); region;
6376                     region = instrument->GetRegionAt(++iRgn))
6377                {
6378                  if (region->GetSample() == pSample) region->SetSample(NULL);                  if (region->GetSample() == pSample) region->SetSample(NULL);
6379    
6380                  for (int i = 0 ; i < region->DimensionRegions ; i++) {                  for (int i = 0 ; i < region->DimensionRegions ; i++) {
# Line 5868  namespace { Line 6397  namespace {
6397    
6398          if (!pSamples) pSamples = new SampleList;          if (!pSamples) pSamples = new SampleList;
6399    
         RIFF::File* file = pRIFF;  
   
6400          // just for progress calculation          // just for progress calculation
6401          int iSampleIndex  = 0;          int iSampleIndex  = 0;
6402          int iTotalSamples = WavePoolCount;          int iTotalSamples = WavePoolCount;
# Line 5950  namespace { Line 6477  namespace {
6477              if (wvpl) {              if (wvpl) {
6478                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -
6479                                                 wvpl->GetPos(); // should be zero, but just to be sure                                                 wvpl->GetPos(); // should be zero, but just to be sure
6480                  RIFF::List* wave = wvpl->GetFirstSubList();                  size_t i = 0;
6481                  while (wave) {                  for (RIFF::List* wave = wvpl->GetSubListAt(i); wave;
6482                         wave = wvpl->GetSubListAt(++i))
6483                    {
6484                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
6485                          // notify current progress                          // notify current progress
6486                          if (pProgress) {                          if (pProgress) {
# Line 5964  namespace { Line 6493  namespace {
6493    
6494                          iSampleIndex++;                          iSampleIndex++;
6495                      }                      }
                     wave = wvpl->GetNextSubList();  
6496                  }                  }
6497              }              }
6498          }          }
# Line 6197  namespace { Line 6725  namespace {
6725          RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);          RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);
6726          if (lstInstruments) {          if (lstInstruments) {
6727              int iInstrumentIndex = 0;              int iInstrumentIndex = 0;
6728              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();              size_t i = 0;
6729              while (lstInstr) {              for (RIFF::List* lstInstr = lstInstruments->GetSubListAt(i);
6730                     lstInstr; lstInstr = lstInstruments->GetSubListAt(++i))
6731                {
6732                  if (lstInstr->GetListType() == LIST_TYPE_INS) {                  if (lstInstr->GetListType() == LIST_TYPE_INS) {
6733                      if (pProgress) {                      if (pProgress) {
6734                          // notify current progress                          // notify current progress
# Line 6216  namespace { Line 6746  namespace {
6746    
6747                      iInstrumentIndex++;                      iInstrumentIndex++;
6748                  }                  }
                 lstInstr = lstInstruments->GetNextSubList();  
6749              }              }
6750              if (pProgress)              if (pProgress)
6751                  __notify_progress(pProgress, 1.0); // notify done                  __notify_progress(pProgress, 1.0); // notify done
# Line 6482  namespace { Line 7011  namespace {
7011          if (lst3gri) {          if (lst3gri) {
7012              RIFF::List* lst3gnl = lst3gri->GetSubList(LIST_TYPE_3GNL);              RIFF::List* lst3gnl = lst3gri->GetSubList(LIST_TYPE_3GNL);
7013              if (lst3gnl) {              if (lst3gnl) {
7014                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();                  size_t i = 0;
7015                  while (ck) {                  for (RIFF::Chunk* ck = lst3gnl->GetSubChunkAt(i); ck;
7016                         ck = lst3gnl->GetSubChunkAt(++i))
7017                    {
7018                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {
7019                          if (pVersion && pVersion->major > 2 &&                          if (pVersion && pVersion->major > 2 &&
7020                              strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;                              strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;
7021    
7022                          pGroups->push_back(new Group(this, ck));                          pGroups->push_back(new Group(this, ck));
7023                      }                      }
                     ck = lst3gnl->GetNextSubChunk();  
7024                  }                  }
7025              }              }
7026          }          }
# Line 6580  namespace { Line 7110  namespace {
7110          pScriptGroups = new std::list<ScriptGroup*>;          pScriptGroups = new std::list<ScriptGroup*>;
7111          RIFF::List* lstLS = pRIFF->GetSubList(LIST_TYPE_3LS);          RIFF::List* lstLS = pRIFF->GetSubList(LIST_TYPE_3LS);
7112          if (lstLS) {          if (lstLS) {
7113              for (RIFF::List* lst = lstLS->GetFirstSubList(); lst;              size_t i = 0;
7114                   lst = lstLS->GetNextSubList())              for (RIFF::List* lst = lstLS->GetSubListAt(i); lst;
7115                     lst = lstLS->GetSubListAt(++i))
7116              {              {
7117                  if (lst->GetListType() == LIST_TYPE_RTIS) {                  if (lst->GetListType() == LIST_TYPE_RTIS) {
7118                      pScriptGroups->push_back(new ScriptGroup(this, lst));                      pScriptGroups->push_back(new ScriptGroup(this, lst));
# Line 6642  namespace { Line 7173  namespace {
7173              // INFO was added by Resource::UpdateChunks - make sure it              // INFO was added by Resource::UpdateChunks - make sure it
7174              // is placed first in file              // is placed first in file
7175              RIFF::Chunk* info = pRIFF->GetSubList(LIST_TYPE_INFO);              RIFF::Chunk* info = pRIFF->GetSubList(LIST_TYPE_INFO);
7176              RIFF::Chunk* first = pRIFF->GetFirstSubChunk();              RIFF::Chunk* first = pRIFF->GetSubChunkAt(0);
7177              if (first != info) {              if (first != info) {
7178                  pRIFF->MoveSubChunk(info, first);                  pRIFF->MoveSubChunk(info, first);
7179              }              }
# Line 6663  namespace { Line 7194  namespace {
7194              // v3: make sure the file has 128 3gnm chunks              // v3: make sure the file has 128 3gnm chunks
7195              // (before updating the Group chunks)              // (before updating the Group chunks)
7196              if (pVersion && pVersion->major > 2) {              if (pVersion && pVersion->major > 2) {
7197                  RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();                  size_t i = 0;
7198                  for (int i = 0 ; i < 128 ; i++) {                  for (RIFF::Chunk* _3gnm = _3gnl->GetSubChunkAt(i); i < 128;
7199                         _3gnm = _3gnl->GetSubChunkAt(++i))
7200                    {
7201                      // create 128 empty placeholder strings which will either                      // create 128 empty placeholder strings which will either
7202                      // be filled by Group::UpdateChunks below or left empty.                      // be filled by Group::UpdateChunks below or left empty.
7203                      ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);                      ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);
                     if (_3gnm) _3gnm = _3gnl->GetNextSubChunk();  
7204                  }                  }
7205              }              }
7206    
# Line 6734  namespace { Line 7266  namespace {
7266    
7267                  memset(&pData[(instrumentIdx + 1) * sublen + 48], 0, sublen - 48);                  memset(&pData[(instrumentIdx + 1) * sublen + 48], 0, sublen - 48);
7268    
7269                  for (Region* region = instrument->GetFirstRegion() ; region ;                  size_t iRgn = 0;
7270                       region = instrument->GetNextRegion()) {                  for (Region* region = instrument->GetRegionAt(iRgn); region;
7271                         region = instrument->GetRegionAt(++iRgn))
7272                    {
7273                      for (int i = 0 ; i < region->DimensionRegions ; i++) {                      for (int i = 0 ; i < region->DimensionRegions ; i++) {
7274                          gig::DimensionRegion *d = region->pDimensionRegions[i];                          gig::DimensionRegion *d = region->pDimensionRegions[i];
7275                          if (d->pSample) {                          if (d->pSample) {
# Line 6863  namespace { Line 7397  namespace {
7397          return bAutoLoad;          return bAutoLoad;
7398      }      }
7399    
7400        /**
7401         * Returns @c true in case this gig File object uses any gig format
7402         * extension, that is e.g. whether any DimensionRegion object currently
7403         * has any setting effective that would require our "LSDE" RIFF chunk to
7404         * be stored to the gig file.
7405         *
7406         * Right now this is a private method. It is considerable though this method
7407         * to become (in slightly modified form) a public API method in future, i.e.
7408         * to allow instrument editors to visualize and/or warn the user of any gig
7409         * format extension being used. See also comments on
7410         * DimensionRegion::UsesAnyGigFormatExtension() for details about such a
7411         * potential public API change in future.
7412         */
7413        bool File::UsesAnyGigFormatExtension() const {
7414            if (!pInstruments) return false;
7415            InstrumentList::iterator iter = pInstruments->begin();
7416            InstrumentList::iterator end  = pInstruments->end();
7417            for (; iter != end; ++iter) {
7418                Instrument* pInstrument = static_cast<gig::Instrument*>(*iter);
7419                if (pInstrument->UsesAnyGigFormatExtension())
7420                    return true;
7421            }
7422            return false;
7423        }
7424    
7425    
7426  // *************** Exception ***************  // *************** Exception ***************

Legend:
Removed from v.3709  
changed lines
  Added in v.3928

  ViewVC Help
Powered by ViewVC