/[svn]/libgig/trunk/src/DLS.cpp
ViewVC logotype

Diff of /libgig/trunk/src/DLS.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3198 by schoenebeck, Sun May 21 12:46:05 2017 UTC revision 3481 by schoenebeck, Fri Feb 22 12:12:50 2019 UTC
# Line 2  Line 2 
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file access library    *   *   libgig - C++ cross-platform Gigasampler format file access library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003-2017 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2019 by Christian Schoenebeck                      *
6   *                              <cuse@users.sourceforge.net>               *   *                              <cuse@users.sourceforge.net>               *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
# Line 24  Line 24 
24  #include "DLS.h"  #include "DLS.h"
25    
26  #include <algorithm>  #include <algorithm>
27    #include <vector>
28  #include <time.h>  #include <time.h>
29    
30  #ifdef __APPLE__  #ifdef __APPLE__
# Line 121  namespace DLS { Line 122  namespace DLS {
122              artl->GetChunkID() != CHUNK_ID_ARTL) {              artl->GetChunkID() != CHUNK_ID_ARTL) {
123                throw DLS::Exception("<artl-ck> or <art2-ck> chunk expected");                throw DLS::Exception("<artl-ck> or <art2-ck> chunk expected");
124          }          }
125    
126            artl->SetPos(0);
127    
128          HeaderSize  = artl->ReadUint32();          HeaderSize  = artl->ReadUint32();
129          Connections = artl->ReadUint32();          Connections = artl->ReadUint32();
130          artl->SetPos(HeaderSize);          artl->SetPos(HeaderSize);
# Line 163  namespace DLS { Line 167  namespace DLS {
167          }          }
168      }      }
169    
170        /** @brief Remove all RIFF chunks associated with this Articulation object.
171         *
172         * At the moment Articulation::DeleteChunks() does nothing. It is
173         * recommended to call this method explicitly though from deriving classes's
174         * own overridden implementation of this method to avoid potential future
175         * compatiblity issues.
176         *
177         * See Storage::DeleteChunks() for details.
178         */
179        void Articulation::DeleteChunks() {
180        }
181    
182    
183    
184  // *************** Articulator  ***************  // *************** Articulator  ***************
# Line 231  namespace DLS { Line 247  namespace DLS {
247              }              }
248          }          }
249      }      }
250        
251        /** @brief Remove all RIFF chunks associated with this Articulator object.
252         *
253         * See Storage::DeleteChunks() for details.
254         */
255        void Articulator::DeleteChunks() {
256            if (pArticulations) {
257                ArticulationList::iterator iter = pArticulations->begin();
258                ArticulationList::iterator end  = pArticulations->end();
259                for (; iter != end; ++iter) {
260                    (*iter)->DeleteChunks();
261                }
262            }
263        }
264    
265      /**      /**
266       * Not yet implemented in this version, since the .gig format does       * Not yet implemented in this version, since the .gig format does
267       * not need to copy DLS articulators and so far nobody used pure       * not need to copy DLS articulators and so far nobody used pure
# Line 398  namespace DLS { Line 428  namespace DLS {
428          SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String(""));          SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String(""));
429          SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String(""));          SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String(""));
430      }      }
431        
432        /** @brief Remove all RIFF chunks associated with this Info object.
433         *
434         * At the moment Info::DeleteChunks() does nothing. It is
435         * recommended to call this method explicitly though from deriving classes's
436         * own overridden implementation of this method to avoid potential future
437         * compatiblity issues.
438         *
439         * See Storage::DeleteChunks() for details.
440         */
441        void Info::DeleteChunks() {
442        }
443    
444      /**      /**
445       * Make a deep copy of the Info object given by @a orig and assign it to       * Make a deep copy of the Info object given by @a orig and assign it to
446       * this object.       * this object.
# Line 449  namespace DLS { Line 491  namespace DLS {
491    
492          RIFF::Chunk* ckDLSID = lstResource->GetSubChunk(CHUNK_ID_DLID);          RIFF::Chunk* ckDLSID = lstResource->GetSubChunk(CHUNK_ID_DLID);
493          if (ckDLSID) {          if (ckDLSID) {
494                ckDLSID->SetPos(0);
495    
496              pDLSID = new dlsid_t;              pDLSID = new dlsid_t;
497              ckDLSID->Read(&pDLSID->ulData1, 1, 4);              ckDLSID->Read(&pDLSID->ulData1, 1, 4);
498              ckDLSID->Read(&pDLSID->usData2, 1, 2);              ckDLSID->Read(&pDLSID->usData2, 1, 2);
# Line 463  namespace DLS { Line 507  namespace DLS {
507          if (pInfo)  delete pInfo;          if (pInfo)  delete pInfo;
508      }      }
509    
510        /** @brief Remove all RIFF chunks associated with this Resource object.
511         *
512         * At the moment Resource::DeleteChunks() does nothing. It is recommended
513         * to call this method explicitly though from deriving classes's own
514         * overridden implementation of this method to avoid potential future
515         * compatiblity issues.
516         *
517         * See Storage::DeleteChunks() for details.
518         */
519        void Resource::DeleteChunks() {
520        }
521    
522      /** @brief Update chunks with current Resource data.      /** @brief Update chunks with current Resource data.
523       *       *
524       * Apply Resource data persistently below the previously given resource       * Apply Resource data persistently below the previously given resource
# Line 493  namespace DLS { Line 549  namespace DLS {
549       * Generates a new DLSID for the resource.       * Generates a new DLSID for the resource.
550       */       */
551      void Resource::GenerateDLSID() {      void Resource::GenerateDLSID() {
552  #if defined(WIN32) || defined(__APPLE__) || defined(HAVE_UUID_GENERATE)          #if defined(WIN32) || defined(__APPLE__) || defined(HAVE_UUID_GENERATE)
   
553          if (!pDLSID) pDLSID = new dlsid_t;          if (!pDLSID) pDLSID = new dlsid_t;
554            GenerateDLSID(pDLSID);
555            #endif
556        }
557    
558        void Resource::GenerateDLSID(dlsid_t* pDLSID) {
559    #if defined(WIN32) || defined(__APPLE__) || defined(HAVE_UUID_GENERATE)
560  #ifdef WIN32  #ifdef WIN32
   
561          UUID uuid;          UUID uuid;
562          UuidCreate(&uuid);          UuidCreate(&uuid);
563          pDLSID->ulData1 = uuid.Data1;          pDLSID->ulData1 = uuid.Data1;
# Line 551  namespace DLS { Line 610  namespace DLS {
610          pParentList       = ParentList;          pParentList       = ParentList;
611          RIFF::Chunk* wsmp = ParentList->GetSubChunk(CHUNK_ID_WSMP);          RIFF::Chunk* wsmp = ParentList->GetSubChunk(CHUNK_ID_WSMP);
612          if (wsmp) {          if (wsmp) {
613                wsmp->SetPos(0);
614    
615              uiHeaderSize   = wsmp->ReadUint32();              uiHeaderSize   = wsmp->ReadUint32();
616              UnityNote      = wsmp->ReadUint16();              UnityNote      = wsmp->ReadUint16();
617              FineTune       = wsmp->ReadInt16();              FineTune       = wsmp->ReadInt16();
# Line 625  namespace DLS { Line 686  namespace DLS {
686          }          }
687      }      }
688    
689        /** @brief Remove all RIFF chunks associated with this Sampler object.
690         *
691         * At the moment Sampler::DeleteChunks() does nothing. It is
692         * recommended to call this method explicitly though from deriving classes's
693         * own overridden implementation of this method to avoid potential future
694         * compatiblity issues.
695         *
696         * See Storage::DeleteChunks() for details.
697         */
698        void Sampler::DeleteChunks() {
699        }
700    
701      /**      /**
702       * Adds a new sample loop with the provided loop definition.       * Adds a new sample loop with the provided loop definition.
703       *       *
# Line 717  namespace DLS { Line 790  namespace DLS {
790          pCkFormat = waveList->GetSubChunk(CHUNK_ID_FMT);          pCkFormat = waveList->GetSubChunk(CHUNK_ID_FMT);
791          pCkData   = waveList->GetSubChunk(CHUNK_ID_DATA);          pCkData   = waveList->GetSubChunk(CHUNK_ID_DATA);
792          if (pCkFormat) {          if (pCkFormat) {
793                pCkFormat->SetPos(0);
794    
795              // common fields              // common fields
796              FormatTag              = pCkFormat->ReadUint16();              FormatTag              = pCkFormat->ReadUint16();
797              Channels               = pCkFormat->ReadUint16();              Channels               = pCkFormat->ReadUint16();
# Line 747  namespace DLS { Line 822  namespace DLS {
822    
823      /** @brief Destructor.      /** @brief Destructor.
824       *       *
825       * Removes RIFF chunks associated with this Sample and frees all       * Frees all memory occupied by this sample.
      * memory occupied by this sample.  
826       */       */
827      Sample::~Sample() {      Sample::~Sample() {
828          RIFF::List* pParent = pWaveList->GetParent();          if (pCkData)
829          pParent->DeleteSubChunk(pWaveList);              pCkData->ReleaseChunkData();
830            if (pCkFormat)
831                pCkFormat->ReleaseChunkData();
832      }      }
833        
834        /** @brief Remove all RIFF chunks associated with this Sample object.
835         *
836         * See Storage::DeleteChunks() for details.
837         */
838        void Sample::DeleteChunks() {
839            // handle base class
840            Resource::DeleteChunks();
841    
842            // handle own RIFF chunks
843            if (pWaveList) {
844                RIFF::List* pParent = pWaveList->GetParent();
845                pParent->DeleteSubChunk(pWaveList);
846                pWaveList = NULL;
847            }
848        }
849    
850      /**      /**
851       * Make a deep copy of the Sample object given by @a orig (without the       * Make a deep copy of the Sample object given by @a orig (without the
852       * actual sample waveform data however) and assign it to this object.       * actual sample waveform data however) and assign it to this object.
# Line 999  namespace DLS { Line 1091  namespace DLS {
1091          // articulation information          // articulation information
1092          RIFF::Chunk* rgnh = rgnList->GetSubChunk(CHUNK_ID_RGNH);          RIFF::Chunk* rgnh = rgnList->GetSubChunk(CHUNK_ID_RGNH);
1093          if (rgnh) {          if (rgnh) {
1094                rgnh->SetPos(0);
1095    
1096              rgnh->Read(&KeyRange, 2, 2);              rgnh->Read(&KeyRange, 2, 2);
1097              rgnh->Read(&VelocityRange, 2, 2);              rgnh->Read(&VelocityRange, 2, 2);
1098              FormatOptionFlags = rgnh->ReadUint16();              FormatOptionFlags = rgnh->ReadUint16();
# Line 1021  namespace DLS { Line 1115  namespace DLS {
1115          // sample information          // sample information
1116          RIFF::Chunk* wlnk = rgnList->GetSubChunk(CHUNK_ID_WLNK);          RIFF::Chunk* wlnk = rgnList->GetSubChunk(CHUNK_ID_WLNK);
1117          if (wlnk) {          if (wlnk) {
1118                wlnk->SetPos(0);
1119    
1120              WaveLinkOptionFlags = wlnk->ReadUint16();              WaveLinkOptionFlags = wlnk->ReadUint16();
1121              PhaseGroup          = wlnk->ReadUint16();              PhaseGroup          = wlnk->ReadUint16();
1122              Channel             = wlnk->ReadUint32();              Channel             = wlnk->ReadUint32();
# Line 1039  namespace DLS { Line 1135  namespace DLS {
1135    
1136      /** @brief Destructor.      /** @brief Destructor.
1137       *       *
1138       * Removes RIFF chunks associated with this Region.       * Intended to free up all memory occupied by this Region object. ATM this
1139         * destructor implementation does nothing though.
1140       */       */
1141      Region::~Region() {      Region::~Region() {
1142          RIFF::List* pParent = pCkRegion->GetParent();      }
1143          pParent->DeleteSubChunk(pCkRegion);  
1144        /** @brief Remove all RIFF chunks associated with this Region object.
1145         *
1146         * See Storage::DeleteChunks() for details.
1147         */
1148        void Region::DeleteChunks() {
1149            // handle base classes
1150            Resource::DeleteChunks();
1151            Articulator::DeleteChunks();
1152            Sampler::DeleteChunks();
1153    
1154            // handle own RIFF chunks
1155            if (pCkRegion) {
1156                RIFF::List* pParent = pCkRegion->GetParent();
1157                pParent->DeleteSubChunk(pCkRegion);
1158                pCkRegion = NULL;
1159            }
1160      }      }
1161    
1162      Sample* Region::GetSample() {      Sample* Region::GetSample() {
# Line 1225  namespace DLS { Line 1338  namespace DLS {
1338          midi_locale_t locale;          midi_locale_t locale;
1339          RIFF::Chunk* insh = pCkInstrument->GetSubChunk(CHUNK_ID_INSH);          RIFF::Chunk* insh = pCkInstrument->GetSubChunk(CHUNK_ID_INSH);
1340          if (insh) {          if (insh) {
1341                insh->SetPos(0);
1342    
1343              Regions = insh->ReadUint32();              Regions = insh->ReadUint32();
1344              insh->Read(&locale, 2, 4);              insh->Read(&locale, 2, 4);
1345          } else { // 'insh' chunk missing          } else { // 'insh' chunk missing
# Line 1296  namespace DLS { Line 1411  namespace DLS {
1411          if (iter == pRegions->end()) return;          if (iter == pRegions->end()) return;
1412          pRegions->erase(iter);          pRegions->erase(iter);
1413          Regions = (uint32_t) pRegions->size();          Regions = (uint32_t) pRegions->size();
1414            pRegion->DeleteChunks();
1415          delete pRegion;          delete pRegion;
1416      }      }
1417    
# Line 1340  namespace DLS { Line 1456  namespace DLS {
1456    
1457      /** @brief Destructor.      /** @brief Destructor.
1458       *       *
1459       * Removes RIFF chunks associated with this Instrument and frees all       * Frees all memory occupied by this instrument.
      * memory occupied by this instrument.  
1460       */       */
1461      Instrument::~Instrument() {      Instrument::~Instrument() {
1462          if (pRegions) {          if (pRegions) {
# Line 1353  namespace DLS { Line 1468  namespace DLS {
1468              }              }
1469              delete pRegions;              delete pRegions;
1470          }          }
         // remove instrument's chunks  
         RIFF::List* pParent = pCkInstrument->GetParent();  
         pParent->DeleteSubChunk(pCkInstrument);  
1471      }      }
1472        
1473        /** @brief Remove all RIFF chunks associated with this Instrument object.
1474         *
1475         * See Storage::DeleteChunks() for details.
1476         */
1477        void Instrument::DeleteChunks() {
1478            // handle base classes
1479            Resource::DeleteChunks();
1480            Articulator::DeleteChunks();
1481    
1482            // handle RIFF chunks of members
1483            if (pRegions) {
1484                RegionList::iterator it  = pRegions->begin();
1485                RegionList::iterator end = pRegions->end();
1486                for (; it != end; ++it)
1487                    (*it)->DeleteChunks();
1488            }
1489    
1490            // handle own RIFF chunks
1491            if (pCkInstrument) {
1492                RIFF::List* pParent = pCkInstrument->GetParent();
1493                pParent->DeleteSubChunk(pCkInstrument);
1494                pCkInstrument = NULL;
1495            }
1496        }
1497    
1498      void Instrument::CopyAssignCore(const Instrument* orig) {      void Instrument::CopyAssignCore(const Instrument* orig) {
1499          // handle base classes          // handle base classes
1500          Resource::CopyAssign(orig);          Resource::CopyAssign(orig);
# Line 1407  namespace DLS { Line 1544  namespace DLS {
1544       */       */
1545      File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS)) {      File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS)) {
1546          pRIFF->SetByteOrder(RIFF::endian_little);          pRIFF->SetByteOrder(RIFF::endian_little);
1547            bOwningRiff = true;
1548          pVersion = new version_t;          pVersion = new version_t;
1549          pVersion->major   = 0;          pVersion->major   = 0;
1550          pVersion->minor   = 0;          pVersion->minor   = 0;
# Line 1437  namespace DLS { Line 1575  namespace DLS {
1575      File::File(RIFF::File* pRIFF) : Resource(NULL, pRIFF) {      File::File(RIFF::File* pRIFF) : Resource(NULL, pRIFF) {
1576          if (!pRIFF) throw DLS::Exception("NULL pointer reference to RIFF::File object.");          if (!pRIFF) throw DLS::Exception("NULL pointer reference to RIFF::File object.");
1577          this->pRIFF = pRIFF;          this->pRIFF = pRIFF;
1578            bOwningRiff = false;
1579          RIFF::Chunk* ckVersion = pRIFF->GetSubChunk(CHUNK_ID_VERS);          RIFF::Chunk* ckVersion = pRIFF->GetSubChunk(CHUNK_ID_VERS);
1580          if (ckVersion) {          if (ckVersion) {
1581                ckVersion->SetPos(0);
1582    
1583              pVersion = new version_t;              pVersion = new version_t;
1584              ckVersion->Read(pVersion, 4, 2);              ckVersion->Read(pVersion, 4, 2);
1585          }          }
# Line 1447  namespace DLS { Line 1587  namespace DLS {
1587    
1588          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);
1589          if (!colh) throw DLS::Exception("Mandatory chunks in RIFF list chunk not found.");          if (!colh) throw DLS::Exception("Mandatory chunks in RIFF list chunk not found.");
1590            colh->SetPos(0);
1591          Instruments = colh->ReadUint32();          Instruments = colh->ReadUint32();
1592    
1593          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);
# Line 1457  namespace DLS { Line 1598  namespace DLS {
1598              WavePoolHeaderSize = 8;              WavePoolHeaderSize = 8;
1599              b64BitWavePoolOffsets = false;              b64BitWavePoolOffsets = false;
1600          } else {          } else {
1601                ptbl->SetPos(0);
1602    
1603              WavePoolHeaderSize = ptbl->ReadUint32();              WavePoolHeaderSize = ptbl->ReadUint32();
1604              WavePoolCount  = ptbl->ReadUint32();              WavePoolCount  = ptbl->ReadUint32();
1605              pWavePoolTable = new uint32_t[WavePoolCount];              pWavePoolTable = new uint32_t[WavePoolCount];
# Line 1509  namespace DLS { Line 1652  namespace DLS {
1652          if (pVersion) delete pVersion;          if (pVersion) delete pVersion;
1653          for (std::list<RIFF::File*>::iterator i = ExtensionFiles.begin() ; i != ExtensionFiles.end() ; i++)          for (std::list<RIFF::File*>::iterator i = ExtensionFiles.begin() ; i != ExtensionFiles.end() ; i++)
1654              delete *i;              delete *i;
1655            if (bOwningRiff)
1656                delete pRIFF;
1657      }      }
1658    
1659      Sample* File::GetFirstSample() {      Sample* File::GetFirstSample() {
# Line 1528  namespace DLS { Line 1673  namespace DLS {
1673          if (!pSamples) pSamples = new SampleList;          if (!pSamples) pSamples = new SampleList;
1674          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
1675          if (wvpl) {          if (wvpl) {
1676              file_offset_t wvplFileOffset = wvpl->GetFilePos();              file_offset_t wvplFileOffset = wvpl->GetFilePos() -
1677                                               wvpl->GetPos(); // should be zero, but just to be sure
1678              RIFF::List* wave = wvpl->GetFirstSubList();              RIFF::List* wave = wvpl->GetFirstSubList();
1679              while (wave) {              while (wave) {
1680                  if (wave->GetListType() == LIST_TYPE_WAVE) {                  if (wave->GetListType() == LIST_TYPE_WAVE) {
1681                      file_offset_t waveFileOffset = wave->GetFilePos();                      file_offset_t waveFileOffset = wave->GetFilePos() -
1682                                                       wave->GetPos(); // should be zero, but just to be sure
1683                      pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));                      pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));
1684                  }                  }
1685                  wave = wvpl->GetNextSubList();                  wave = wvpl->GetNextSubList();
# Line 1541  namespace DLS { Line 1688  namespace DLS {
1688          else { // Seen a dwpl list chunk instead of a wvpl list chunk in some file (officially not DLS compliant)          else { // Seen a dwpl list chunk instead of a wvpl list chunk in some file (officially not DLS compliant)
1689              RIFF::List* dwpl = pRIFF->GetSubList(LIST_TYPE_DWPL);              RIFF::List* dwpl = pRIFF->GetSubList(LIST_TYPE_DWPL);
1690              if (dwpl) {              if (dwpl) {
1691                  file_offset_t dwplFileOffset = dwpl->GetFilePos();                  file_offset_t dwplFileOffset = dwpl->GetFilePos() -
1692                                                   dwpl->GetPos(); // should be zero, but just to be sure
1693                  RIFF::List* wave = dwpl->GetFirstSubList();                  RIFF::List* wave = dwpl->GetFirstSubList();
1694                  while (wave) {                  while (wave) {
1695                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
1696                          file_offset_t waveFileOffset = wave->GetFilePos();                          file_offset_t waveFileOffset = wave->GetFilePos() -
1697                                                           wave->GetPos(); // should be zero, but just to be sure
1698                          pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset));                          pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset));
1699                      }                      }
1700                      wave = dwpl->GetNextSubList();                      wave = dwpl->GetNextSubList();
# Line 1584  namespace DLS { Line 1733  namespace DLS {
1733          SampleList::iterator iter = find(pSamples->begin(), pSamples->end(), pSample);          SampleList::iterator iter = find(pSamples->begin(), pSamples->end(), pSample);
1734          if (iter == pSamples->end()) return;          if (iter == pSamples->end()) return;
1735          pSamples->erase(iter);          pSamples->erase(iter);
1736            pSample->DeleteChunks();
1737          delete pSample;          delete pSample;
1738      }      }
1739    
# Line 1643  namespace DLS { Line 1793  namespace DLS {
1793          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), pInstrument);          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), pInstrument);
1794          if (iter == pInstruments->end()) return;          if (iter == pInstruments->end()) return;
1795          pInstruments->erase(iter);          pInstruments->erase(iter);
1796            pInstrument->DeleteChunks();
1797          delete pInstrument;          delete pInstrument;
1798      }      }
1799    
1800      /**      /**
1801         * Returns the underlying RIFF::File used for persistency of this DLS::File
1802         * object.
1803         */
1804        RIFF::File* File::GetRiffFile() {
1805            return pRIFF;
1806        }
1807    
1808        /**
1809       * Returns extension file of given index. Extension files are used       * Returns extension file of given index. Extension files are used
1810       * sometimes to circumvent the 2 GB file size limit of the RIFF format and       * sometimes to circumvent the 2 GB file size limit of the RIFF format and
1811       * of certain operating systems in general. In this case, instead of just       * of certain operating systems in general. In this case, instead of just
# Line 1770  namespace DLS { Line 1929  namespace DLS {
1929              __notify_progress(&subprogress, 1.0); // notify subprogress done              __notify_progress(&subprogress, 1.0); // notify subprogress done
1930          }          }
1931    
1932            // if there are any extension files, gather which ones are regular
1933            // extension files used as wave pool files (.gx00, .gx01, ... , .gx98)
1934            // and which one is probably a convolution (GigaPulse) file (always to
1935            // be saved as .gx99)
1936            std::list<RIFF::File*> poolFiles;  // < for (.gx00, .gx01, ... , .gx98) files
1937            RIFF::File* pGigaPulseFile = NULL; // < for .gx99 file
1938            if (!ExtensionFiles.empty()) {
1939                std::list<RIFF::File*>::iterator it = ExtensionFiles.begin();
1940                for (; it != ExtensionFiles.end(); ++it) {
1941                    //FIXME: the .gx99 file is always used by GSt for convolution
1942                    // data (GigaPulse); so we should better detect by subchunk
1943                    // whether the extension file is intended for convolution
1944                    // instead of checkking for a file name, because the latter does
1945                    // not work for saving new gigs created from scratch
1946                    const std::string oldName = (*it)->GetFileName();
1947                    const bool isGigaPulseFile = (extensionOfPath(oldName) == "gx99");
1948                    if (isGigaPulseFile)
1949                        pGigaPulseFile = *it;
1950                    else
1951                        poolFiles.push_back(*it);
1952                }
1953            }
1954    
1955            // update the 'xfil' chunk which describes all extension files (wave
1956            // pool files) except the .gx99 file
1957            if (!poolFiles.empty()) {
1958                const int n = poolFiles.size();
1959                const int iHeaderSize = 4;
1960                const int iEntrySize = 144;
1961    
1962                // make sure chunk exists, and with correct size
1963                RIFF::Chunk* ckXfil = pRIFF->GetSubChunk(CHUNK_ID_XFIL);
1964                if (ckXfil)
1965                    ckXfil->Resize(iHeaderSize + n * iEntrySize);
1966                else
1967                    ckXfil = pRIFF->AddSubChunk(CHUNK_ID_XFIL, iHeaderSize + n * iEntrySize);
1968    
1969                uint8_t* pData = (uint8_t*) ckXfil->LoadChunkData();
1970    
1971                // re-assemble the chunk's content
1972                store32(pData, n);
1973                std::list<RIFF::File*>::iterator itExtFile = poolFiles.begin();
1974                for (int i = 0, iOffset = 4; i < n;
1975                     ++itExtFile, ++i, iOffset += iEntrySize)
1976                {
1977                    // update the filename string and 5 byte extension of each extension file
1978                    std::string file = lastPathComponent(
1979                        (*itExtFile)->GetFileName()
1980                    );
1981                    if (file.length() + 6 > 128)
1982                        throw Exception("Fatal error, extension filename length exceeds 122 byte maximum");
1983                    uint8_t* pStrings = &pData[iOffset];
1984                    memset(pStrings, 0, 128);
1985                    memcpy(pStrings, file.c_str(), file.length());
1986                    pStrings += file.length() + 1;
1987                    std::string ext = file.substr(file.length()-5);
1988                    memcpy(pStrings, ext.c_str(), 5);
1989                    // update the dlsid of the extension file
1990                    uint8_t* pId = &pData[iOffset + 128];
1991                    dlsid_t id;
1992                    RIFF::Chunk* ckDLSID = (*itExtFile)->GetSubChunk(CHUNK_ID_DLID);
1993                    if (ckDLSID) {
1994                        ckDLSID->Read(&id.ulData1, 1, 4);
1995                        ckDLSID->Read(&id.usData2, 1, 2);
1996                        ckDLSID->Read(&id.usData3, 1, 2);
1997                        ckDLSID->Read(id.abData, 8, 1);
1998                    } else {
1999                        ckDLSID = (*itExtFile)->AddSubChunk(CHUNK_ID_DLID, 16);
2000                        Resource::GenerateDLSID(&id);
2001                        uint8_t* pData = (uint8_t*)ckDLSID->LoadChunkData();
2002                        store32(&pData[0], id.ulData1);
2003                        store16(&pData[4], id.usData2);
2004                        store16(&pData[6], id.usData3);
2005                        memcpy(&pData[8], id.abData, 8);
2006                    }
2007                    store32(&pId[0], id.ulData1);
2008                    store16(&pId[4], id.usData2);
2009                    store16(&pId[6], id.usData3);
2010                    memcpy(&pId[8], id.abData, 8);
2011                }
2012            } else {
2013                // in case there was a 'xfil' chunk, remove it
2014                RIFF::Chunk* ckXfil = pRIFF->GetSubChunk(CHUNK_ID_XFIL);
2015                if (ckXfil) pRIFF->DeleteSubChunk(ckXfil);
2016            }
2017    
2018            // update the 'doxf' chunk which describes a .gx99 extension file
2019            // which contains convolution data (GigaPulse)
2020            if (pGigaPulseFile) {
2021                RIFF::Chunk* ckDoxf = pRIFF->GetSubChunk(CHUNK_ID_DOXF);
2022                if (!ckDoxf) ckDoxf = pRIFF->AddSubChunk(CHUNK_ID_DOXF, 148);
2023    
2024                uint8_t* pData = (uint8_t*) ckDoxf->LoadChunkData();
2025    
2026                // update the dlsid from the extension file
2027                uint8_t* pId = &pData[132];
2028                RIFF::Chunk* ckDLSID = pGigaPulseFile->GetSubChunk(CHUNK_ID_DLID);
2029                if (!ckDLSID) { //TODO: auto generate DLS ID if missing
2030                    throw Exception("Fatal error, GigaPulse file does not contain a DLS ID chunk");
2031                } else {
2032                    dlsid_t id;
2033                    // read DLS ID from extension files's DLS ID chunk
2034                    uint8_t* pData = (uint8_t*) ckDLSID->LoadChunkData();
2035                    id.ulData1 = load32(&pData[0]);
2036                    id.usData2 = load16(&pData[4]);
2037                    id.usData3 = load16(&pData[6]);
2038                    memcpy(id.abData, &pData[8], 8);
2039                    // store DLS ID to 'doxf' chunk
2040                    store32(&pId[0], id.ulData1);
2041                    store16(&pId[4], id.usData2);
2042                    store16(&pId[6], id.usData3);
2043                    memcpy(&pId[8], id.abData, 8);
2044                }
2045            } else {
2046                // in case there was a 'doxf' chunk, remove it
2047                RIFF::Chunk* ckDoxf = pRIFF->GetSubChunk(CHUNK_ID_DOXF);
2048                if (ckDoxf) pRIFF->DeleteSubChunk(ckDoxf);
2049            }
2050    
2051          // the RIFF file to be written might now been grown >= 4GB or might          // the RIFF file to be written might now been grown >= 4GB or might
2052          // been shrunk < 4GB, so we might need to update the wave pool offset          // been shrunk < 4GB, so we might need to update the wave pool offset
2053          // size and thus accordingly we would need to resize the wave pool          // size and thus accordingly we would need to resize the wave pool
2054          // chunk          // chunk
2055          const file_offset_t finalFileSize = pRIFF->GetRequiredFileSize();          const file_offset_t finalFileSize = pRIFF->GetRequiredFileSize();
2056          const bool bRequires64Bit = (finalFileSize >> 32) != 0;          const bool bRequires64Bit = (finalFileSize >> 32) != 0 || // < native 64 bit gig file
2057                                         poolFiles.size() > 0;        // < 32 bit gig file where the hi 32 bits are used as extension file nr
2058          if (b64BitWavePoolOffsets != bRequires64Bit) {          if (b64BitWavePoolOffsets != bRequires64Bit) {
2059              b64BitWavePoolOffsets = bRequires64Bit;              b64BitWavePoolOffsets = bRequires64Bit;
2060              iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;              iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;
# Line 1801  namespace DLS { Line 2080  namespace DLS {
2080       * @param pProgress - optional: callback function for progress notification       * @param pProgress - optional: callback function for progress notification
2081       */       */
2082      void File::Save(const String& Path, progress_t* pProgress) {      void File::Save(const String& Path, progress_t* pProgress) {
2083            // calculate number of tasks to notify progress appropriately
2084            const size_t nExtFiles = ExtensionFiles.size();
2085            const float tasks = 2.f + nExtFiles;
2086    
2087            // save extension files (if required)
2088            if (!ExtensionFiles.empty()) {
2089                // for assembling path of extension files to be saved to
2090                const std::string folder = parentPath(Path);
2091                const std::string baseName = pathWithoutExtension(Path);
2092                // save the individual extension files
2093                std::list<RIFF::File*>::iterator it = ExtensionFiles.begin();
2094                for (int i = 0; it != ExtensionFiles.end(); ++i, ++it) {
2095                    // divide local progress into subprogress
2096                    progress_t subprogress;
2097                    __divide_progress(pProgress, &subprogress, tasks, 0.f + i); // subdivided into amount of extension files
2098                    //FIXME: the .gx99 file is always used by GSt for convolution
2099                    // data (GigaPulse); so we should better detect by subchunk
2100                    // whether the extension file is intended for convolution
2101                    // instead of checkking for a file name, because the latter does
2102                    // not work for saving new gigs created from scratch
2103                    const std::string oldName = (*it)->GetFileName();
2104                    const bool isGigaPulseFile = (extensionOfPath(oldName) == "gx99");
2105                    std::string ext = (isGigaPulseFile) ? ".gx99" : strPrint(".gx02d", i+1);
2106                    std::string newPath = concatPath(folder, baseName) + ext;
2107                    // save extension file to its new location
2108                    (*it)->Save(newPath, &subprogress);
2109                }
2110            }
2111    
2112          {          {
2113              // divide local progress into subprogress              // divide local progress into subprogress
2114              progress_t subprogress;              progress_t subprogress;
2115              __divide_progress(pProgress, &subprogress, 2.f, 0.f); // arbitrarily subdivided into 50% of total progress              __divide_progress(pProgress, &subprogress, tasks, 1.f + nExtFiles); // arbitrarily subdivided into 50% (minus extension files progress)
2116              // do the actual work              // do the actual work
2117              UpdateChunks(&subprogress);              UpdateChunks(&subprogress);
               
2118          }          }
2119          {          {
2120              // divide local progress into subprogress              // divide local progress into subprogress
2121              progress_t subprogress;              progress_t subprogress;
2122              __divide_progress(pProgress, &subprogress, 2.f, 1.f); // arbitrarily subdivided into 50% of total progress              __divide_progress(pProgress, &subprogress, tasks, 2.f + nExtFiles); // arbitrarily subdivided into 50% (minus extension files progress)
2123              // do the actual work              // do the actual work
2124              pRIFF->Save(Path, &subprogress);              pRIFF->Save(Path, &subprogress);
2125          }          }
# Line 1831  namespace DLS { Line 2138  namespace DLS {
2138       * @throws DLS::Exception  if any kind of DLS specific error occurred       * @throws DLS::Exception  if any kind of DLS specific error occurred
2139       */       */
2140      void File::Save(progress_t* pProgress) {      void File::Save(progress_t* pProgress) {
2141            // calculate number of tasks to notify progress appropriately
2142            const size_t nExtFiles = ExtensionFiles.size();
2143            const float tasks = 2.f + nExtFiles;
2144    
2145            // save extension files (if required)
2146            if (!ExtensionFiles.empty()) {
2147                std::list<RIFF::File*>::iterator it = ExtensionFiles.begin();
2148                for (int i = 0; it != ExtensionFiles.end(); ++i, ++it) {
2149                    // divide local progress into subprogress
2150                    progress_t subprogress;
2151                    __divide_progress(pProgress, &subprogress, tasks, 0.f + i); // subdivided into amount of extension files
2152                    // save extension file
2153                    (*it)->Save(&subprogress);
2154                }
2155            }
2156    
2157          {          {
2158              // divide local progress into subprogress              // divide local progress into subprogress
2159              progress_t subprogress;              progress_t subprogress;
2160              __divide_progress(pProgress, &subprogress, 2.f, 0.f); // arbitrarily subdivided into 50% of total progress              __divide_progress(pProgress, &subprogress, tasks, 1.f + nExtFiles); // arbitrarily subdivided into 50% (minus extension files progress)
2161              // do the actual work              // do the actual work
2162              UpdateChunks(&subprogress);              UpdateChunks(&subprogress);
2163          }          }
2164          {          {
2165              // divide local progress into subprogress              // divide local progress into subprogress
2166              progress_t subprogress;              progress_t subprogress;
2167              __divide_progress(pProgress, &subprogress, 2.f, 1.f); // arbitrarily subdivided into 50% of total progress              __divide_progress(pProgress, &subprogress, tasks, 2.f + nExtFiles); // arbitrarily subdivided into 50% (minus extension files progress)
2168              // do the actual work              // do the actual work
2169              pRIFF->Save(&subprogress);              pRIFF->Save(&subprogress);
2170          }          }
# Line 1940  namespace DLS { Line 2263  namespace DLS {
2263          pWavePoolTable   = new uint32_t[WavePoolCount];          pWavePoolTable   = new uint32_t[WavePoolCount];
2264          pWavePoolTableHi = new uint32_t[WavePoolCount];          pWavePoolTableHi = new uint32_t[WavePoolCount];
2265          if (!pSamples) return;          if (!pSamples) return;
2266          // update offsets int wave pool table          // update offsets in wave pool table
2267          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
2268          uint64_t wvplFileOffset = wvpl->GetFilePos();          uint64_t wvplFileOffset = wvpl->GetFilePos() -
2269          if (b64BitWavePoolOffsets) {                                    wvpl->GetPos(); // mandatory, since position might have changed
2270            if (!b64BitWavePoolOffsets) { // conventional 32 bit offsets (and no extension files) ...
2271              SampleList::iterator iter = pSamples->begin();              SampleList::iterator iter = pSamples->begin();
2272              SampleList::iterator end  = pSamples->end();              SampleList::iterator end  = pSamples->end();
2273              for (int i = 0 ; iter != end ; ++iter, i++) {              for (int i = 0 ; iter != end ; ++iter, i++) {
2274                  uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());                  uint64_t _64BitOffset =
2275                  (*iter)->ullWavePoolOffset = _64BitOffset;                      (*iter)->pWaveList->GetFilePos() -
2276                  pWavePoolTableHi[i] = (uint32_t) (_64BitOffset >> 32);                      (*iter)->pWaveList->GetPos() - // should be zero, but just to be sure
2277                  pWavePoolTable[i]   = (uint32_t) _64BitOffset;                      wvplFileOffset -
2278              }                      LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());
         } else { // conventional 32 bit offsets  
             SampleList::iterator iter = pSamples->begin();  
             SampleList::iterator end  = pSamples->end();  
             for (int i = 0 ; iter != end ; ++iter, i++) {  
                 uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());  
2279                  (*iter)->ullWavePoolOffset = _64BitOffset;                  (*iter)->ullWavePoolOffset = _64BitOffset;
2280                  pWavePoolTable[i] = (uint32_t) _64BitOffset;                  pWavePoolTable[i] = (uint32_t) _64BitOffset;
2281              }              }
2282            } else { // a) native 64 bit offsets without extension files or b) 32 bit offsets with extension files ...
2283                if (ExtensionFiles.empty()) { // native 64 bit offsets (and no extension files) [not compatible with GigaStudio] ...
2284                    SampleList::iterator iter = pSamples->begin();
2285                    SampleList::iterator end  = pSamples->end();
2286                    for (int i = 0 ; iter != end ; ++iter, i++) {
2287                        uint64_t _64BitOffset =
2288                            (*iter)->pWaveList->GetFilePos() -
2289                            (*iter)->pWaveList->GetPos() - // should be zero, but just to be sure
2290                            wvplFileOffset -
2291                            LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());
2292                        (*iter)->ullWavePoolOffset = _64BitOffset;
2293                        pWavePoolTableHi[i] = (uint32_t) (_64BitOffset >> 32);
2294                        pWavePoolTable[i]   = (uint32_t) _64BitOffset;
2295                    }
2296                } else { // 32 bit offsets with extension files (GigaStudio legacy support) ...
2297                    // the main gig and the extension files may contain wave data
2298                    std::vector<RIFF::File*> poolFiles;
2299                    poolFiles.push_back(pRIFF);
2300                    poolFiles.insert(poolFiles.end(), ExtensionFiles.begin(), ExtensionFiles.end());
2301    
2302                    RIFF::File* pCurPoolFile = NULL;
2303                    int fileNo = 0;
2304                    int waveOffset = 0;
2305                    SampleList::iterator iter = pSamples->begin();
2306                    SampleList::iterator end  = pSamples->end();
2307                    for (int i = 0 ; iter != end ; ++iter, i++) {
2308                        RIFF::File* pPoolFile = (*iter)->pWaveList->GetFile();
2309                        // if this sample is located in the same pool file as the
2310                        // last we reuse the previously computed fileNo and waveOffset
2311                        if (pPoolFile != pCurPoolFile) { // it is a different pool file than the last sample ...
2312                            pCurPoolFile = pPoolFile;
2313    
2314                            std::vector<RIFF::File*>::iterator sIter;
2315                            sIter = std::find(poolFiles.begin(), poolFiles.end(), pPoolFile);
2316                            if (sIter != poolFiles.end())
2317                                fileNo = std::distance(poolFiles.begin(), sIter);
2318                            else
2319                                throw DLS::Exception("Fatal error, unknown pool file");
2320    
2321                            RIFF::List* extWvpl = pCurPoolFile->GetSubList(LIST_TYPE_WVPL);
2322                            if (!extWvpl)
2323                                throw DLS::Exception("Fatal error, pool file has no 'wvpl' list chunk");
2324                            waveOffset =
2325                                extWvpl->GetFilePos() -
2326                                extWvpl->GetPos() + // mandatory, since position might have changed
2327                                LIST_HEADER_SIZE(pCurPoolFile->GetFileOffsetSize());
2328                        }
2329                        uint64_t _64BitOffset =
2330                            (*iter)->pWaveList->GetFilePos() -
2331                            (*iter)->pWaveList->GetPos() - // should be zero, but just to be sure
2332                            waveOffset;
2333                        // pWavePoolTableHi stores file number when extension files are in use
2334                        pWavePoolTableHi[i] = (uint32_t) fileNo;
2335                        pWavePoolTable[i]   = (uint32_t) _64BitOffset;
2336                        (*iter)->ullWavePoolOffset = _64BitOffset;
2337                    }
2338                }
2339          }          }
2340      }      }
2341    
2342    
   
2343  // *************** Exception ***************  // *************** Exception ***************
2344  // *  // *
2345    
Legend:
Removed from v.3198  
changed lines
  Added in v.3481
  ViewVC Help
Powered by ViewVC