/[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 2912 by schoenebeck, Tue May 17 14:30:10 2016 UTC revision 3488 by schoenebeck, Thu Feb 28 17:49:07 2019 UTC
# Line 2  Line 2 
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file access library    *   *   libgig - C++ cross-platform Gigasampler format file access library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003-2016 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2019 by Christian Schoenebeck                      *
6   *                              <cuse@users.sourceforge.net>               *   *                              <cuse@users.sourceforge.net>               *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
# Line 24  Line 24 
24  #include "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 882  namespace DLS { Line 974  namespace DLS {
974       * FormatTag must be DLS_WAVE_FORMAT_PCM. Trying to resize samples with       * FormatTag must be DLS_WAVE_FORMAT_PCM. Trying to resize samples with
975       * other formats will fail!       * other formats will fail!
976       *       *
977       * @param iNewSize - new sample wave data size in sample points (must be       * @param NewSize - new sample wave data size in sample points (must be
978       *                   greater than zero)       *                  greater than zero)
979       * @throws Excecption if FormatTag != DLS_WAVE_FORMAT_PCM       * @throws Exception if FormatTag != DLS_WAVE_FORMAT_PCM
980       * @throws Exception if \a iNewSize is less than 1       * @throws Exception if \a NewSize is less than 1 or unrealistic large
981       * @see File::Save(), FrameSize, FormatTag       * @see File::Save(), FrameSize, FormatTag
982       */       */
983      void Sample::Resize(int iNewSize) {      void Sample::Resize(file_offset_t NewSize) {
984          if (FormatTag != DLS_WAVE_FORMAT_PCM) throw Exception("Sample's format is not DLS_WAVE_FORMAT_PCM");          if (FormatTag != DLS_WAVE_FORMAT_PCM) throw Exception("Sample's format is not DLS_WAVE_FORMAT_PCM");
985          if (iNewSize < 1) throw Exception("Sample size must be at least one sample point");          if (NewSize < 1) throw Exception("Sample size must be at least one sample point");
986          const int iSizeInBytes = iNewSize * FrameSize;          if ((NewSize >> 48) != 0)
987                throw Exception("Unrealistic high DLS sample size detected");
988            const file_offset_t sizeInBytes = NewSize * FrameSize;
989          pCkData = pWaveList->GetSubChunk(CHUNK_ID_DATA);          pCkData = pWaveList->GetSubChunk(CHUNK_ID_DATA);
990          if (pCkData) pCkData->Resize(iSizeInBytes);          if (pCkData) pCkData->Resize(sizeInBytes);
991          else pCkData = pWaveList->AddSubChunk(CHUNK_ID_DATA, iSizeInBytes);          else pCkData = pWaveList->AddSubChunk(CHUNK_ID_DATA, sizeInBytes);
992      }      }
993    
994      /**      /**
# Line 994  namespace DLS { Line 1088  namespace DLS {
1088      Region::Region(Instrument* pInstrument, RIFF::List* rgnList) : Resource(pInstrument, rgnList), Articulator(rgnList), Sampler(rgnList) {      Region::Region(Instrument* pInstrument, RIFF::List* rgnList) : Resource(pInstrument, rgnList), Articulator(rgnList), Sampler(rgnList) {
1089          pCkRegion = rgnList;          pCkRegion = rgnList;
1090    
1091          // articulation informations          // 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 1016  namespace DLS { Line 1112  namespace DLS {
1112          }          }
1113          SelfNonExclusive = FormatOptionFlags & F_RGN_OPTION_SELFNONEXCLUSIVE;          SelfNonExclusive = FormatOptionFlags & F_RGN_OPTION_SELFNONEXCLUSIVE;
1114    
1115          // sample informations          // 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 1037  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 1223  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 1275  namespace DLS { Line 1392  namespace DLS {
1392          RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);          RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);
1393          Region* pNewRegion = new Region(this, rgn);          Region* pNewRegion = new Region(this, rgn);
1394          pRegions->push_back(pNewRegion);          pRegions->push_back(pNewRegion);
1395          Regions = pRegions->size();          Regions = (uint32_t) pRegions->size();
1396          return pNewRegion;          return pNewRegion;
1397      }      }
1398    
# Line 1293  namespace DLS { Line 1410  namespace DLS {
1410          RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pRegion);          RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pRegion);
1411          if (iter == pRegions->end()) return;          if (iter == pRegions->end()) return;
1412          pRegions->erase(iter);          pRegions->erase(iter);
1413          Regions = pRegions->size();          Regions = (uint32_t) pRegions->size();
1414            pRegion->DeleteChunks();
1415          delete pRegion;          delete pRegion;
1416      }      }
1417    
# Line 1313  namespace DLS { Line 1431  namespace DLS {
1431          if (!insh) insh = pCkInstrument->AddSubChunk(CHUNK_ID_INSH, 12);          if (!insh) insh = pCkInstrument->AddSubChunk(CHUNK_ID_INSH, 12);
1432          uint8_t* pData = (uint8_t*) insh->LoadChunkData();          uint8_t* pData = (uint8_t*) insh->LoadChunkData();
1433          // update 'insh' chunk          // update 'insh' chunk
1434          Regions = (pRegions) ? pRegions->size() : 0;          Regions = (pRegions) ? uint32_t(pRegions->size()) : 0;
1435          midi_locale_t locale;          midi_locale_t locale;
1436          locale.instrument = MIDIProgram;          locale.instrument = MIDIProgram;
1437          locale.bank       = MIDI_BANK_ENCODE(MIDIBankCoarse, MIDIBankFine);          locale.bank       = MIDI_BANK_ENCODE(MIDIBankCoarse, MIDIBankFine);
# Line 1327  namespace DLS { Line 1445  namespace DLS {
1445          RegionList::iterator iter = pRegions->begin();          RegionList::iterator iter = pRegions->begin();
1446          RegionList::iterator end  = pRegions->end();          RegionList::iterator end  = pRegions->end();
1447          for (int i = 0; iter != end; ++iter, ++i) {          for (int i = 0; iter != end; ++iter, ++i) {
1448              // divide local progress into subprogress              if (pProgress) {
1449              progress_t subprogress;                  // divide local progress into subprogress
1450              __divide_progress(pProgress, &subprogress, pRegions->size(), i);                  progress_t subprogress;
1451              // do the actual work                  __divide_progress(pProgress, &subprogress, pRegions->size(), i);
1452              (*iter)->UpdateChunks(&subprogress);                  // do the actual work
1453                    (*iter)->UpdateChunks(&subprogress);
1454                } else
1455                    (*iter)->UpdateChunks(NULL);
1456          }          }
1457          __notify_progress(pProgress, 1.0); // notify done          if (pProgress)
1458                __notify_progress(pProgress, 1.0); // notify done
1459      }      }
1460    
1461      /** @brief Destructor.      /** @brief Destructor.
1462       *       *
1463       * Removes RIFF chunks associated with this Instrument and frees all       * Frees all memory occupied by this instrument.
      * memory occupied by this instrument.  
1464       */       */
1465      Instrument::~Instrument() {      Instrument::~Instrument() {
1466          if (pRegions) {          if (pRegions) {
# Line 1351  namespace DLS { Line 1472  namespace DLS {
1472              }              }
1473              delete pRegions;              delete pRegions;
1474          }          }
         // remove instrument's chunks  
         RIFF::List* pParent = pCkInstrument->GetParent();  
         pParent->DeleteSubChunk(pCkInstrument);  
1475      }      }
1476        
1477        /** @brief Remove all RIFF chunks associated with this Instrument object.
1478         *
1479         * See Storage::DeleteChunks() for details.
1480         */
1481        void Instrument::DeleteChunks() {
1482            // handle base classes
1483            Resource::DeleteChunks();
1484            Articulator::DeleteChunks();
1485    
1486            // handle RIFF chunks of members
1487            if (pRegions) {
1488                RegionList::iterator it  = pRegions->begin();
1489                RegionList::iterator end = pRegions->end();
1490                for (; it != end; ++it)
1491                    (*it)->DeleteChunks();
1492            }
1493    
1494            // handle own RIFF chunks
1495            if (pCkInstrument) {
1496                RIFF::List* pParent = pCkInstrument->GetParent();
1497                pParent->DeleteSubChunk(pCkInstrument);
1498                pCkInstrument = NULL;
1499            }
1500        }
1501    
1502      void Instrument::CopyAssignCore(const Instrument* orig) {      void Instrument::CopyAssignCore(const Instrument* orig) {
1503          // handle base classes          // handle base classes
1504          Resource::CopyAssign(orig);          Resource::CopyAssign(orig);
# Line 1405  namespace DLS { Line 1548  namespace DLS {
1548       */       */
1549      File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS)) {      File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS)) {
1550          pRIFF->SetByteOrder(RIFF::endian_little);          pRIFF->SetByteOrder(RIFF::endian_little);
1551            bOwningRiff = true;
1552          pVersion = new version_t;          pVersion = new version_t;
1553          pVersion->major   = 0;          pVersion->major   = 0;
1554          pVersion->minor   = 0;          pVersion->minor   = 0;
# Line 1435  namespace DLS { Line 1579  namespace DLS {
1579      File::File(RIFF::File* pRIFF) : Resource(NULL, pRIFF) {      File::File(RIFF::File* pRIFF) : Resource(NULL, pRIFF) {
1580          if (!pRIFF) throw DLS::Exception("NULL pointer reference to RIFF::File object.");          if (!pRIFF) throw DLS::Exception("NULL pointer reference to RIFF::File object.");
1581          this->pRIFF = pRIFF;          this->pRIFF = pRIFF;
1582            bOwningRiff = false;
1583          RIFF::Chunk* ckVersion = pRIFF->GetSubChunk(CHUNK_ID_VERS);          RIFF::Chunk* ckVersion = pRIFF->GetSubChunk(CHUNK_ID_VERS);
1584          if (ckVersion) {          if (ckVersion) {
1585                ckVersion->SetPos(0);
1586    
1587              pVersion = new version_t;              pVersion = new version_t;
1588              ckVersion->Read(pVersion, 4, 2);              ckVersion->Read(pVersion, 4, 2);
1589          }          }
# Line 1445  namespace DLS { Line 1591  namespace DLS {
1591    
1592          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);
1593          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.");
1594            colh->SetPos(0);
1595          Instruments = colh->ReadUint32();          Instruments = colh->ReadUint32();
1596    
1597          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);
# Line 1455  namespace DLS { Line 1602  namespace DLS {
1602              WavePoolHeaderSize = 8;              WavePoolHeaderSize = 8;
1603              b64BitWavePoolOffsets = false;              b64BitWavePoolOffsets = false;
1604          } else {          } else {
1605                ptbl->SetPos(0);
1606    
1607              WavePoolHeaderSize = ptbl->ReadUint32();              WavePoolHeaderSize = ptbl->ReadUint32();
1608              WavePoolCount  = ptbl->ReadUint32();              WavePoolCount  = ptbl->ReadUint32();
1609              pWavePoolTable = new uint32_t[WavePoolCount];              pWavePoolTable = new uint32_t[WavePoolCount];
# Line 1507  namespace DLS { Line 1656  namespace DLS {
1656          if (pVersion) delete pVersion;          if (pVersion) delete pVersion;
1657          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++)
1658              delete *i;              delete *i;
1659            if (bOwningRiff)
1660                delete pRIFF;
1661      }      }
1662    
1663      Sample* File::GetFirstSample() {      Sample* File::GetFirstSample() {
# Line 1526  namespace DLS { Line 1677  namespace DLS {
1677          if (!pSamples) pSamples = new SampleList;          if (!pSamples) pSamples = new SampleList;
1678          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
1679          if (wvpl) {          if (wvpl) {
1680              file_offset_t wvplFileOffset = wvpl->GetFilePos();              file_offset_t wvplFileOffset = wvpl->GetFilePos() -
1681                                               wvpl->GetPos(); // should be zero, but just to be sure
1682              RIFF::List* wave = wvpl->GetFirstSubList();              RIFF::List* wave = wvpl->GetFirstSubList();
1683              while (wave) {              while (wave) {
1684                  if (wave->GetListType() == LIST_TYPE_WAVE) {                  if (wave->GetListType() == LIST_TYPE_WAVE) {
1685                      file_offset_t waveFileOffset = wave->GetFilePos();                      file_offset_t waveFileOffset = wave->GetFilePos() -
1686                                                       wave->GetPos(); // should be zero, but just to be sure
1687                      pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));                      pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));
1688                  }                  }
1689                  wave = wvpl->GetNextSubList();                  wave = wvpl->GetNextSubList();
# Line 1539  namespace DLS { Line 1692  namespace DLS {
1692          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)
1693              RIFF::List* dwpl = pRIFF->GetSubList(LIST_TYPE_DWPL);              RIFF::List* dwpl = pRIFF->GetSubList(LIST_TYPE_DWPL);
1694              if (dwpl) {              if (dwpl) {
1695                  file_offset_t dwplFileOffset = dwpl->GetFilePos();                  file_offset_t dwplFileOffset = dwpl->GetFilePos() -
1696                                                   dwpl->GetPos(); // should be zero, but just to be sure
1697                  RIFF::List* wave = dwpl->GetFirstSubList();                  RIFF::List* wave = dwpl->GetFirstSubList();
1698                  while (wave) {                  while (wave) {
1699                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
1700                          file_offset_t waveFileOffset = wave->GetFilePos();                          file_offset_t waveFileOffset = wave->GetFilePos() -
1701                                                           wave->GetPos(); // should be zero, but just to be sure
1702                          pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset));                          pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset));
1703                      }                      }
1704                      wave = dwpl->GetNextSubList();                      wave = dwpl->GetNextSubList();
# Line 1582  namespace DLS { Line 1737  namespace DLS {
1737          SampleList::iterator iter = find(pSamples->begin(), pSamples->end(), pSample);          SampleList::iterator iter = find(pSamples->begin(), pSamples->end(), pSample);
1738          if (iter == pSamples->end()) return;          if (iter == pSamples->end()) return;
1739          pSamples->erase(iter);          pSamples->erase(iter);
1740            pSample->DeleteChunks();
1741          delete pSample;          delete pSample;
1742      }      }
1743    
# Line 1641  namespace DLS { Line 1797  namespace DLS {
1797          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), pInstrument);          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), pInstrument);
1798          if (iter == pInstruments->end()) return;          if (iter == pInstruments->end()) return;
1799          pInstruments->erase(iter);          pInstruments->erase(iter);
1800            pInstrument->DeleteChunks();
1801          delete pInstrument;          delete pInstrument;
1802      }      }
1803    
1804      /**      /**
1805         * Returns the underlying RIFF::File used for persistency of this DLS::File
1806         * object.
1807         */
1808        RIFF::File* File::GetRiffFile() {
1809            return pRIFF;
1810        }
1811    
1812        /**
1813       * Returns extension file of given index. Extension files are used       * Returns extension file of given index. Extension files are used
1814       * 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
1815       * 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 1709  namespace DLS { Line 1874  namespace DLS {
1874          }          }
1875    
1876          // update 'colh' chunk          // update 'colh' chunk
1877          Instruments = (pInstruments) ? pInstruments->size() : 0;          Instruments = (pInstruments) ? uint32_t(pInstruments->size()) : 0;
1878          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);
1879          if (!colh)   colh = pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);          if (!colh)   colh = pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);
1880          uint8_t* pData = (uint8_t*) colh->LoadChunkData();          uint8_t* pData = (uint8_t*) colh->LoadChunkData();
# Line 1717  namespace DLS { Line 1882  namespace DLS {
1882    
1883          // update instrument's chunks          // update instrument's chunks
1884          if (pInstruments) {          if (pInstruments) {
1885              // divide local progress into subprogress              if (pProgress) {
1886              progress_t subprogress;                  // divide local progress into subprogress
1887              __divide_progress(pProgress, &subprogress, 20.f, 0.f); // arbitrarily subdivided into 5% of total progress                  progress_t subprogress;
1888                    __divide_progress(pProgress, &subprogress, 20.f, 0.f); // arbitrarily subdivided into 5% of total progress
1889    
             // do the actual work  
             InstrumentList::iterator iter = pInstruments->begin();  
             InstrumentList::iterator end  = pInstruments->end();  
             for (int i = 0; iter != end; ++iter, ++i) {  
                 // divide subprogress into sub-subprogress  
                 progress_t subsubprogress;  
                 __divide_progress(&subprogress, &subsubprogress, pInstruments->size(), i);  
1890                  // do the actual work                  // do the actual work
1891                  (*iter)->UpdateChunks(&subsubprogress);                  InstrumentList::iterator iter = pInstruments->begin();
1892              }                  InstrumentList::iterator end  = pInstruments->end();
1893                    for (int i = 0; iter != end; ++iter, ++i) {
1894                        // divide subprogress into sub-subprogress
1895                        progress_t subsubprogress;
1896                        __divide_progress(&subprogress, &subsubprogress, pInstruments->size(), i);
1897                        // do the actual work
1898                        (*iter)->UpdateChunks(&subsubprogress);
1899                    }
1900    
1901              __notify_progress(&subprogress, 1.0); // notify subprogress done                  __notify_progress(&subprogress, 1.0); // notify subprogress done
1902                } else {
1903                    InstrumentList::iterator iter = pInstruments->begin();
1904                    InstrumentList::iterator end  = pInstruments->end();
1905                    for (int i = 0; iter != end; ++iter, ++i) {
1906                        (*iter)->UpdateChunks(NULL);
1907                    }
1908                }
1909          }          }
1910    
1911          // update 'ptbl' chunk          // update 'ptbl' chunk
1912          const int iSamples = (pSamples) ? pSamples->size() : 0;          const int iSamples = (pSamples) ? int(pSamples->size()) : 0;
1913          int iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;          int iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;
1914          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);
1915          if (!ptbl)   ptbl = pRIFF->AddSubChunk(CHUNK_ID_PTBL, 1 /*anything, we'll resize*/);          if (!ptbl)   ptbl = pRIFF->AddSubChunk(CHUNK_ID_PTBL, 1 /*anything, we'll resize*/);
# Line 1750  namespace DLS { Line 1923  namespace DLS {
1923    
1924          // update sample's chunks          // update sample's chunks
1925          if (pSamples) {          if (pSamples) {
1926              // divide local progress into subprogress              if (pProgress) {
1927              progress_t subprogress;                  // divide local progress into subprogress
1928              __divide_progress(pProgress, &subprogress, 20.f, 1.f); // arbitrarily subdivided into 95% of total progress                  progress_t subprogress;
1929                    __divide_progress(pProgress, &subprogress, 20.f, 1.f); // arbitrarily subdivided into 95% of total progress
1930    
             // do the actual work  
             SampleList::iterator iter = pSamples->begin();  
             SampleList::iterator end  = pSamples->end();  
             for (int i = 0; iter != end; ++iter, ++i) {  
                 // divide subprogress into sub-subprogress  
                 progress_t subsubprogress;  
                 __divide_progress(&subprogress, &subsubprogress, pSamples->size(), i);  
1931                  // do the actual work                  // do the actual work
1932                  (*iter)->UpdateChunks(&subsubprogress);                  SampleList::iterator iter = pSamples->begin();
1933                    SampleList::iterator end  = pSamples->end();
1934                    for (int i = 0; iter != end; ++iter, ++i) {
1935                        // divide subprogress into sub-subprogress
1936                        progress_t subsubprogress;
1937                        __divide_progress(&subprogress, &subsubprogress, pSamples->size(), i);
1938                        // do the actual work
1939                        (*iter)->UpdateChunks(&subsubprogress);
1940                    }
1941    
1942                    __notify_progress(&subprogress, 1.0); // notify subprogress done
1943                } else {
1944                    SampleList::iterator iter = pSamples->begin();
1945                    SampleList::iterator end  = pSamples->end();
1946                    for (int i = 0; iter != end; ++iter, ++i) {
1947                        (*iter)->UpdateChunks(NULL);
1948                    }
1949                }
1950            }
1951    
1952            // if there are any extension files, gather which ones are regular
1953            // extension files used as wave pool files (.gx00, .gx01, ... , .gx98)
1954            // and which one is probably a convolution (GigaPulse) file (always to
1955            // be saved as .gx99)
1956            std::list<RIFF::File*> poolFiles;  // < for (.gx00, .gx01, ... , .gx98) files
1957            RIFF::File* pGigaPulseFile = NULL; // < for .gx99 file
1958            if (!ExtensionFiles.empty()) {
1959                std::list<RIFF::File*>::iterator it = ExtensionFiles.begin();
1960                for (; it != ExtensionFiles.end(); ++it) {
1961                    //FIXME: the .gx99 file is always used by GSt for convolution
1962                    // data (GigaPulse); so we should better detect by subchunk
1963                    // whether the extension file is intended for convolution
1964                    // instead of checkking for a file name, because the latter does
1965                    // not work for saving new gigs created from scratch
1966                    const std::string oldName = (*it)->GetFileName();
1967                    const bool isGigaPulseFile = (extensionOfPath(oldName) == "gx99");
1968                    if (isGigaPulseFile)
1969                        pGigaPulseFile = *it;
1970                    else
1971                        poolFiles.push_back(*it);
1972              }              }
1973            }
1974    
1975              __notify_progress(&subprogress, 1.0); // notify subprogress done          // update the 'xfil' chunk which describes all extension files (wave
1976            // pool files) except the .gx99 file
1977            if (!poolFiles.empty()) {
1978                const int n = poolFiles.size();
1979                const int iHeaderSize = 4;
1980                const int iEntrySize = 144;
1981    
1982                // make sure chunk exists, and with correct size
1983                RIFF::Chunk* ckXfil = pRIFF->GetSubChunk(CHUNK_ID_XFIL);
1984                if (ckXfil)
1985                    ckXfil->Resize(iHeaderSize + n * iEntrySize);
1986                else
1987                    ckXfil = pRIFF->AddSubChunk(CHUNK_ID_XFIL, iHeaderSize + n * iEntrySize);
1988    
1989                uint8_t* pData = (uint8_t*) ckXfil->LoadChunkData();
1990    
1991                // re-assemble the chunk's content
1992                store32(pData, n);
1993                std::list<RIFF::File*>::iterator itExtFile = poolFiles.begin();
1994                for (int i = 0, iOffset = 4; i < n;
1995                     ++itExtFile, ++i, iOffset += iEntrySize)
1996                {
1997                    // update the filename string and 5 byte extension of each extension file
1998                    std::string file = lastPathComponent(
1999                        (*itExtFile)->GetFileName()
2000                    );
2001                    if (file.length() + 6 > 128)
2002                        throw Exception("Fatal error, extension filename length exceeds 122 byte maximum");
2003                    uint8_t* pStrings = &pData[iOffset];
2004                    memset(pStrings, 0, 128);
2005                    memcpy(pStrings, file.c_str(), file.length());
2006                    pStrings += file.length() + 1;
2007                    std::string ext = file.substr(file.length()-5);
2008                    memcpy(pStrings, ext.c_str(), 5);
2009                    // update the dlsid of the extension file
2010                    uint8_t* pId = &pData[iOffset + 128];
2011                    dlsid_t id;
2012                    RIFF::Chunk* ckDLSID = (*itExtFile)->GetSubChunk(CHUNK_ID_DLID);
2013                    if (ckDLSID) {
2014                        ckDLSID->Read(&id.ulData1, 1, 4);
2015                        ckDLSID->Read(&id.usData2, 1, 2);
2016                        ckDLSID->Read(&id.usData3, 1, 2);
2017                        ckDLSID->Read(id.abData, 8, 1);
2018                    } else {
2019                        ckDLSID = (*itExtFile)->AddSubChunk(CHUNK_ID_DLID, 16);
2020                        Resource::GenerateDLSID(&id);
2021                        uint8_t* pData = (uint8_t*)ckDLSID->LoadChunkData();
2022                        store32(&pData[0], id.ulData1);
2023                        store16(&pData[4], id.usData2);
2024                        store16(&pData[6], id.usData3);
2025                        memcpy(&pData[8], id.abData, 8);
2026                    }
2027                    store32(&pId[0], id.ulData1);
2028                    store16(&pId[4], id.usData2);
2029                    store16(&pId[6], id.usData3);
2030                    memcpy(&pId[8], id.abData, 8);
2031                }
2032            } else {
2033                // in case there was a 'xfil' chunk, remove it
2034                RIFF::Chunk* ckXfil = pRIFF->GetSubChunk(CHUNK_ID_XFIL);
2035                if (ckXfil) pRIFF->DeleteSubChunk(ckXfil);
2036            }
2037    
2038            // update the 'doxf' chunk which describes a .gx99 extension file
2039            // which contains convolution data (GigaPulse)
2040            if (pGigaPulseFile) {
2041                RIFF::Chunk* ckDoxf = pRIFF->GetSubChunk(CHUNK_ID_DOXF);
2042                if (!ckDoxf) ckDoxf = pRIFF->AddSubChunk(CHUNK_ID_DOXF, 148);
2043    
2044                uint8_t* pData = (uint8_t*) ckDoxf->LoadChunkData();
2045    
2046                // update the dlsid from the extension file
2047                uint8_t* pId = &pData[132];
2048                RIFF::Chunk* ckDLSID = pGigaPulseFile->GetSubChunk(CHUNK_ID_DLID);
2049                if (!ckDLSID) { //TODO: auto generate DLS ID if missing
2050                    throw Exception("Fatal error, GigaPulse file does not contain a DLS ID chunk");
2051                } else {
2052                    dlsid_t id;
2053                    // read DLS ID from extension files's DLS ID chunk
2054                    uint8_t* pData = (uint8_t*) ckDLSID->LoadChunkData();
2055                    id.ulData1 = load32(&pData[0]);
2056                    id.usData2 = load16(&pData[4]);
2057                    id.usData3 = load16(&pData[6]);
2058                    memcpy(id.abData, &pData[8], 8);
2059                    // store DLS ID to 'doxf' chunk
2060                    store32(&pId[0], id.ulData1);
2061                    store16(&pId[4], id.usData2);
2062                    store16(&pId[6], id.usData3);
2063                    memcpy(&pId[8], id.abData, 8);
2064                }
2065            } else {
2066                // in case there was a 'doxf' chunk, remove it
2067                RIFF::Chunk* ckDoxf = pRIFF->GetSubChunk(CHUNK_ID_DOXF);
2068                if (ckDoxf) pRIFF->DeleteSubChunk(ckDoxf);
2069          }          }
2070    
2071          // 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
# Line 1773  namespace DLS { Line 2073  namespace DLS {
2073          // size and thus accordingly we would need to resize the wave pool          // size and thus accordingly we would need to resize the wave pool
2074          // chunk          // chunk
2075          const file_offset_t finalFileSize = pRIFF->GetRequiredFileSize();          const file_offset_t finalFileSize = pRIFF->GetRequiredFileSize();
2076          const bool bRequires64Bit = (finalFileSize >> 32) != 0;          const bool bRequires64Bit = (finalFileSize >> 32) != 0 || // < native 64 bit gig file
2077                                         poolFiles.size() > 0;        // < 32 bit gig file where the hi 32 bits are used as extension file nr
2078          if (b64BitWavePoolOffsets != bRequires64Bit) {          if (b64BitWavePoolOffsets != bRequires64Bit) {
2079              b64BitWavePoolOffsets = bRequires64Bit;              b64BitWavePoolOffsets = bRequires64Bit;
2080              iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;              iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;
# Line 1781  namespace DLS { Line 2082  namespace DLS {
2082              ptbl->Resize(iPtblSize);              ptbl->Resize(iPtblSize);
2083          }          }
2084    
2085          __notify_progress(pProgress, 1.0); // notify done          if (pProgress)
2086                __notify_progress(pProgress, 1.0); // notify done
2087      }      }
2088    
2089      /** @brief Save changes to another file.      /** @brief Save changes to another file.
# Line 1799  namespace DLS { Line 2101  namespace DLS {
2101       * @param pProgress - optional: callback function for progress notification       * @param pProgress - optional: callback function for progress notification
2102       */       */
2103      void File::Save(const String& Path, progress_t* pProgress) {      void File::Save(const String& Path, progress_t* pProgress) {
2104          {          // calculate number of tasks to notify progress appropriately
2105            const size_t nExtFiles = ExtensionFiles.size();
2106            const float tasks = 2.f + nExtFiles;
2107    
2108            // save extension files (if required)
2109            if (!ExtensionFiles.empty()) {
2110                // for assembling path of extension files to be saved to
2111                const std::string baseName = pathWithoutExtension(Path);
2112                // save the individual extension files
2113                std::list<RIFF::File*>::iterator it = ExtensionFiles.begin();
2114                for (int i = 0; it != ExtensionFiles.end(); ++i, ++it) {
2115                    //FIXME: the .gx99 file is always used by GSt for convolution
2116                    // data (GigaPulse); so we should better detect by subchunk
2117                    // whether the extension file is intended for convolution
2118                    // instead of checkking for a file name, because the latter does
2119                    // not work for saving new gigs created from scratch
2120                    const std::string oldName = (*it)->GetFileName();
2121                    const bool isGigaPulseFile = (extensionOfPath(oldName) == "gx99");
2122                    std::string ext = (isGigaPulseFile) ? ".gx99" : strPrint(".gx%02d", i+1);
2123                    std::string newPath = baseName + ext;
2124                    // save extension file to its new location
2125                    if (pProgress) {
2126                         // divide local progress into subprogress
2127                        progress_t subprogress;
2128                        __divide_progress(pProgress, &subprogress, tasks, 0.f + i); // subdivided into amount of extension files
2129                        // do the actual work
2130                        (*it)->Save(newPath, &subprogress);
2131                    } else
2132                        (*it)->Save(newPath);
2133                }
2134            }
2135    
2136            if (pProgress) {
2137              // divide local progress into subprogress              // divide local progress into subprogress
2138              progress_t subprogress;              progress_t subprogress;
2139              __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)
2140              // do the actual work              // do the actual work
2141              UpdateChunks(&subprogress);              UpdateChunks(&subprogress);
2142                        } else
2143          }              UpdateChunks(NULL);
2144          {  
2145            if (pProgress) {
2146              // divide local progress into subprogress              // divide local progress into subprogress
2147              progress_t subprogress;              progress_t subprogress;
2148              __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)
2149              // do the actual work              // do the actual work
2150              pRIFF->Save(Path, &subprogress);              pRIFF->Save(Path, &subprogress);
2151          }          } else
2152                pRIFF->Save(Path);
2153    
2154          UpdateFileOffsets();          UpdateFileOffsets();
2155          __notify_progress(pProgress, 1.0); // notify done  
2156            if (pProgress)
2157                __notify_progress(pProgress, 1.0); // notify done
2158      }      }
2159    
2160      /** @brief Save changes to same file.      /** @brief Save changes to same file.
# Line 1825  namespace DLS { Line 2164  namespace DLS {
2164       * have at the end of the saving process.       * have at the end of the saving process.
2165       *       *
2166       * @param pProgress - optional: callback function for progress notification       * @param pProgress - optional: callback function for progress notification
2167       * @throws RIFF::Exception if any kind of IO error occured       * @throws RIFF::Exception if any kind of IO error occurred
2168       * @throws DLS::Exception  if any kind of DLS specific error occured       * @throws DLS::Exception  if any kind of DLS specific error occurred
2169       */       */
2170      void File::Save(progress_t* pProgress) {      void File::Save(progress_t* pProgress) {
2171          {          // calculate number of tasks to notify progress appropriately
2172            const size_t nExtFiles = ExtensionFiles.size();
2173            const float tasks = 2.f + nExtFiles;
2174    
2175            // save extension files (if required)
2176            if (!ExtensionFiles.empty()) {
2177                std::list<RIFF::File*>::iterator it = ExtensionFiles.begin();
2178                for (int i = 0; it != ExtensionFiles.end(); ++i, ++it) {
2179                    // save extension file
2180                    if (pProgress) {
2181                        // divide local progress into subprogress
2182                        progress_t subprogress;
2183                        __divide_progress(pProgress, &subprogress, tasks, 0.f + i); // subdivided into amount of extension files
2184                        // do the actual work
2185                        (*it)->Save(&subprogress);
2186                    } else
2187                        (*it)->Save();
2188                }
2189            }
2190    
2191            if (pProgress) {
2192              // divide local progress into subprogress              // divide local progress into subprogress
2193              progress_t subprogress;              progress_t subprogress;
2194              __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)
2195              // do the actual work              // do the actual work
2196              UpdateChunks(&subprogress);              UpdateChunks(&subprogress);
2197          }          } else
2198          {              UpdateChunks(NULL);
2199    
2200            if (pProgress) {
2201              // divide local progress into subprogress              // divide local progress into subprogress
2202              progress_t subprogress;              progress_t subprogress;
2203              __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)
2204              // do the actual work              // do the actual work
2205              pRIFF->Save(&subprogress);              pRIFF->Save(&subprogress);
2206          }          } else
2207                pRIFF->Save();
2208    
2209          UpdateFileOffsets();          UpdateFileOffsets();
2210          __notify_progress(pProgress, 1.0); // notify done  
2211            if (pProgress)
2212                __notify_progress(pProgress, 1.0); // notify done
2213      }      }
2214    
2215      /** @brief Updates all file offsets stored all over the file.      /** @brief Updates all file offsets stored all over the file.
# Line 1895  namespace DLS { Line 2260  namespace DLS {
2260          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);
2261          const int iOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;          const int iOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;
2262          // check if 'ptbl' chunk is large enough          // check if 'ptbl' chunk is large enough
2263          WavePoolCount = (pSamples) ? pSamples->size() : 0;          WavePoolCount = (pSamples) ? uint32_t(pSamples->size()) : 0;
2264          const file_offset_t ulRequiredSize = WavePoolHeaderSize + iOffsetSize * WavePoolCount;          const file_offset_t ulRequiredSize = WavePoolHeaderSize + iOffsetSize * WavePoolCount;
2265          if (ptbl->GetSize() < ulRequiredSize) throw Exception("Fatal error, 'ptbl' chunk too small");          if (ptbl->GetSize() < ulRequiredSize) throw Exception("Fatal error, 'ptbl' chunk too small");
2266          // save the 'ptbl' chunk's current read/write position          // save the 'ptbl' chunk's current read/write position
# Line 1931  namespace DLS { Line 2296  namespace DLS {
2296       * exists already.       * exists already.
2297       */       */
2298      void File::__UpdateWavePoolTable() {      void File::__UpdateWavePoolTable() {
2299          WavePoolCount = (pSamples) ? pSamples->size() : 0;          WavePoolCount = (pSamples) ? uint32_t(pSamples->size()) : 0;
2300          // resize wave pool table arrays          // resize wave pool table arrays
2301          if (pWavePoolTable)   delete[] pWavePoolTable;          if (pWavePoolTable)   delete[] pWavePoolTable;
2302          if (pWavePoolTableHi) delete[] pWavePoolTableHi;          if (pWavePoolTableHi) delete[] pWavePoolTableHi;
2303          pWavePoolTable   = new uint32_t[WavePoolCount];          pWavePoolTable   = new uint32_t[WavePoolCount];
2304          pWavePoolTableHi = new uint32_t[WavePoolCount];          pWavePoolTableHi = new uint32_t[WavePoolCount];
2305          if (!pSamples) return;          if (!pSamples) return;
2306          // update offsets int wave pool table          // update offsets in wave pool table
2307          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
2308          uint64_t wvplFileOffset = wvpl->GetFilePos();          uint64_t wvplFileOffset = wvpl->GetFilePos() -
2309          if (b64BitWavePoolOffsets) {                                    wvpl->GetPos(); // mandatory, since position might have changed
2310              SampleList::iterator iter = pSamples->begin();          if (!b64BitWavePoolOffsets) { // conventional 32 bit offsets (and no extension files) ...
             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());  
                 (*iter)->ullWavePoolOffset = _64BitOffset;  
                 pWavePoolTableHi[i] = (uint32_t) (_64BitOffset >> 32);  
                 pWavePoolTable[i]   = (uint32_t) _64BitOffset;  
             }  
         } else { // conventional 32 bit offsets  
2311              SampleList::iterator iter = pSamples->begin();              SampleList::iterator iter = pSamples->begin();
2312              SampleList::iterator end  = pSamples->end();              SampleList::iterator end  = pSamples->end();
2313              for (int i = 0 ; iter != end ; ++iter, i++) {              for (int i = 0 ; iter != end ; ++iter, i++) {
2314                  uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());                  uint64_t _64BitOffset =
2315                        (*iter)->pWaveList->GetFilePos() -
2316                        (*iter)->pWaveList->GetPos() - // should be zero, but just to be sure
2317                        wvplFileOffset -
2318                        LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());
2319                  (*iter)->ullWavePoolOffset = _64BitOffset;                  (*iter)->ullWavePoolOffset = _64BitOffset;
2320                  pWavePoolTable[i] = (uint32_t) _64BitOffset;                  pWavePoolTable[i] = (uint32_t) _64BitOffset;
2321              }              }
2322            } else { // a) native 64 bit offsets without extension files or b) 32 bit offsets with extension files ...
2323                if (ExtensionFiles.empty()) { // native 64 bit offsets (and no extension files) [not compatible with GigaStudio] ...
2324                    SampleList::iterator iter = pSamples->begin();
2325                    SampleList::iterator end  = pSamples->end();
2326                    for (int i = 0 ; iter != end ; ++iter, i++) {
2327                        uint64_t _64BitOffset =
2328                            (*iter)->pWaveList->GetFilePos() -
2329                            (*iter)->pWaveList->GetPos() - // should be zero, but just to be sure
2330                            wvplFileOffset -
2331                            LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());
2332                        (*iter)->ullWavePoolOffset = _64BitOffset;
2333                        pWavePoolTableHi[i] = (uint32_t) (_64BitOffset >> 32);
2334                        pWavePoolTable[i]   = (uint32_t) _64BitOffset;
2335                    }
2336                } else { // 32 bit offsets with extension files (GigaStudio legacy support) ...
2337                    // the main gig and the extension files may contain wave data
2338                    std::vector<RIFF::File*> poolFiles;
2339                    poolFiles.push_back(pRIFF);
2340                    poolFiles.insert(poolFiles.end(), ExtensionFiles.begin(), ExtensionFiles.end());
2341    
2342                    RIFF::File* pCurPoolFile = NULL;
2343                    int fileNo = 0;
2344                    int waveOffset = 0;
2345                    SampleList::iterator iter = pSamples->begin();
2346                    SampleList::iterator end  = pSamples->end();
2347                    for (int i = 0 ; iter != end ; ++iter, i++) {
2348                        RIFF::File* pPoolFile = (*iter)->pWaveList->GetFile();
2349                        // if this sample is located in the same pool file as the
2350                        // last we reuse the previously computed fileNo and waveOffset
2351                        if (pPoolFile != pCurPoolFile) { // it is a different pool file than the last sample ...
2352                            pCurPoolFile = pPoolFile;
2353    
2354                            std::vector<RIFF::File*>::iterator sIter;
2355                            sIter = std::find(poolFiles.begin(), poolFiles.end(), pPoolFile);
2356                            if (sIter != poolFiles.end())
2357                                fileNo = std::distance(poolFiles.begin(), sIter);
2358                            else
2359                                throw DLS::Exception("Fatal error, unknown pool file");
2360    
2361                            RIFF::List* extWvpl = pCurPoolFile->GetSubList(LIST_TYPE_WVPL);
2362                            if (!extWvpl)
2363                                throw DLS::Exception("Fatal error, pool file has no 'wvpl' list chunk");
2364                            waveOffset =
2365                                extWvpl->GetFilePos() -
2366                                extWvpl->GetPos() + // mandatory, since position might have changed
2367                                LIST_HEADER_SIZE(pCurPoolFile->GetFileOffsetSize());
2368                        }
2369                        uint64_t _64BitOffset =
2370                            (*iter)->pWaveList->GetFilePos() -
2371                            (*iter)->pWaveList->GetPos() - // should be zero, but just to be sure
2372                            waveOffset;
2373                        // pWavePoolTableHi stores file number when extension files are in use
2374                        pWavePoolTableHi[i] = (uint32_t) fileNo;
2375                        pWavePoolTable[i]   = (uint32_t) _64BitOffset;
2376                        (*iter)->ullWavePoolOffset = _64BitOffset;
2377                    }
2378                }
2379          }          }
2380      }      }
2381    
2382    
   
2383  // *************** Exception ***************  // *************** Exception ***************
2384  // *  // *
2385    
2386      Exception::Exception(String Message) : RIFF::Exception(Message) {      Exception::Exception() : RIFF::Exception() {
2387        }
2388    
2389        Exception::Exception(String format, ...) : RIFF::Exception() {
2390            va_list arg;
2391            va_start(arg, format);
2392            Message = assemble(format, arg);
2393            va_end(arg);
2394        }
2395    
2396        Exception::Exception(String format, va_list arg) : RIFF::Exception() {
2397            Message = assemble(format, arg);
2398      }      }
2399    
2400      void Exception::PrintMessage() {      void Exception::PrintMessage() {
Legend:
Removed from v.2912  
changed lines
  Added in v.3488
  ViewVC Help
Powered by ViewVC