/[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 2985 by schoenebeck, Tue Sep 20 22:13:37 2016 UTC revision 3203 by schoenebeck, Tue May 23 14:51:01 2017 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-2017 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 269  namespace { Line 273  namespace {
273       * steps.       * steps.
274       *       *
275       * Once the whole data was processed by __calculateCRC(), one should       * Once the whole data was processed by __calculateCRC(), one should
276       * call __encodeCRC() to get the final CRC result.       * call __finalizeCRC() to get the final CRC result.
277       *       *
278       * @param buf     - pointer to data the CRC shall be calculated of       * @param buf     - pointer to data the CRC shall be calculated of
279       * @param bufSize - size of the data to be processed       * @param bufSize - size of the data to be processed
280       * @param crc     - variable the CRC sum shall be stored to       * @param crc     - variable the CRC sum shall be stored to
281       */       */
282      static void __calculateCRC(unsigned char* buf, int bufSize, uint32_t& crc) {      static void __calculateCRC(unsigned char* buf, size_t bufSize, uint32_t& crc) {
283          for (int i = 0 ; i < bufSize ; i++) {          for (size_t i = 0 ; i < bufSize ; i++) {
284              crc = __CRCTable[(crc ^ buf[i]) & 0xff] ^ (crc >> 8);              crc = __CRCTable[(crc ^ buf[i]) & 0xff] ^ (crc >> 8);
285          }          }
286      }      }
# Line 286  namespace { Line 290  namespace {
290       *       *
291       * @param crc - variable previously passed to __calculateCRC()       * @param crc - variable previously passed to __calculateCRC()
292       */       */
293      inline static uint32_t __encodeCRC(const uint32_t& crc) {      inline static void __finalizeCRC(uint32_t& crc) {
294          return crc ^ 0xffffffff;          crc ^= 0xffffffff;
295      }      }
296    
297    
# 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  // *************** Sample ***************  // *************** Sample ***************
345  // *  // *
346    
# Line 338  namespace { Line 364  namespace {
364       *                         ('wvpl') list chunk       *                         ('wvpl') list chunk
365       * @param fileNo         - number of an extension file where this sample       * @param fileNo         - number of an extension file where this sample
366       *                         is located, 0 otherwise       *                         is located, 0 otherwise
367         * @param index          - wave pool index of sample (may be -1 on new sample)
368       */       */
369      Sample::Sample(File* pFile, RIFF::List* waveList, file_offset_t WavePoolOffset, unsigned long fileNo) : DLS::Sample((DLS::File*) pFile, waveList, WavePoolOffset) {      Sample::Sample(File* pFile, RIFF::List* waveList, file_offset_t WavePoolOffset, unsigned long fileNo, int index)
370            : DLS::Sample((DLS::File*) pFile, waveList, WavePoolOffset)
371        {
372          static const DLS::Info::string_length_t fixedStringLengths[] = {          static const DLS::Info::string_length_t fixedStringLengths[] = {
373              { CHUNK_ID_INAM, 64 },              { CHUNK_ID_INAM, 64 },
374              { 0, 0 }              { 0, 0 }
# Line 349  namespace { Line 378  namespace {
378          FileNo = fileNo;          FileNo = fileNo;
379    
380          __resetCRC(crc);          __resetCRC(crc);
381            // if this is not a new sample, try to get the sample's already existing
382            // CRC32 checksum from disk, this checksum will reflect the sample's CRC32
383            // checksum of the time when the sample was consciously modified by the
384            // user for the last time (by calling Sample::Write() that is).
385            if (index >= 0) { // not a new file ...
386                try {
387                    uint32_t crc = pFile->GetSampleChecksumByIndex(index);
388                    this->crc = crc;
389                } catch (...) {}
390            }
391    
392          pCk3gix = waveList->GetSubChunk(CHUNK_ID_3GIX);          pCk3gix = waveList->GetSubChunk(CHUNK_ID_3GIX);
393          if (pCk3gix) {          if (pCk3gix) {
# Line 1281  namespace { Line 1320  namespace {
1320          // if this is the last write, update the checksum chunk in the          // if this is the last write, update the checksum chunk in the
1321          // file          // file
1322          if (pCkData->GetPos() == pCkData->GetSize()) {          if (pCkData->GetPos() == pCkData->GetSize()) {
1323                __finalizeCRC(crc);
1324              File* pFile = static_cast<File*>(GetParent());              File* pFile = static_cast<File*>(GetParent());
1325              pFile->SetSampleChecksum(this, __encodeCRC(crc));              pFile->SetSampleChecksum(this, crc);
1326          }          }
1327          return res;          return res;
1328      }      }
# Line 1342  namespace { Line 1382  namespace {
1382      }      }
1383    
1384      /**      /**
1385         * Returns the CRC-32 checksum of the sample's raw wave form data at the
1386         * time when this sample's wave form data was modified for the last time
1387         * by calling Write(). This checksum only covers the raw wave form data,
1388         * not any meta informations like i.e. bit depth or loop points. Since
1389         * this method just returns the checksum stored for this sample i.e. when
1390         * the gig file was loaded, this method returns immediately. So it does no
1391         * recalcuation of the checksum with the currently available sample wave
1392         * form data.
1393         *
1394         * @see VerifyWaveData()
1395         */
1396        uint32_t Sample::GetWaveDataCRC32Checksum() {
1397            return crc;
1398        }
1399    
1400        /**
1401       * Checks the integrity of this sample's raw audio wave data. Whenever a       * Checks the integrity of this sample's raw audio wave data. Whenever a
1402       * Sample's raw wave data is intentionally modified (i.e. by calling       * Sample's raw wave data is intentionally modified (i.e. by calling
1403       * Write() and supplying the new raw audio wave form data) a CRC32 checksum       * Write() and supplying the new raw audio wave form data) a CRC32 checksum
# Line 1357  namespace { Line 1413  namespace {
1413       * default whenever a gig file is loaded. So this method must be called       * default whenever a gig file is loaded. So this method must be called
1414       * explicitly to fulfill this task.       * explicitly to fulfill this task.
1415       *       *
1416         * @param pActually - (optional) if provided, will be set to the actually
1417         *                    calculated checksum of the current raw wave form data,
1418         *                    you can get the expected checksum instead by calling
1419         *                    GetWaveDataCRC32Checksum()
1420       * @returns true if sample is OK or false if the sample is damaged       * @returns true if sample is OK or false if the sample is damaged
1421       * @throws Exception if no checksum had been stored to disk for this       * @throws Exception if no checksum had been stored to disk for this
1422       *         sample yet, or on I/O issues       *         sample yet, or on I/O issues
1423         * @see GetWaveDataCRC32Checksum()
1424       */       */
1425      bool Sample::VerifyWaveData() {      bool Sample::VerifyWaveData(uint32_t* pActually) {
1426          File* pFile = static_cast<File*>(GetParent());          //File* pFile = static_cast<File*>(GetParent());
         const uint32_t referenceCRC = pFile->GetSampleChecksum(this);  
1427          uint32_t crc = CalculateWaveDataChecksum();          uint32_t crc = CalculateWaveDataChecksum();
1428          return crc == referenceCRC;          if (pActually) *pActually = crc;
1429            return crc == this->crc;
1430      }      }
1431    
1432      uint32_t Sample::CalculateWaveDataChecksum() {      uint32_t Sample::CalculateWaveDataChecksum() {
# Line 1382  namespace { Line 1443  namespace {
1443              if (nRead <= 0) break;              if (nRead <= 0) break;
1444              __calculateCRC(&buffer[0], nRead * FrameSize, crc);              __calculateCRC(&buffer[0], nRead * FrameSize, crc);
1445          }          }
1446          __encodeCRC(crc);          __finalizeCRC(crc);
1447          return crc;          return crc;
1448      }      }
1449    
# Line 1596  namespace { Line 1657  namespace {
1657              EG2Attack                       = 0.0;              EG2Attack                       = 0.0;
1658              EG2Decay1                       = 0.005;              EG2Decay1                       = 0.005;
1659              EG2Sustain                      = 1000;              EG2Sustain                      = 1000;
1660              EG2Release                      = 0.3;              EG2Release                      = 60;
1661              LFO2ControlDepth                = 0;              LFO2ControlDepth                = 0;
1662              LFO2Frequency                   = 1.0;              LFO2Frequency                   = 1.0;
1663              LFO2InternalDepth               = 0;              LFO2InternalDepth               = 0;
# Line 1755  namespace { Line 1816  namespace {
1816          }          }
1817      }      }
1818    
1819        void DimensionRegion::serialize(Serialization::Archive* archive) {
1820            // in case this class will become backward incompatible one day,
1821            // then set a version and minimum version for this class like:
1822            //archive->setVersion(*this, 2);
1823            //archive->setMinVersion(*this, 1);
1824    
1825            SRLZ(VelocityUpperLimit);
1826            SRLZ(EG1PreAttack);
1827            SRLZ(EG1Attack);
1828            SRLZ(EG1Decay1);
1829            SRLZ(EG1Decay2);
1830            SRLZ(EG1InfiniteSustain);
1831            SRLZ(EG1Sustain);
1832            SRLZ(EG1Release);
1833            SRLZ(EG1Hold);
1834            SRLZ(EG1Controller);
1835            SRLZ(EG1ControllerInvert);
1836            SRLZ(EG1ControllerAttackInfluence);
1837            SRLZ(EG1ControllerDecayInfluence);
1838            SRLZ(EG1ControllerReleaseInfluence);
1839            SRLZ(LFO1Frequency);
1840            SRLZ(LFO1InternalDepth);
1841            SRLZ(LFO1ControlDepth);
1842            SRLZ(LFO1Controller);
1843            SRLZ(LFO1FlipPhase);
1844            SRLZ(LFO1Sync);
1845            SRLZ(EG2PreAttack);
1846            SRLZ(EG2Attack);
1847            SRLZ(EG2Decay1);
1848            SRLZ(EG2Decay2);
1849            SRLZ(EG2InfiniteSustain);
1850            SRLZ(EG2Sustain);
1851            SRLZ(EG2Release);
1852            SRLZ(EG2Controller);
1853            SRLZ(EG2ControllerInvert);
1854            SRLZ(EG2ControllerAttackInfluence);
1855            SRLZ(EG2ControllerDecayInfluence);
1856            SRLZ(EG2ControllerReleaseInfluence);
1857            SRLZ(LFO2Frequency);
1858            SRLZ(LFO2InternalDepth);
1859            SRLZ(LFO2ControlDepth);
1860            SRLZ(LFO2Controller);
1861            SRLZ(LFO2FlipPhase);
1862            SRLZ(LFO2Sync);
1863            SRLZ(EG3Attack);
1864            SRLZ(EG3Depth);
1865            SRLZ(LFO3Frequency);
1866            SRLZ(LFO3InternalDepth);
1867            SRLZ(LFO3ControlDepth);
1868            SRLZ(LFO3Controller);
1869            SRLZ(LFO3Sync);
1870            SRLZ(VCFEnabled);
1871            SRLZ(VCFType);
1872            SRLZ(VCFCutoffController);
1873            SRLZ(VCFCutoffControllerInvert);
1874            SRLZ(VCFCutoff);
1875            SRLZ(VCFVelocityCurve);
1876            SRLZ(VCFVelocityScale);
1877            SRLZ(VCFVelocityDynamicRange);
1878            SRLZ(VCFResonance);
1879            SRLZ(VCFResonanceDynamic);
1880            SRLZ(VCFResonanceController);
1881            SRLZ(VCFKeyboardTracking);
1882            SRLZ(VCFKeyboardTrackingBreakpoint);
1883            SRLZ(VelocityResponseCurve);
1884            SRLZ(VelocityResponseDepth);
1885            SRLZ(VelocityResponseCurveScaling);
1886            SRLZ(ReleaseVelocityResponseCurve);
1887            SRLZ(ReleaseVelocityResponseDepth);
1888            SRLZ(ReleaseTriggerDecay);
1889            SRLZ(Crossfade);
1890            SRLZ(PitchTrack);
1891            SRLZ(DimensionBypass);
1892            SRLZ(Pan);
1893            SRLZ(SelfMask);
1894            SRLZ(AttenuationController);
1895            SRLZ(InvertAttenuationController);
1896            SRLZ(AttenuationControllerThreshold);
1897            SRLZ(ChannelOffset);
1898            SRLZ(SustainDefeat);
1899            SRLZ(MSDecode);
1900            //SRLZ(SampleStartOffset);
1901            SRLZ(SampleAttenuation);
1902    
1903            // derived attributes from DLS::Sampler
1904            SRLZ(FineTune);
1905            SRLZ(Gain);
1906        }
1907    
1908      /**      /**
1909       * Updates the respective member variable and updates @c SampleAttenuation       * Updates the respective member variable and updates @c SampleAttenuation
1910       * which depends on this value.       * which depends on this value.
# Line 1795  namespace { Line 1945  namespace {
1945    
1946          // update '3ewa' chunk with DimensionRegion's current settings          // update '3ewa' chunk with DimensionRegion's current settings
1947    
1948          const uint32_t chunksize = _3ewa->GetNewSize();          const uint32_t chunksize = (uint32_t) _3ewa->GetNewSize();
1949          store32(&pData[0], chunksize); // unknown, always chunk size?          store32(&pData[0], chunksize); // unknown, always chunk size?
1950    
1951          const int32_t lfo3freq = (int32_t) GIG_EXP_ENCODE(LFO3Frequency);          const int32_t lfo3freq = (int32_t) GIG_EXP_ENCODE(LFO3Frequency);
# Line 2469  namespace { Line 2619  namespace {
2619    
2620              // unknown controller type              // unknown controller type
2621              default:              default:
2622                  throw gig::Exception("Unknown leverage controller type.");                  decodedcontroller.type = leverage_ctrl_t::type_none;
2623                    decodedcontroller.controller_number = 0;
2624                    printf("Warning: Unknown leverage controller type (0x%x).\n", EncodedController);
2625                    break;
2626          }          }
2627          return decodedcontroller;          return decodedcontroller;
2628      }      }
# Line 3763  namespace { Line 3916  namespace {
3916      DimensionRegion* Region::GetDimensionRegionByValue(const uint DimValues[8]) {      DimensionRegion* Region::GetDimensionRegionByValue(const uint DimValues[8]) {
3917          uint8_t bits;          uint8_t bits;
3918          int veldim = -1;          int veldim = -1;
3919          int velbitpos;          int velbitpos = 0;
3920          int bitpos = 0;          int bitpos = 0;
3921          int dimregidx = 0;          int dimregidx = 0;
3922          for (uint i = 0; i < Dimensions; i++) {          for (uint i = 0; i < Dimensions; i++) {
# Line 3812  namespace { Line 3965  namespace {
3965      int Region::GetDimensionRegionIndexByValue(const uint DimValues[8]) {      int Region::GetDimensionRegionIndexByValue(const uint DimValues[8]) {
3966          uint8_t bits;          uint8_t bits;
3967          int veldim = -1;          int veldim = -1;
3968          int velbitpos;          int velbitpos = 0;
3969          int bitpos = 0;          int bitpos = 0;
3970          int dimregidx = 0;          int dimregidx = 0;
3971          for (uint i = 0; i < Dimensions; i++) {          for (uint i = 0; i < Dimensions; i++) {
# Line 4161  namespace { Line 4314  namespace {
4314              // to handle potential future extensions of the header              // to handle potential future extensions of the header
4315              ckScri->SetPos(sizeof(int32_t) + headerSize);              ckScri->SetPos(sizeof(int32_t) + headerSize);
4316              // read actual script data              // read actual script data
4317              uint32_t scriptSize = ckScri->GetSize() - ckScri->GetPos();              uint32_t scriptSize = uint32_t(ckScri->GetSize() - ckScri->GetPos());
4318              data.resize(scriptSize);              data.resize(scriptSize);
4319              for (int i = 0; i < scriptSize; ++i)              for (int i = 0; i < scriptSize; ++i)
4320                  data[i] = ckScri->ReadUint8();                  data[i] = ckScri->ReadUint8();
# Line 4212  namespace { Line 4365  namespace {
4365          // recalculate CRC32 check sum          // recalculate CRC32 check sum
4366          __resetCRC(crc);          __resetCRC(crc);
4367          __calculateCRC(&data[0], data.size(), crc);          __calculateCRC(&data[0], data.size(), crc);
4368          __encodeCRC(crc);          __finalizeCRC(crc);
4369          // make sure chunk exists and has the required size          // make sure chunk exists and has the required size
4370          const int chunkSize = 7*sizeof(int32_t) + Name.size() + data.size();          const file_offset_t chunkSize = (file_offset_t) 7*sizeof(int32_t) + Name.size() + data.size();
4371          if (!pChunk) pChunk = pGroup->pList->AddSubChunk(CHUNK_ID_SCRI, chunkSize);          if (!pChunk) pChunk = pGroup->pList->AddSubChunk(CHUNK_ID_SCRI, chunkSize);
4372          else pChunk->Resize(chunkSize);          else pChunk->Resize(chunkSize);
4373          // fill the chunk data to be written to disk          // fill the chunk data to be written to disk
4374          uint8_t* pData = (uint8_t*) pChunk->LoadChunkData();          uint8_t* pData = (uint8_t*) pChunk->LoadChunkData();
4375          int pos = 0;          int pos = 0;
4376          store32(&pData[pos], 6*sizeof(int32_t) + Name.size()); // total header size          store32(&pData[pos], uint32_t(6*sizeof(int32_t) + Name.size())); // total header size
4377          pos += sizeof(int32_t);          pos += sizeof(int32_t);
4378          store32(&pData[pos], Compression);          store32(&pData[pos], Compression);
4379          pos += sizeof(int32_t);          pos += sizeof(int32_t);
# Line 4232  namespace { Line 4385  namespace {
4385          pos += sizeof(int32_t);          pos += sizeof(int32_t);
4386          store32(&pData[pos], crc);          store32(&pData[pos], crc);
4387          pos += sizeof(int32_t);          pos += sizeof(int32_t);
4388          store32(&pData[pos], Name.size());          store32(&pData[pos], (uint32_t) Name.size());
4389          pos += sizeof(int32_t);          pos += sizeof(int32_t);
4390          for (int i = 0; i < Name.size(); ++i, ++pos)          for (int i = 0; i < Name.size(); ++i, ++pos)
4391              pData[pos] = Name[i];              pData[pos] = Name[i];
# Line 4263  namespace { Line 4416  namespace {
4416          return pGroup;          return pGroup;
4417      }      }
4418    
4419        /**
4420         * Make a (semi) deep copy of the Script object given by @a orig
4421         * and assign it to this object. Note: the ScriptGroup this Script
4422         * object belongs to remains untouched by this call.
4423         *
4424         * @param orig - original Script object to be copied from
4425         */
4426        void Script::CopyAssign(const Script* orig) {
4427            Name        = orig->Name;
4428            Compression = orig->Compression;
4429            Encoding    = orig->Encoding;
4430            Language    = orig->Language;
4431            Bypass      = orig->Bypass;
4432            data        = orig->data;
4433        }
4434    
4435      void Script::RemoveAllScriptReferences() {      void Script::RemoveAllScriptReferences() {
4436          File* pFile = pGroup->pFile;          File* pFile = pGroup->pFile;
4437          for (int i = 0; pFile->GetInstrument(i); ++i) {          for (int i = 0; pFile->GetInstrument(i); ++i) {
# Line 4409  namespace { Line 4578  namespace {
4578          EffectSend = 0;          EffectSend = 0;
4579          Attenuation = 0;          Attenuation = 0;
4580          FineTune = 0;          FineTune = 0;
4581          PitchbendRange = 0;          PitchbendRange = 2;
4582          PianoReleaseMode = false;          PianoReleaseMode = false;
4583          DimensionKeyRange.low = 0;          DimensionKeyRange.low = 0;
4584          DimensionKeyRange.high = 0;          DimensionKeyRange.high = 0;
# Line 4584  namespace { Line 4753  namespace {
4753    
4754             RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);             RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);
4755             if (!lst3LS) lst3LS = pCkInstrument->AddSubList(LIST_TYPE_3LS);             if (!lst3LS) lst3LS = pCkInstrument->AddSubList(LIST_TYPE_3LS);
4756             const int slotCount = pScriptRefs->size();             const int slotCount = (int) pScriptRefs->size();
4757             const int headerSize = 3 * sizeof(uint32_t);             const int headerSize = 3 * sizeof(uint32_t);
4758             const int slotSize  = 2 * sizeof(uint32_t);             const int slotSize  = 2 * sizeof(uint32_t);
4759             const int totalChunkSize = headerSize + slotCount * slotSize;             const int totalChunkSize = headerSize + slotCount * slotSize;
# Line 4620  namespace { Line 4789  namespace {
4789         if (pScriptRefs && pScriptRefs->size() > 0) {         if (pScriptRefs && pScriptRefs->size() > 0) {
4790             RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);             RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);
4791             RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);             RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);
4792             const int slotCount = pScriptRefs->size();             const int slotCount = (int) pScriptRefs->size();
4793             const int headerSize = 3 * sizeof(uint32_t);             const int headerSize = 3 * sizeof(uint32_t);
4794             ckSCSL->SetPos(headerSize);             ckSCSL->SetPos(headerSize);
4795             for (int i = 0; i < slotCount; ++i) {             for (int i = 0; i < slotCount; ++i) {
4796                 uint32_t fileOffset =                 uint32_t fileOffset = uint32_t(
4797                      (*pScriptRefs)[i].script->pChunk->GetFilePos() -                      (*pScriptRefs)[i].script->pChunk->GetFilePos() -
4798                      (*pScriptRefs)[i].script->pChunk->GetPos() -                      (*pScriptRefs)[i].script->pChunk->GetPos() -
4799                      CHUNK_HEADER_SIZE(ckSCSL->GetFile()->GetFileOffsetSize());                      CHUNK_HEADER_SIZE(ckSCSL->GetFile()->GetFileOffsetSize())
4800                   );
4801                 ckSCSL->WriteUint32(&fileOffset);                 ckSCSL->WriteUint32(&fileOffset);
4802                 // jump over flags entry (containing the bypass flag)                 // jump over flags entry (containing the bypass flag)
4803                 ckSCSL->SetPos(sizeof(uint32_t), RIFF::stream_curpos);                 ckSCSL->SetPos(sizeof(uint32_t), RIFF::stream_curpos);
# Line 4687  namespace { Line 4857  namespace {
4857          RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);          RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);
4858          Region* pNewRegion = new Region(this, rgn);          Region* pNewRegion = new Region(this, rgn);
4859          pRegions->push_back(pNewRegion);          pRegions->push_back(pNewRegion);
4860          Regions = pRegions->size();          Regions = (uint32_t) pRegions->size();
4861          // update Region key table for fast lookup          // update Region key table for fast lookup
4862          UpdateRegionKeyTable();          UpdateRegionKeyTable();
4863          // done          // done
# Line 4833  namespace { Line 5003  namespace {
5003                  for (uint s = 0; group->GetScript(s); ++s) {                  for (uint s = 0; group->GetScript(s); ++s) {
5004                      Script* script = group->GetScript(s);                      Script* script = group->GetScript(s);
5005                      if (script->pChunk) {                      if (script->pChunk) {
5006                          uint32_t offset = script->pChunk->GetFilePos() -                          uint32_t offset = uint32_t(
5007                                            script->pChunk->GetPos() -                              script->pChunk->GetFilePos() -
5008                                            CHUNK_HEADER_SIZE(script->pChunk->GetFile()->GetFileOffsetSize());                              script->pChunk->GetPos() -
5009                                CHUNK_HEADER_SIZE(script->pChunk->GetFile()->GetFileOffsetSize())
5010                            );
5011                          if (offset == soughtOffset)                          if (offset == soughtOffset)
5012                          {                          {
5013                              _ScriptPooolRef ref;                              _ScriptPooolRef ref;
# Line 4960  namespace { Line 5132  namespace {
5132       */       */
5133      void Instrument::RemoveScript(Script* pScript) {      void Instrument::RemoveScript(Script* pScript) {
5134          LoadScripts();          LoadScripts();
5135          for (int i = pScriptRefs->size() - 1; i >= 0; --i) {          for (ssize_t i = pScriptRefs->size() - 1; i >= 0; --i) {
5136              if ((*pScriptRefs)[i].script == pScript) {              if ((*pScriptRefs)[i].script == pScript) {
5137                  pScriptRefs->erase( pScriptRefs->begin() + i );                  pScriptRefs->erase( pScriptRefs->begin() + i );
5138              }              }
# Line 4982  namespace { Line 5154  namespace {
5154       * gigedit.       * gigedit.
5155       */       */
5156      uint Instrument::ScriptSlotCount() const {      uint Instrument::ScriptSlotCount() const {
5157          return pScriptRefs ? pScriptRefs->size() : scriptPoolFileOffsets.size();          return uint(pScriptRefs ? pScriptRefs->size() : scriptPoolFileOffsets.size());
5158      }      }
5159    
5160      /** @brief Whether script execution shall be skipped.      /** @brief Whether script execution shall be skipped.
# Line 5406  namespace { Line 5578  namespace {
5578              }              }
5579          }          }
5580          String name(pRIFF->GetFileName());          String name(pRIFF->GetFileName());
5581          int nameLen = name.length();          int nameLen = (int) name.length();
5582          char suffix[6];          char suffix[6];
5583          if (nameLen > 4 && name.substr(nameLen - 4) == ".gig") nameLen -= 4;          if (nameLen > 4 && name.substr(nameLen - 4) == ".gig") nameLen -= 4;
5584    
# Line 5422  namespace { Line 5594  namespace {
5594                          __notify_progress(pProgress, subprogress);                          __notify_progress(pProgress, subprogress);
5595    
5596                          file_offset_t waveFileOffset = wave->GetFilePos();                          file_offset_t waveFileOffset = wave->GetFilePos();
5597                          pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, fileNo));                          pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, fileNo, iSampleIndex));
5598    
5599                          iSampleIndex++;                          iSampleIndex++;
5600                      }                      }
# Line 5575  namespace { Line 5747  namespace {
5747              mGroups[pFile->GetSample(i)->GetGroup()]->AddSample(s);              mGroups[pFile->GetSample(i)->GetGroup()]->AddSample(s);
5748              mSamples[pFile->GetSample(i)] = s;              mSamples[pFile->GetSample(i)] = s;
5749          }          }
5750            
5751            // clone script groups and their scripts
5752            for (int iGroup = 0; pFile->GetScriptGroup(iGroup); ++iGroup) {
5753                ScriptGroup* sg = pFile->GetScriptGroup(iGroup);
5754                ScriptGroup* dg = AddScriptGroup();
5755                dg->Name = "COPY" + ToString(iCallCount) + "_" + sg->Name;
5756                for (int iScript = 0; sg->GetScript(iScript); ++iScript) {
5757                    Script* ss = sg->GetScript(iScript);
5758                    Script* ds = dg->AddScript();
5759                    ds->CopyAssign(ss);
5760                }
5761            }
5762    
5763          //BUG: For some reason this method only works with this additional          //BUG: For some reason this method only works with this additional
5764          //     Save() call in between here.          //     Save() call in between here.
5765          //          //
# Line 5668  namespace { Line 5852  namespace {
5852          uint32_t one = 1;          uint32_t one = 1;
5853          _3crc->WriteUint32(&one); // always 1          _3crc->WriteUint32(&one); // always 1
5854          _3crc->WriteUint32(&crc);          _3crc->WriteUint32(&crc);
   
         // reload CRC table to RAM to keep it persistent over several subsequent save operations  
         _3crc->ReleaseChunkData();  
         _3crc->LoadChunkData();  
5855      }      }
5856    
5857      uint32_t File::GetSampleChecksum(Sample* pSample) {      uint32_t File::GetSampleChecksum(Sample* pSample) {
5858            // get the index of the sample
5859            int iWaveIndex = GetWaveTableIndexOf(pSample);
5860            if (iWaveIndex < 0) throw gig::Exception("Could not retrieve reference crc of sample, could not resolve sample's wave table index");
5861    
5862            return GetSampleChecksumByIndex(iWaveIndex);
5863        }
5864    
5865        uint32_t File::GetSampleChecksumByIndex(int index) {
5866            if (index < 0) throw gig::Exception("Could not retrieve reference crc of sample, invalid wave pool index of sample");
5867    
5868          RIFF::Chunk* _3crc = pRIFF->GetSubChunk(CHUNK_ID_3CRC);          RIFF::Chunk* _3crc = pRIFF->GetSubChunk(CHUNK_ID_3CRC);
5869          if (!_3crc) throw gig::Exception("Could not retrieve reference crc of sample, no checksums stored for this file yet");          if (!_3crc) throw gig::Exception("Could not retrieve reference crc of sample, no checksums stored for this file yet");
5870          uint8_t* pData = (uint8_t*) _3crc->LoadChunkData();          uint8_t* pData = (uint8_t*) _3crc->LoadChunkData();
5871          if (!pData) throw gig::Exception("Could not retrieve reference crc of sample, no checksums stored for this file yet");          if (!pData) throw gig::Exception("Could not retrieve reference crc of sample, no checksums stored for this file yet");
5872    
         // get the index of the sample  
         int iWaveIndex = GetWaveTableIndexOf(pSample);  
         if (iWaveIndex < 0) throw gig::Exception("Could not retrieve reference crc of sample, could not resolve sample's wave table index");  
   
5873          // read the CRC-32 checksum directly from disk          // read the CRC-32 checksum directly from disk
5874          size_t pos = iWaveIndex * 8;          size_t pos = index * 8;
5875          if (pos + 8 > _3crc->GetNewSize())          if (pos + 8 > _3crc->GetNewSize())
5876              throw gig::Exception("Could not retrieve reference crc of sample, could not seek to required position in crc chunk");              throw gig::Exception("Could not retrieve reference crc of sample, could not seek to required position in crc chunk");
5877    
5878          uint32_t one = load32(&pData[pos]); // always 1          uint32_t one = load32(&pData[pos]); // always 1
5879          if (one != 1)          if (one != 1)
5880              throw gig::Exception("Could not verify sample, because reference checksum table is damaged");              throw gig::Exception("Could not retrieve reference crc of sample, because reference checksum table is damaged");
5881    
5882          return load32(&pData[pos+4]);          return load32(&pData[pos+4]);
5883      }      }
5884        
5885      int File::GetWaveTableIndexOf(gig::Sample* pSample) {      int File::GetWaveTableIndexOf(gig::Sample* pSample) {
5886          if (!pSamples) GetFirstSample(); // make sure sample chunks were scanned          if (!pSamples) GetFirstSample(); // make sure sample chunks were scanned
5887          File::SampleList::iterator iter = pSamples->begin();          File::SampleList::iterator iter = pSamples->begin();
# Line 5720  namespace { Line 5906  namespace {
5906          if (!pSamples) GetFirstSample(); // make sure sample chunks were scanned          if (!pSamples) GetFirstSample(); // make sure sample chunks were scanned
5907          if (_3crc->GetNewSize() != pSamples->size() * 8) return false;          if (_3crc->GetNewSize() != pSamples->size() * 8) return false;
5908    
5909          const int n = _3crc->GetNewSize() / 8;          const file_offset_t n = _3crc->GetNewSize() / 8;
5910    
5911          uint32_t* pData = (uint32_t*) _3crc->LoadChunkData();          uint32_t* pData = (uint32_t*) _3crc->LoadChunkData();
5912          if (!pData) return false;          if (!pData) return false;
5913    
5914          for (int i = 0; i < n; ++i) {          for (file_offset_t i = 0; i < n; ++i) {
5915              uint32_t one = pData[i*2];              uint32_t one = pData[i*2];
5916              if (one != 1) return false;              if (one != 1) return false;
5917          }          }
# Line 5759  namespace { Line 5945  namespace {
5945          RIFF::Chunk* _3crc = pRIFF->GetSubChunk(CHUNK_ID_3CRC);          RIFF::Chunk* _3crc = pRIFF->GetSubChunk(CHUNK_ID_3CRC);
5946          if (!_3crc) {          if (!_3crc) {
5947              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);
5948                // the order of einf and 3crc is not the same in v2 and v3
5949                RIFF::Chunk* einf = pRIFF->GetSubChunk(CHUNK_ID_EINF);
5950                if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);
5951              bRequiresSave = true;              bRequiresSave = true;
5952          } else if (_3crc->GetNewSize() != pSamples->size() * 8) {          } else if (_3crc->GetNewSize() != pSamples->size() * 8) {
5953              _3crc->Resize(pSamples->size() * 8);              _3crc->Resize(pSamples->size() * 8);
# Line 5788  namespace { Line 5977  namespace {
5977                      gig::Sample* pSample = (gig::Sample*) *iter;                      gig::Sample* pSample = (gig::Sample*) *iter;
5978                      int index = GetWaveTableIndexOf(pSample);                      int index = GetWaveTableIndexOf(pSample);
5979                      if (index < 0) throw gig::Exception("Could not rebuild crc table for samples, wave table index of a sample could not be resolved");                      if (index < 0) throw gig::Exception("Could not rebuild crc table for samples, wave table index of a sample could not be resolved");
5980                      uint32_t crc = pSample->CalculateWaveDataChecksum();                      pSample->crc  = pSample->CalculateWaveDataChecksum();
5981                      SetSampleChecksum(pSample, crc);                      SetSampleChecksum(pSample, pSample->crc);
5982                  }                  }
5983              }              }
5984          }          }
# Line 6056  namespace { Line 6245  namespace {
6245              lst3LS = NULL;              lst3LS = NULL;
6246          }          }
6247    
         // if there is a 3CRC chunk, make sure it is loaded into RAM, otherwise  
         // its data might get lost or damaged on file structure changes  
         RIFF::Chunk* _3crc = pRIFF->GetSubChunk(CHUNK_ID_3CRC);  
         if (_3crc) _3crc->LoadChunkData();  
   
6248          // first update base class's chunks          // first update base class's chunks
6249          DLS::File::UpdateChunks(pProgress);          DLS::File::UpdateChunks(pProgress);
6250    
# Line 6119  namespace { Line 6303  namespace {
6303          // Note that there are several fields with unknown use. These          // Note that there are several fields with unknown use. These
6304          // are set to zero.          // are set to zero.
6305    
6306          int sublen = pSamples->size() / 8 + 49;          int sublen = int(pSamples->size() / 8 + 49);
6307          int einfSize = (Instruments + 1) * sublen;          int einfSize = (Instruments + 1) * sublen;
6308    
6309          RIFF::Chunk* einf = pRIFF->GetSubChunk(CHUNK_ID_EINF);          RIFF::Chunk* einf = pRIFF->GetSubChunk(CHUNK_ID_EINF);
# Line 6192  namespace { Line 6376  namespace {
6376                  store32(&pData[(instrumentIdx + 1) * sublen + 24], nbloops);                  store32(&pData[(instrumentIdx + 1) * sublen + 24], nbloops);
6377                  // next 8 bytes unknown                  // next 8 bytes unknown
6378                  store32(&pData[(instrumentIdx + 1) * sublen + 36], instrumentIdx);                  store32(&pData[(instrumentIdx + 1) * sublen + 36], instrumentIdx);
6379                  store32(&pData[(instrumentIdx + 1) * sublen + 40], pSamples->size());                  store32(&pData[(instrumentIdx + 1) * sublen + 40], (uint32_t) pSamples->size());
6380                  // next 4 bytes unknown                  // next 4 bytes unknown
6381    
6382                  totnbregions += instrument->Regions;                  totnbregions += instrument->Regions;
# Line 6210  namespace { Line 6394  namespace {
6394              store32(&pData[24], totnbloops);              store32(&pData[24], totnbloops);
6395              // next 8 bytes unknown              // next 8 bytes unknown
6396              // next 4 bytes unknown, not always 0              // next 4 bytes unknown, not always 0
6397              store32(&pData[40], pSamples->size());              store32(&pData[40], (uint32_t) pSamples->size());
6398              // next 4 bytes unknown              // next 4 bytes unknown
6399          }          }
6400    
6401          // update 3crc chunk          // update 3crc chunk
6402    
6403          // The 3crc chunk contains CRC-32 checksums for the          // The 3crc chunk contains CRC-32 checksums for the
6404          // samples. The actual checksum values will be filled in          // samples. When saving a gig file to disk, we first update the 3CRC
6405          // later, by Sample::Write.          // chunk here (in RAM) with the old crc values which we read from the
6406            // 3CRC chunk when we opened the file (available with gig::Sample::crc
6407            // member variable). This step is required, because samples might have
6408            // been deleted by the user since the file was opened, which in turn
6409            // changes the order of the (i.e. old) checksums within the 3crc chunk.
6410            // If a sample was conciously modified by the user (that is if
6411            // Sample::Write() was called later on) then Sample::Write() will just
6412            // update the respective individual checksum(s) directly on disk and
6413            // leaves all other sample checksums untouched.
6414    
6415            RIFF::Chunk* _3crc = pRIFF->GetSubChunk(CHUNK_ID_3CRC);
6416          if (_3crc) {          if (_3crc) {
6417              _3crc->Resize(pSamples->size() * 8);              _3crc->Resize(pSamples->size() * 8);
6418          } else if (newFile) {          } else /*if (newFile)*/ {
6419              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);
             _3crc->LoadChunkData();  
   
6420              // 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
6421              if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);              if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);
6422          }          }
6423            { // must be performed in RAM here ...
6424                uint32_t* pData = (uint32_t*) _3crc->LoadChunkData();
6425                if (pData) {
6426                    File::SampleList::iterator iter = pSamples->begin();
6427                    File::SampleList::iterator end  = pSamples->end();
6428                    for (int index = 0; iter != end; ++iter, ++index) {
6429                        gig::Sample* pSample = (gig::Sample*) *iter;
6430                        pData[index*2]   = 1; // always 1
6431                        pData[index*2+1] = pSample->crc;
6432                    }
6433                }
6434            }
6435      }      }
6436            
6437      void File::UpdateFileOffsets() {      void File::UpdateFileOffsets() {
# Line 6273  namespace { Line 6476  namespace {
6476  // *************** Exception ***************  // *************** Exception ***************
6477  // *  // *
6478    
6479      Exception::Exception(String Message) : DLS::Exception(Message) {      Exception::Exception() : DLS::Exception() {
6480        }
6481    
6482        Exception::Exception(String format, ...) : DLS::Exception() {
6483            va_list arg;
6484            va_start(arg, format);
6485            Message = assemble(format, arg);
6486            va_end(arg);
6487        }
6488    
6489        Exception::Exception(String format, va_list arg) : DLS::Exception() {
6490            Message = assemble(format, arg);
6491      }      }
6492    
6493      void Exception::PrintMessage() {      void Exception::PrintMessage() {
Legend:
Removed from v.2985  
changed lines
  Added in v.3203
  ViewVC Help
Powered by ViewVC