/[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 2698 by schoenebeck, Sun Jan 11 17:47:57 2015 UTC revision 3922 by schoenebeck, Mon Jun 14 10:33:29 2021 UTC
# Line 2  Line 2 
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file access library    *   *   libgig - C++ cross-platform Gigasampler format file access library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003-2014 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2021 by Christian Schoenebeck                      *
6   *                              <cuse@users.sourceforge.net>               *   *                              <cuse@users.sourceforge.net>               *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
# Line 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 193  namespace DLS { Line 209  namespace DLS {
209          if (lart) {          if (lart) {
210              uint32_t artCkType = (lart->GetListType() == LIST_TYPE_LAR2) ? CHUNK_ID_ART2              uint32_t artCkType = (lart->GetListType() == LIST_TYPE_LAR2) ? CHUNK_ID_ART2
211                                                                           : CHUNK_ID_ARTL;                                                                           : CHUNK_ID_ARTL;
212              RIFF::Chunk* art = lart->GetFirstSubChunk();              size_t i = 0;
213              while (art) {              for (RIFF::Chunk* art = lart->GetSubChunkAt(i); art;
214                     art = lart->GetSubChunkAt(++i))
215                {
216                  if (art->GetChunkID() == artCkType) {                  if (art->GetChunkID() == artCkType) {
217                      if (!pArticulations) pArticulations = new ArticulationList;                      if (!pArticulations) pArticulations = new ArticulationList;
218                      pArticulations->push_back(new Articulation(art));                      pArticulations->push_back(new Articulation(art));
219                  }                  }
                 art = lart->GetNextSubChunk();  
220              }              }
221          }          }
222      }      }
# Line 231  namespace DLS { Line 248  namespace DLS {
248              }              }
249          }          }
250      }      }
251        
252        /** @brief Remove all RIFF chunks associated with this Articulator object.
253         *
254         * See Storage::DeleteChunks() for details.
255         */
256        void Articulator::DeleteChunks() {
257            if (pArticulations) {
258                ArticulationList::iterator iter = pArticulations->begin();
259                ArticulationList::iterator end  = pArticulations->end();
260                for (; iter != end; ++iter) {
261                    (*iter)->DeleteChunks();
262                }
263            }
264        }
265    
266      /**      /**
267       * Not yet implemented in this version, since the .gig format does       * Not yet implemented in this version, since the .gig format does
268       * 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 429  namespace DLS {
429          SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String(""));          SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String(""));
430          SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String(""));          SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String(""));
431      }      }
432        
433        /** @brief Remove all RIFF chunks associated with this Info object.
434         *
435         * At the moment Info::DeleteChunks() does nothing. It is
436         * recommended to call this method explicitly though from deriving classes's
437         * own overridden implementation of this method to avoid potential future
438         * compatiblity issues.
439         *
440         * See Storage::DeleteChunks() for details.
441         */
442        void Info::DeleteChunks() {
443        }
444    
445      /**      /**
446       * 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
447       * this object.       * this object.
# Line 449  namespace DLS { Line 492  namespace DLS {
492    
493          RIFF::Chunk* ckDLSID = lstResource->GetSubChunk(CHUNK_ID_DLID);          RIFF::Chunk* ckDLSID = lstResource->GetSubChunk(CHUNK_ID_DLID);
494          if (ckDLSID) {          if (ckDLSID) {
495                ckDLSID->SetPos(0);
496    
497              pDLSID = new dlsid_t;              pDLSID = new dlsid_t;
498              ckDLSID->Read(&pDLSID->ulData1, 1, 4);              ckDLSID->Read(&pDLSID->ulData1, 1, 4);
499              ckDLSID->Read(&pDLSID->usData2, 1, 2);              ckDLSID->Read(&pDLSID->usData2, 1, 2);
# Line 463  namespace DLS { Line 508  namespace DLS {
508          if (pInfo)  delete pInfo;          if (pInfo)  delete pInfo;
509      }      }
510    
511        /** @brief Remove all RIFF chunks associated with this Resource object.
512         *
513         * At the moment Resource::DeleteChunks() does nothing. It is recommended
514         * to call this method explicitly though from deriving classes's own
515         * overridden implementation of this method to avoid potential future
516         * compatiblity issues.
517         *
518         * See Storage::DeleteChunks() for details.
519         */
520        void Resource::DeleteChunks() {
521        }
522    
523      /** @brief Update chunks with current Resource data.      /** @brief Update chunks with current Resource data.
524       *       *
525       * Apply Resource data persistently below the previously given resource       * Apply Resource data persistently below the previously given resource
# Line 493  namespace DLS { Line 550  namespace DLS {
550       * Generates a new DLSID for the resource.       * Generates a new DLSID for the resource.
551       */       */
552      void Resource::GenerateDLSID() {      void Resource::GenerateDLSID() {
553  #if defined(WIN32) || defined(__APPLE__) || defined(HAVE_UUID_GENERATE)          #if defined(WIN32) || defined(__APPLE__) || defined(HAVE_UUID_GENERATE)
   
554          if (!pDLSID) pDLSID = new dlsid_t;          if (!pDLSID) pDLSID = new dlsid_t;
555            GenerateDLSID(pDLSID);
556            #endif
557        }
558    
559        void Resource::GenerateDLSID(dlsid_t* pDLSID) {
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 522  namespace DLS { Line 581  namespace DLS {
581          pDLSID->abData[5] = uuid.byte13;          pDLSID->abData[5] = uuid.byte13;
582          pDLSID->abData[6] = uuid.byte14;          pDLSID->abData[6] = uuid.byte14;
583          pDLSID->abData[7] = uuid.byte15;          pDLSID->abData[7] = uuid.byte15;
584  #else  #elif defined(HAVE_UUID_GENERATE)
585          uuid_t uuid;          uuid_t uuid;
586          uuid_generate(uuid);          uuid_generate(uuid);
587          pDLSID->ulData1 = uuid[0] | uuid[1] << 8 | uuid[2] << 16 | uuid[3] << 24;          pDLSID->ulData1 = uuid[0] | uuid[1] << 8 | uuid[2] << 16 | uuid[3] << 24;
588          pDLSID->usData2 = uuid[4] | uuid[5] << 8;          pDLSID->usData2 = uuid[4] | uuid[5] << 8;
589          pDLSID->usData3 = uuid[6] | uuid[7] << 8;          pDLSID->usData3 = uuid[6] | uuid[7] << 8;
590          memcpy(pDLSID->abData, &uuid[8], 8);          memcpy(pDLSID->abData, &uuid[8], 8);
591  #endif  #else
592    # error "Missing support for uuid generation"
593  #endif  #endif
594      }      }
595            
# Line 551  namespace DLS { Line 611  namespace DLS {
611          pParentList       = ParentList;          pParentList       = ParentList;
612          RIFF::Chunk* wsmp = ParentList->GetSubChunk(CHUNK_ID_WSMP);          RIFF::Chunk* wsmp = ParentList->GetSubChunk(CHUNK_ID_WSMP);
613          if (wsmp) {          if (wsmp) {
614                wsmp->SetPos(0);
615    
616              uiHeaderSize   = wsmp->ReadUint32();              uiHeaderSize   = wsmp->ReadUint32();
617              UnityNote      = wsmp->ReadUint16();              UnityNote      = wsmp->ReadUint16();
618              FineTune       = wsmp->ReadInt16();              FineTune       = wsmp->ReadInt16();
# Line 625  namespace DLS { Line 687  namespace DLS {
687          }          }
688      }      }
689    
690        /** @brief Remove all RIFF chunks associated with this Sampler object.
691         *
692         * At the moment Sampler::DeleteChunks() does nothing. It is
693         * recommended to call this method explicitly though from deriving classes's
694         * own overridden implementation of this method to avoid potential future
695         * compatiblity issues.
696         *
697         * See Storage::DeleteChunks() for details.
698         */
699        void Sampler::DeleteChunks() {
700        }
701    
702      /**      /**
703       * Adds a new sample loop with the provided loop definition.       * Adds a new sample loop with the provided loop definition.
704       *       *
# Line 711  namespace DLS { Line 785  namespace DLS {
785       * @param WavePoolOffset - offset of this sample data from wave pool       * @param WavePoolOffset - offset of this sample data from wave pool
786       *                         ('wvpl') list chunk       *                         ('wvpl') list chunk
787       */       */
788      Sample::Sample(File* pFile, RIFF::List* waveList, unsigned long WavePoolOffset) : Resource(pFile, waveList) {      Sample::Sample(File* pFile, RIFF::List* waveList, file_offset_t WavePoolOffset) : Resource(pFile, waveList) {
789          pWaveList = waveList;          pWaveList = waveList;
790          ulWavePoolOffset = WavePoolOffset - LIST_HEADER_SIZE;          ullWavePoolOffset = WavePoolOffset - LIST_HEADER_SIZE(waveList->GetFile()->GetFileOffsetSize());
791          pCkFormat = waveList->GetSubChunk(CHUNK_ID_FMT);          pCkFormat = waveList->GetSubChunk(CHUNK_ID_FMT);
792          pCkData   = waveList->GetSubChunk(CHUNK_ID_DATA);          pCkData   = waveList->GetSubChunk(CHUNK_ID_DATA);
793          if (pCkFormat) {          if (pCkFormat) {
794                pCkFormat->SetPos(0);
795    
796              // common fields              // common fields
797              FormatTag              = pCkFormat->ReadUint16();              FormatTag              = pCkFormat->ReadUint16();
798              Channels               = pCkFormat->ReadUint16();              Channels               = pCkFormat->ReadUint16();
# Line 747  namespace DLS { Line 823  namespace DLS {
823    
824      /** @brief Destructor.      /** @brief Destructor.
825       *       *
826       * Removes RIFF chunks associated with this Sample and frees all       * Frees all memory occupied by this sample.
      * memory occupied by this sample.  
827       */       */
828      Sample::~Sample() {      Sample::~Sample() {
829          RIFF::List* pParent = pWaveList->GetParent();          if (pCkData)
830          pParent->DeleteSubChunk(pWaveList);              pCkData->ReleaseChunkData();
831            if (pCkFormat)
832                pCkFormat->ReleaseChunkData();
833      }      }
834        
835        /** @brief Remove all RIFF chunks associated with this Sample object.
836         *
837         * See Storage::DeleteChunks() for details.
838         */
839        void Sample::DeleteChunks() {
840            // handle base class
841            Resource::DeleteChunks();
842    
843            // handle own RIFF chunks
844            if (pWaveList) {
845                RIFF::List* pParent = pWaveList->GetParent();
846                pParent->DeleteSubChunk(pWaveList);
847                pWaveList = NULL;
848            }
849        }
850    
851      /**      /**
852       * 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
853       * actual sample waveform data however) and assign it to this object.       * actual sample waveform data however) and assign it to this object.
# Line 793  namespace DLS { Line 886  namespace DLS {
886          Resize(orig->GetSize());          Resize(orig->GetSize());
887          char* buf = (char*) LoadSampleData();          char* buf = (char*) LoadSampleData();
888          Sample* pOrig = (Sample*) orig; //HACK: circumventing the constness here for now          Sample* pOrig = (Sample*) orig; //HACK: circumventing the constness here for now
889          const unsigned long restorePos = pOrig->pCkData->GetPos();          const file_offset_t restorePos = pOrig->pCkData->GetPos();
890          pOrig->SetPos(0);          pOrig->SetPos(0);
891          for (unsigned long todo = pOrig->GetSize(), i = 0; todo; ) {          for (file_offset_t todo = pOrig->GetSize(), i = 0; todo; ) {
892              const int iReadAtOnce = 64*1024;              const int iReadAtOnce = 64*1024;
893              unsigned long n = (iReadAtOnce < todo) ? iReadAtOnce : todo;              file_offset_t n = (iReadAtOnce < todo) ? iReadAtOnce : todo;
894              n = pOrig->Read(&buf[i], n);              n = pOrig->Read(&buf[i], n);
895              if (!n) break;              if (!n) break;
896              todo -= n;              todo -= n;
# Line 855  namespace DLS { Line 948  namespace DLS {
948       * @returns number of sample points or 0 if FormatTag != DLS_WAVE_FORMAT_PCM       * @returns number of sample points or 0 if FormatTag != DLS_WAVE_FORMAT_PCM
949       * @see FrameSize, FormatTag       * @see FrameSize, FormatTag
950       */       */
951      unsigned long Sample::GetSize() const {      file_offset_t Sample::GetSize() const {
952          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0;          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0;
953          return (pCkData) ? pCkData->GetSize() / FrameSize : 0;          return (pCkData) ? pCkData->GetSize() / FrameSize : 0;
954      }      }
# Line 882  namespace DLS { Line 975  namespace DLS {
975       * FormatTag must be DLS_WAVE_FORMAT_PCM. Trying to resize samples with       * FormatTag must be DLS_WAVE_FORMAT_PCM. Trying to resize samples with
976       * other formats will fail!       * other formats will fail!
977       *       *
978       * @param iNewSize - new sample wave data size in sample points (must be       * @param NewSize - new sample wave data size in sample points (must be
979       *                   greater than zero)       *                  greater than zero)
980       * @throws Excecption if FormatTag != DLS_WAVE_FORMAT_PCM       * @throws Exception if FormatTag != DLS_WAVE_FORMAT_PCM
981       * @throws Exception if \a iNewSize is less than 1       * @throws Exception if \a NewSize is less than 1 or unrealistic large
982       * @see File::Save(), FrameSize, FormatTag       * @see File::Save(), FrameSize, FormatTag
983       */       */
984      void Sample::Resize(int iNewSize) {      void Sample::Resize(file_offset_t NewSize) {
985          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");
986          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");
987          const int iSizeInBytes = iNewSize * FrameSize;          if ((NewSize >> 48) != 0)
988                throw Exception("Unrealistic high DLS sample size detected");
989            const file_offset_t sizeInBytes = NewSize * FrameSize;
990          pCkData = pWaveList->GetSubChunk(CHUNK_ID_DATA);          pCkData = pWaveList->GetSubChunk(CHUNK_ID_DATA);
991          if (pCkData) pCkData->Resize(iSizeInBytes);          if (pCkData) pCkData->Resize(sizeInBytes);
992          else pCkData = pWaveList->AddSubChunk(CHUNK_ID_DATA, iSizeInBytes);          else pCkData = pWaveList->AddSubChunk(CHUNK_ID_DATA, sizeInBytes);
993      }      }
994    
995      /**      /**
# Line 913  namespace DLS { Line 1008  namespace DLS {
1008       * @throws Exception if no data RIFF chunk was created for the sample yet       * @throws Exception if no data RIFF chunk was created for the sample yet
1009       * @see FrameSize, FormatTag       * @see FrameSize, FormatTag
1010       */       */
1011      unsigned long Sample::SetPos(unsigned long SampleCount, RIFF::stream_whence_t Whence) {      file_offset_t Sample::SetPos(file_offset_t SampleCount, RIFF::stream_whence_t Whence) {
1012          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format
1013          if (!pCkData) throw Exception("No data chunk created for sample yet, call Sample::Resize() to create one");          if (!pCkData) throw Exception("No data chunk created for sample yet, call Sample::Resize() to create one");
1014          unsigned long orderedBytes = SampleCount * FrameSize;          file_offset_t orderedBytes = SampleCount * FrameSize;
1015          unsigned long result = pCkData->SetPos(orderedBytes, Whence);          file_offset_t result = pCkData->SetPos(orderedBytes, Whence);
1016          return (result == orderedBytes) ? SampleCount          return (result == orderedBytes) ? SampleCount
1017                                          : result / FrameSize;                                          : result / FrameSize;
1018      }      }
# Line 931  namespace DLS { Line 1026  namespace DLS {
1026       * @param pBuffer      destination buffer       * @param pBuffer      destination buffer
1027       * @param SampleCount  number of sample points to read       * @param SampleCount  number of sample points to read
1028       */       */
1029      unsigned long Sample::Read(void* pBuffer, unsigned long SampleCount) {      file_offset_t Sample::Read(void* pBuffer, file_offset_t SampleCount) {
1030          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format
1031          return pCkData->Read(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction?          return pCkData->Read(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction?
1032      }      }
# Line 951  namespace DLS { Line 1046  namespace DLS {
1046       * @throws Exception if current sample size is too small       * @throws Exception if current sample size is too small
1047       * @see LoadSampleData()       * @see LoadSampleData()
1048       */       */
1049      unsigned long Sample::Write(void* pBuffer, unsigned long SampleCount) {      file_offset_t Sample::Write(void* pBuffer, file_offset_t SampleCount) {
1050          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0; // failed: wave data not PCM format
1051          if (GetSize() < SampleCount) throw Exception("Could not write sample data, current sample size to small");          if (GetSize() < SampleCount) throw Exception("Could not write sample data, current sample size to small");
1052          return pCkData->Write(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction?          return pCkData->Write(pBuffer, SampleCount, FrameSize); // FIXME: channel inversion due to endian correction?
# Line 994  namespace DLS { Line 1089  namespace DLS {
1089      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) {
1090          pCkRegion = rgnList;          pCkRegion = rgnList;
1091    
1092          // articulation informations          // articulation information
1093          RIFF::Chunk* rgnh = rgnList->GetSubChunk(CHUNK_ID_RGNH);          RIFF::Chunk* rgnh = rgnList->GetSubChunk(CHUNK_ID_RGNH);
1094          if (rgnh) {          if (rgnh) {
1095                rgnh->SetPos(0);
1096    
1097              rgnh->Read(&KeyRange, 2, 2);              rgnh->Read(&KeyRange, 2, 2);
1098              rgnh->Read(&VelocityRange, 2, 2);              rgnh->Read(&VelocityRange, 2, 2);
1099              FormatOptionFlags = rgnh->ReadUint16();              FormatOptionFlags = rgnh->ReadUint16();
# Line 1016  namespace DLS { Line 1113  namespace DLS {
1113          }          }
1114          SelfNonExclusive = FormatOptionFlags & F_RGN_OPTION_SELFNONEXCLUSIVE;          SelfNonExclusive = FormatOptionFlags & F_RGN_OPTION_SELFNONEXCLUSIVE;
1115    
1116          // sample informations          // sample information
1117          RIFF::Chunk* wlnk = rgnList->GetSubChunk(CHUNK_ID_WLNK);          RIFF::Chunk* wlnk = rgnList->GetSubChunk(CHUNK_ID_WLNK);
1118          if (wlnk) {          if (wlnk) {
1119                wlnk->SetPos(0);
1120    
1121              WaveLinkOptionFlags = wlnk->ReadUint16();              WaveLinkOptionFlags = wlnk->ReadUint16();
1122              PhaseGroup          = wlnk->ReadUint16();              PhaseGroup          = wlnk->ReadUint16();
1123              Channel             = wlnk->ReadUint32();              Channel             = wlnk->ReadUint32();
# Line 1037  namespace DLS { Line 1136  namespace DLS {
1136    
1137      /** @brief Destructor.      /** @brief Destructor.
1138       *       *
1139       * Removes RIFF chunks associated with this Region.       * Intended to free up all memory occupied by this Region object. ATM this
1140         * destructor implementation does nothing though.
1141       */       */
1142      Region::~Region() {      Region::~Region() {
1143          RIFF::List* pParent = pCkRegion->GetParent();      }
1144          pParent->DeleteSubChunk(pCkRegion);  
1145        /** @brief Remove all RIFF chunks associated with this Region object.
1146         *
1147         * See Storage::DeleteChunks() for details.
1148         */
1149        void Region::DeleteChunks() {
1150            // handle base classes
1151            Resource::DeleteChunks();
1152            Articulator::DeleteChunks();
1153            Sampler::DeleteChunks();
1154    
1155            // handle own RIFF chunks
1156            if (pCkRegion) {
1157                RIFF::List* pParent = pCkRegion->GetParent();
1158                pParent->DeleteSubChunk(pCkRegion);
1159                pCkRegion = NULL;
1160            }
1161      }      }
1162    
1163      Sample* Region::GetSample() {      Sample* Region::GetSample() {
1164          if (pSample) return pSample;          if (pSample) return pSample;
1165          File* file = (File*) GetParent()->GetParent();          File* file = (File*) GetParent()->GetParent();
1166          unsigned long soughtoffset = file->pWavePoolTable[WavePoolTableIndex];          uint64_t soughtoffset = file->pWavePoolTable[WavePoolTableIndex];
1167          Sample* sample = file->GetFirstSample();          Sample* sample = file->GetFirstSample();
1168          while (sample) {          while (sample) {
1169              if (sample->ulWavePoolOffset == soughtoffset) return (pSample = sample);              if (sample->ullWavePoolOffset == soughtoffset) return (pSample = sample);
1170              sample = file->GetNextSample();              sample = file->GetNextSample();
1171          }          }
1172          return NULL;          return NULL;
# Line 1223  namespace DLS { Line 1339  namespace DLS {
1339          midi_locale_t locale;          midi_locale_t locale;
1340          RIFF::Chunk* insh = pCkInstrument->GetSubChunk(CHUNK_ID_INSH);          RIFF::Chunk* insh = pCkInstrument->GetSubChunk(CHUNK_ID_INSH);
1341          if (insh) {          if (insh) {
1342                insh->SetPos(0);
1343    
1344              Regions = insh->ReadUint32();              Regions = insh->ReadUint32();
1345              insh->Read(&locale, 2, 4);              insh->Read(&locale, 2, 4);
1346          } else { // 'insh' chunk missing          } else { // 'insh' chunk missing
# Line 1258  namespace DLS { Line 1376  namespace DLS {
1376          RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN);          RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN);
1377          if (lrgn) {          if (lrgn) {
1378              uint32_t regionCkType = (lrgn->GetSubList(LIST_TYPE_RGN2)) ? LIST_TYPE_RGN2 : LIST_TYPE_RGN; // prefer regions level 2              uint32_t regionCkType = (lrgn->GetSubList(LIST_TYPE_RGN2)) ? LIST_TYPE_RGN2 : LIST_TYPE_RGN; // prefer regions level 2
1379              RIFF::List* rgn = lrgn->GetFirstSubList();              size_t i = 0;
1380              while (rgn) {              for (RIFF::List* rgn = lrgn->GetSubListAt(i); rgn;
1381                     rgn = lrgn->GetSubListAt(++i))
1382                {
1383                  if (rgn->GetListType() == regionCkType) {                  if (rgn->GetListType() == regionCkType) {
1384                      pRegions->push_back(new Region(this, rgn));                      pRegions->push_back(new Region(this, rgn));
1385                  }                  }
                 rgn = lrgn->GetNextSubList();  
1386              }              }
1387          }          }
1388      }      }
# Line 1275  namespace DLS { Line 1394  namespace DLS {
1394          RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);          RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);
1395          Region* pNewRegion = new Region(this, rgn);          Region* pNewRegion = new Region(this, rgn);
1396          pRegions->push_back(pNewRegion);          pRegions->push_back(pNewRegion);
1397          Regions = pRegions->size();          Regions = (uint32_t) pRegions->size();
1398          return pNewRegion;          return pNewRegion;
1399      }      }
1400    
# Line 1293  namespace DLS { Line 1412  namespace DLS {
1412          RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pRegion);          RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pRegion);
1413          if (iter == pRegions->end()) return;          if (iter == pRegions->end()) return;
1414          pRegions->erase(iter);          pRegions->erase(iter);
1415          Regions = pRegions->size();          Regions = (uint32_t) pRegions->size();
1416            pRegion->DeleteChunks();
1417          delete pRegion;          delete pRegion;
1418      }      }
1419    
# Line 1313  namespace DLS { Line 1433  namespace DLS {
1433          if (!insh) insh = pCkInstrument->AddSubChunk(CHUNK_ID_INSH, 12);          if (!insh) insh = pCkInstrument->AddSubChunk(CHUNK_ID_INSH, 12);
1434          uint8_t* pData = (uint8_t*) insh->LoadChunkData();          uint8_t* pData = (uint8_t*) insh->LoadChunkData();
1435          // update 'insh' chunk          // update 'insh' chunk
1436          Regions = (pRegions) ? pRegions->size() : 0;          Regions = (pRegions) ? uint32_t(pRegions->size()) : 0;
1437          midi_locale_t locale;          midi_locale_t locale;
1438          locale.instrument = MIDIProgram;          locale.instrument = MIDIProgram;
1439          locale.bank       = MIDI_BANK_ENCODE(MIDIBankCoarse, MIDIBankFine);          locale.bank       = MIDI_BANK_ENCODE(MIDIBankCoarse, MIDIBankFine);
# Line 1327  namespace DLS { Line 1447  namespace DLS {
1447          RegionList::iterator iter = pRegions->begin();          RegionList::iterator iter = pRegions->begin();
1448          RegionList::iterator end  = pRegions->end();          RegionList::iterator end  = pRegions->end();
1449          for (int i = 0; iter != end; ++iter, ++i) {          for (int i = 0; iter != end; ++iter, ++i) {
1450              // divide local progress into subprogress              if (pProgress) {
1451              progress_t subprogress;                  // divide local progress into subprogress
1452              __divide_progress(pProgress, &subprogress, pRegions->size(), i);                  progress_t subprogress;
1453              // do the actual work                  __divide_progress(pProgress, &subprogress, pRegions->size(), i);
1454              (*iter)->UpdateChunks(&subprogress);                  // do the actual work
1455                    (*iter)->UpdateChunks(&subprogress);
1456                } else
1457                    (*iter)->UpdateChunks(NULL);
1458          }          }
1459          __notify_progress(pProgress, 1.0); // notify done          if (pProgress)
1460                __notify_progress(pProgress, 1.0); // notify done
1461      }      }
1462    
1463      /** @brief Destructor.      /** @brief Destructor.
1464       *       *
1465       * Removes RIFF chunks associated with this Instrument and frees all       * Frees all memory occupied by this instrument.
      * memory occupied by this instrument.  
1466       */       */
1467      Instrument::~Instrument() {      Instrument::~Instrument() {
1468          if (pRegions) {          if (pRegions) {
# Line 1351  namespace DLS { Line 1474  namespace DLS {
1474              }              }
1475              delete pRegions;              delete pRegions;
1476          }          }
         // remove instrument's chunks  
         RIFF::List* pParent = pCkInstrument->GetParent();  
         pParent->DeleteSubChunk(pCkInstrument);  
1477      }      }
1478        
1479        /** @brief Remove all RIFF chunks associated with this Instrument object.
1480         *
1481         * See Storage::DeleteChunks() for details.
1482         */
1483        void Instrument::DeleteChunks() {
1484            // handle base classes
1485            Resource::DeleteChunks();
1486            Articulator::DeleteChunks();
1487    
1488            // handle RIFF chunks of members
1489            if (pRegions) {
1490                RegionList::iterator it  = pRegions->begin();
1491                RegionList::iterator end = pRegions->end();
1492                for (; it != end; ++it)
1493                    (*it)->DeleteChunks();
1494            }
1495    
1496            // handle own RIFF chunks
1497            if (pCkInstrument) {
1498                RIFF::List* pParent = pCkInstrument->GetParent();
1499                pParent->DeleteSubChunk(pCkInstrument);
1500                pCkInstrument = NULL;
1501            }
1502        }
1503    
1504      void Instrument::CopyAssignCore(const Instrument* orig) {      void Instrument::CopyAssignCore(const Instrument* orig) {
1505          // handle base classes          // handle base classes
1506          Resource::CopyAssign(orig);          Resource::CopyAssign(orig);
# Line 1405  namespace DLS { Line 1550  namespace DLS {
1550       */       */
1551      File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS)) {      File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS)) {
1552          pRIFF->SetByteOrder(RIFF::endian_little);          pRIFF->SetByteOrder(RIFF::endian_little);
1553            bOwningRiff = true;
1554          pVersion = new version_t;          pVersion = new version_t;
1555          pVersion->major   = 0;          pVersion->major   = 0;
1556          pVersion->minor   = 0;          pVersion->minor   = 0;
# Line 1435  namespace DLS { Line 1581  namespace DLS {
1581      File::File(RIFF::File* pRIFF) : Resource(NULL, pRIFF) {      File::File(RIFF::File* pRIFF) : Resource(NULL, pRIFF) {
1582          if (!pRIFF) throw DLS::Exception("NULL pointer reference to RIFF::File object.");          if (!pRIFF) throw DLS::Exception("NULL pointer reference to RIFF::File object.");
1583          this->pRIFF = pRIFF;          this->pRIFF = pRIFF;
1584            bOwningRiff = false;
1585          RIFF::Chunk* ckVersion = pRIFF->GetSubChunk(CHUNK_ID_VERS);          RIFF::Chunk* ckVersion = pRIFF->GetSubChunk(CHUNK_ID_VERS);
1586          if (ckVersion) {          if (ckVersion) {
1587                ckVersion->SetPos(0);
1588    
1589              pVersion = new version_t;              pVersion = new version_t;
1590              ckVersion->Read(pVersion, 4, 2);              ckVersion->Read(pVersion, 4, 2);
1591          }          }
# Line 1445  namespace DLS { Line 1593  namespace DLS {
1593    
1594          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);
1595          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.");
1596            colh->SetPos(0);
1597          Instruments = colh->ReadUint32();          Instruments = colh->ReadUint32();
1598    
1599          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);
# Line 1455  namespace DLS { Line 1604  namespace DLS {
1604              WavePoolHeaderSize = 8;              WavePoolHeaderSize = 8;
1605              b64BitWavePoolOffsets = false;              b64BitWavePoolOffsets = false;
1606          } else {          } else {
1607                ptbl->SetPos(0);
1608    
1609              WavePoolHeaderSize = ptbl->ReadUint32();              WavePoolHeaderSize = ptbl->ReadUint32();
1610              WavePoolCount  = ptbl->ReadUint32();              WavePoolCount  = ptbl->ReadUint32();
1611              pWavePoolTable = new uint32_t[WavePoolCount];              pWavePoolTable = new uint32_t[WavePoolCount];
# Line 1467  namespace DLS { Line 1618  namespace DLS {
1618                  for (int i = 0 ; i < WavePoolCount ; i++) {                  for (int i = 0 ; i < WavePoolCount ; i++) {
1619                      pWavePoolTableHi[i] = ptbl->ReadUint32();                      pWavePoolTableHi[i] = ptbl->ReadUint32();
1620                      pWavePoolTable[i] = ptbl->ReadUint32();                      pWavePoolTable[i] = ptbl->ReadUint32();
1621                      if (pWavePoolTable[i] & 0x80000000)                      //NOTE: disabled this 2GB check, not sure why this check was still left here (Christian, 2016-05-12)
1622                          throw DLS::Exception("Files larger than 2 GB not yet supported");                      //if (pWavePoolTable[i] & 0x80000000)
1623                        //    throw DLS::Exception("Files larger than 2 GB not yet supported");
1624                  }                  }
1625              } else { // conventional 32 bit offsets              } else { // conventional 32 bit offsets
1626                  ptbl->Read(pWavePoolTable, WavePoolCount, sizeof(uint32_t));                  ptbl->Read(pWavePoolTable, WavePoolCount, sizeof(uint32_t));
# Line 1506  namespace DLS { Line 1658  namespace DLS {
1658          if (pVersion) delete pVersion;          if (pVersion) delete pVersion;
1659          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++)
1660              delete *i;              delete *i;
1661            if (bOwningRiff)
1662                delete pRIFF;
1663      }      }
1664    
1665      Sample* File::GetFirstSample() {      Sample* File::GetFirstSample() {
# Line 1525  namespace DLS { Line 1679  namespace DLS {
1679          if (!pSamples) pSamples = new SampleList;          if (!pSamples) pSamples = new SampleList;
1680          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
1681          if (wvpl) {          if (wvpl) {
1682              unsigned long wvplFileOffset = wvpl->GetFilePos();              file_offset_t wvplFileOffset = wvpl->GetFilePos() -
1683              RIFF::List* wave = wvpl->GetFirstSubList();                                             wvpl->GetPos(); // should be zero, but just to be sure
1684              while (wave) {              size_t i = 0;
1685                for (RIFF::List* wave = wvpl->GetSubListAt(i); wave;
1686                     wave = wvpl->GetSubListAt(++i))
1687                {
1688                  if (wave->GetListType() == LIST_TYPE_WAVE) {                  if (wave->GetListType() == LIST_TYPE_WAVE) {
1689                      unsigned long waveFileOffset = wave->GetFilePos();                      file_offset_t waveFileOffset = wave->GetFilePos() -
1690                                                       wave->GetPos(); // should be zero, but just to be sure
1691                      pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));                      pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));
1692                  }                  }
                 wave = wvpl->GetNextSubList();  
1693              }              }
1694          }          }
1695          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)
1696              RIFF::List* dwpl = pRIFF->GetSubList(LIST_TYPE_DWPL);              RIFF::List* dwpl = pRIFF->GetSubList(LIST_TYPE_DWPL);
1697              if (dwpl) {              if (dwpl) {
1698                  unsigned long dwplFileOffset = dwpl->GetFilePos();                  file_offset_t dwplFileOffset = dwpl->GetFilePos() -
1699                  RIFF::List* wave = dwpl->GetFirstSubList();                                                 dwpl->GetPos(); // should be zero, but just to be sure
1700                  while (wave) {                  size_t i = 0;
1701                    for (RIFF::List* wave = dwpl->GetSubListAt(i); wave;
1702                         wave = dwpl->GetSubListAt(++i))
1703                    {
1704                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
1705                          unsigned long waveFileOffset = wave->GetFilePos();                          file_offset_t waveFileOffset = wave->GetFilePos() -
1706                                                           wave->GetPos(); // should be zero, but just to be sure
1707                          pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset));                          pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset));
1708                      }                      }
                     wave = dwpl->GetNextSubList();  
1709                  }                  }
1710              }              }
1711          }          }
# Line 1581  namespace DLS { Line 1741  namespace DLS {
1741          SampleList::iterator iter = find(pSamples->begin(), pSamples->end(), pSample);          SampleList::iterator iter = find(pSamples->begin(), pSamples->end(), pSample);
1742          if (iter == pSamples->end()) return;          if (iter == pSamples->end()) return;
1743          pSamples->erase(iter);          pSamples->erase(iter);
1744            pSample->DeleteChunks();
1745          delete pSample;          delete pSample;
1746      }      }
1747    
# Line 1601  namespace DLS { Line 1762  namespace DLS {
1762          if (!pInstruments) pInstruments = new InstrumentList;          if (!pInstruments) pInstruments = new InstrumentList;
1763          RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);          RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);
1764          if (lstInstruments) {          if (lstInstruments) {
1765              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();              size_t i = 0;
1766              while (lstInstr) {              for (RIFF::List* lstInstr = lstInstruments->GetSubListAt(i);
1767                     lstInstr; lstInstr = lstInstruments->GetSubListAt(++i))
1768                {
1769                  if (lstInstr->GetListType() == LIST_TYPE_INS) {                  if (lstInstr->GetListType() == LIST_TYPE_INS) {
1770                      pInstruments->push_back(new Instrument(this, lstInstr));                      pInstruments->push_back(new Instrument(this, lstInstr));
1771                  }                  }
                 lstInstr = lstInstruments->GetNextSubList();  
1772              }              }
1773          }          }
1774      }      }
# Line 1640  namespace DLS { Line 1802  namespace DLS {
1802          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), pInstrument);          InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), pInstrument);
1803          if (iter == pInstruments->end()) return;          if (iter == pInstruments->end()) return;
1804          pInstruments->erase(iter);          pInstruments->erase(iter);
1805            pInstrument->DeleteChunks();
1806          delete pInstrument;          delete pInstrument;
1807      }      }
1808    
1809      /**      /**
1810         * Returns the underlying RIFF::File used for persistency of this DLS::File
1811         * object.
1812         */
1813        RIFF::File* File::GetRiffFile() {
1814            return pRIFF;
1815        }
1816    
1817        /**
1818       * Returns extension file of given index. Extension files are used       * Returns extension file of given index. Extension files are used
1819       * 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
1820       * 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 1708  namespace DLS { Line 1879  namespace DLS {
1879          }          }
1880    
1881          // update 'colh' chunk          // update 'colh' chunk
1882          Instruments = (pInstruments) ? pInstruments->size() : 0;          Instruments = (pInstruments) ? uint32_t(pInstruments->size()) : 0;
1883          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);
1884          if (!colh)   colh = pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);          if (!colh)   colh = pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);
1885          uint8_t* pData = (uint8_t*) colh->LoadChunkData();          uint8_t* pData = (uint8_t*) colh->LoadChunkData();
# Line 1716  namespace DLS { Line 1887  namespace DLS {
1887    
1888          // update instrument's chunks          // update instrument's chunks
1889          if (pInstruments) {          if (pInstruments) {
1890              // divide local progress into subprogress              if (pProgress) {
1891              progress_t subprogress;                  // divide local progress into subprogress
1892              __divide_progress(pProgress, &subprogress, 20.f, 0.f); // arbitrarily subdivided into 5% of total progress                  progress_t subprogress;
1893                    __divide_progress(pProgress, &subprogress, 20.f, 0.f); // arbitrarily subdivided into 5% of total progress
1894    
             // 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);  
1895                  // do the actual work                  // do the actual work
1896                  (*iter)->UpdateChunks(&subsubprogress);                  InstrumentList::iterator iter = pInstruments->begin();
1897              }                  InstrumentList::iterator end  = pInstruments->end();
1898                    for (int i = 0; iter != end; ++iter, ++i) {
1899                        // divide subprogress into sub-subprogress
1900                        progress_t subsubprogress;
1901                        __divide_progress(&subprogress, &subsubprogress, pInstruments->size(), i);
1902                        // do the actual work
1903                        (*iter)->UpdateChunks(&subsubprogress);
1904                    }
1905    
1906              __notify_progress(&subprogress, 1.0); // notify subprogress done                  __notify_progress(&subprogress, 1.0); // notify subprogress done
1907                } else {
1908                    InstrumentList::iterator iter = pInstruments->begin();
1909                    InstrumentList::iterator end  = pInstruments->end();
1910                    for (int i = 0; iter != end; ++iter, ++i) {
1911                        (*iter)->UpdateChunks(NULL);
1912                    }
1913                }
1914          }          }
1915    
1916          // update 'ptbl' chunk          // update 'ptbl' chunk
1917          const int iSamples = (pSamples) ? pSamples->size() : 0;          const int iSamples = (pSamples) ? int(pSamples->size()) : 0;
1918          const int iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;          int iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;
1919          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);
1920          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*/);
1921          const int iPtblSize = WavePoolHeaderSize + iPtblOffsetSize * iSamples;          int iPtblSize = WavePoolHeaderSize + iPtblOffsetSize * iSamples;
1922          ptbl->Resize(iPtblSize);          ptbl->Resize(iPtblSize);
1923          pData = (uint8_t*) ptbl->LoadChunkData();          pData = (uint8_t*) ptbl->LoadChunkData();
1924          WavePoolCount = iSamples;          WavePoolCount = iSamples;
# Line 1749  namespace DLS { Line 1928  namespace DLS {
1928    
1929          // update sample's chunks          // update sample's chunks
1930          if (pSamples) {          if (pSamples) {
1931              // divide local progress into subprogress              if (pProgress) {
1932              progress_t subprogress;                  // divide local progress into subprogress
1933              __divide_progress(pProgress, &subprogress, 20.f, 1.f); // arbitrarily subdivided into 95% of total progress                  progress_t subprogress;
1934                    __divide_progress(pProgress, &subprogress, 20.f, 1.f); // arbitrarily subdivided into 95% of total progress
1935    
             // 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);  
1936                  // do the actual work                  // do the actual work
1937                  (*iter)->UpdateChunks(&subsubprogress);                  SampleList::iterator iter = pSamples->begin();
1938                    SampleList::iterator end  = pSamples->end();
1939                    for (int i = 0; iter != end; ++iter, ++i) {
1940                        // divide subprogress into sub-subprogress
1941                        progress_t subsubprogress;
1942                        __divide_progress(&subprogress, &subsubprogress, pSamples->size(), i);
1943                        // do the actual work
1944                        (*iter)->UpdateChunks(&subsubprogress);
1945                    }
1946    
1947                    __notify_progress(&subprogress, 1.0); // notify subprogress done
1948                } else {
1949                    SampleList::iterator iter = pSamples->begin();
1950                    SampleList::iterator end  = pSamples->end();
1951                    for (int i = 0; iter != end; ++iter, ++i) {
1952                        (*iter)->UpdateChunks(NULL);
1953                    }
1954              }              }
1955            }
1956    
1957              __notify_progress(&subprogress, 1.0); // notify subprogress done          // if there are any extension files, gather which ones are regular
1958            // extension files used as wave pool files (.gx00, .gx01, ... , .gx98)
1959            // and which one is probably a convolution (GigaPulse) file (always to
1960            // be saved as .gx99)
1961            std::list<RIFF::File*> poolFiles;  // < for (.gx00, .gx01, ... , .gx98) files
1962            RIFF::File* pGigaPulseFile = NULL; // < for .gx99 file
1963            if (!ExtensionFiles.empty()) {
1964                std::list<RIFF::File*>::iterator it = ExtensionFiles.begin();
1965                for (; it != ExtensionFiles.end(); ++it) {
1966                    //FIXME: the .gx99 file is always used by GSt for convolution
1967                    // data (GigaPulse); so we should better detect by subchunk
1968                    // whether the extension file is intended for convolution
1969                    // instead of checkking for a file name, because the latter does
1970                    // not work for saving new gigs created from scratch
1971                    const std::string oldName = (*it)->GetFileName();
1972                    const bool isGigaPulseFile = (extensionOfPath(oldName) == "gx99");
1973                    if (isGigaPulseFile)
1974                        pGigaPulseFile = *it;
1975                    else
1976                        poolFiles.push_back(*it);
1977                }
1978          }          }
1979    
1980          __notify_progress(pProgress, 1.0); // notify done          // update the 'xfil' chunk which describes all extension files (wave
1981            // pool files) except the .gx99 file
1982            if (!poolFiles.empty()) {
1983                const int n = poolFiles.size();
1984                const int iHeaderSize = 4;
1985                const int iEntrySize = 144;
1986    
1987                // make sure chunk exists, and with correct size
1988                RIFF::Chunk* ckXfil = pRIFF->GetSubChunk(CHUNK_ID_XFIL);
1989                if (ckXfil)
1990                    ckXfil->Resize(iHeaderSize + n * iEntrySize);
1991                else
1992                    ckXfil = pRIFF->AddSubChunk(CHUNK_ID_XFIL, iHeaderSize + n * iEntrySize);
1993    
1994                uint8_t* pData = (uint8_t*) ckXfil->LoadChunkData();
1995    
1996                // re-assemble the chunk's content
1997                store32(pData, n);
1998                std::list<RIFF::File*>::iterator itExtFile = poolFiles.begin();
1999                for (int i = 0, iOffset = 4; i < n;
2000                     ++itExtFile, ++i, iOffset += iEntrySize)
2001                {
2002                    // update the filename string and 5 byte extension of each extension file
2003                    std::string file = lastPathComponent(
2004                        (*itExtFile)->GetFileName()
2005                    );
2006                    if (file.length() + 6 > 128)
2007                        throw Exception("Fatal error, extension filename length exceeds 122 byte maximum");
2008                    uint8_t* pStrings = &pData[iOffset];
2009                    memset(pStrings, 0, 128);
2010                    memcpy(pStrings, file.c_str(), file.length());
2011                    pStrings += file.length() + 1;
2012                    std::string ext = file.substr(file.length()-5);
2013                    memcpy(pStrings, ext.c_str(), 5);
2014                    // update the dlsid of the extension file
2015                    uint8_t* pId = &pData[iOffset + 128];
2016                    dlsid_t id;
2017                    RIFF::Chunk* ckDLSID = (*itExtFile)->GetSubChunk(CHUNK_ID_DLID);
2018                    if (ckDLSID) {
2019                        ckDLSID->Read(&id.ulData1, 1, 4);
2020                        ckDLSID->Read(&id.usData2, 1, 2);
2021                        ckDLSID->Read(&id.usData3, 1, 2);
2022                        ckDLSID->Read(id.abData, 8, 1);
2023                    } else {
2024                        ckDLSID = (*itExtFile)->AddSubChunk(CHUNK_ID_DLID, 16);
2025                        Resource::GenerateDLSID(&id);
2026                        uint8_t* pData = (uint8_t*)ckDLSID->LoadChunkData();
2027                        store32(&pData[0], id.ulData1);
2028                        store16(&pData[4], id.usData2);
2029                        store16(&pData[6], id.usData3);
2030                        memcpy(&pData[8], id.abData, 8);
2031                    }
2032                    store32(&pId[0], id.ulData1);
2033                    store16(&pId[4], id.usData2);
2034                    store16(&pId[6], id.usData3);
2035                    memcpy(&pId[8], id.abData, 8);
2036                }
2037            } else {
2038                // in case there was a 'xfil' chunk, remove it
2039                RIFF::Chunk* ckXfil = pRIFF->GetSubChunk(CHUNK_ID_XFIL);
2040                if (ckXfil) pRIFF->DeleteSubChunk(ckXfil);
2041            }
2042    
2043            // update the 'doxf' chunk which describes a .gx99 extension file
2044            // which contains convolution data (GigaPulse)
2045            if (pGigaPulseFile) {
2046                RIFF::Chunk* ckDoxf = pRIFF->GetSubChunk(CHUNK_ID_DOXF);
2047                if (!ckDoxf) ckDoxf = pRIFF->AddSubChunk(CHUNK_ID_DOXF, 148);
2048    
2049                uint8_t* pData = (uint8_t*) ckDoxf->LoadChunkData();
2050    
2051                // update the dlsid from the extension file
2052                uint8_t* pId = &pData[132];
2053                RIFF::Chunk* ckDLSID = pGigaPulseFile->GetSubChunk(CHUNK_ID_DLID);
2054                if (!ckDLSID) { //TODO: auto generate DLS ID if missing
2055                    throw Exception("Fatal error, GigaPulse file does not contain a DLS ID chunk");
2056                } else {
2057                    dlsid_t id;
2058                    // read DLS ID from extension files's DLS ID chunk
2059                    uint8_t* pData = (uint8_t*) ckDLSID->LoadChunkData();
2060                    id.ulData1 = load32(&pData[0]);
2061                    id.usData2 = load16(&pData[4]);
2062                    id.usData3 = load16(&pData[6]);
2063                    memcpy(id.abData, &pData[8], 8);
2064                    // store DLS ID to 'doxf' chunk
2065                    store32(&pId[0], id.ulData1);
2066                    store16(&pId[4], id.usData2);
2067                    store16(&pId[6], id.usData3);
2068                    memcpy(&pId[8], id.abData, 8);
2069                }
2070            } else {
2071                // in case there was a 'doxf' chunk, remove it
2072                RIFF::Chunk* ckDoxf = pRIFF->GetSubChunk(CHUNK_ID_DOXF);
2073                if (ckDoxf) pRIFF->DeleteSubChunk(ckDoxf);
2074            }
2075    
2076            // the RIFF file to be written might now been grown >= 4GB or might
2077            // been shrunk < 4GB, so we might need to update the wave pool offset
2078            // size and thus accordingly we would need to resize the wave pool
2079            // chunk
2080            const file_offset_t finalFileSize = pRIFF->GetRequiredFileSize();
2081            const bool bRequires64Bit = (finalFileSize >> 32) != 0 || // < native 64 bit gig file
2082                                         poolFiles.size() > 0;        // < 32 bit gig file where the hi 32 bits are used as extension file nr
2083            if (b64BitWavePoolOffsets != bRequires64Bit) {
2084                b64BitWavePoolOffsets = bRequires64Bit;
2085                iPtblOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;
2086                iPtblSize = WavePoolHeaderSize + iPtblOffsetSize * iSamples;
2087                ptbl->Resize(iPtblSize);
2088            }
2089    
2090            if (pProgress)
2091                __notify_progress(pProgress, 1.0); // notify done
2092      }      }
2093    
2094      /** @brief Save changes to another file.      /** @brief Save changes to another file.
# Line 1785  namespace DLS { Line 2106  namespace DLS {
2106       * @param pProgress - optional: callback function for progress notification       * @param pProgress - optional: callback function for progress notification
2107       */       */
2108      void File::Save(const String& Path, progress_t* pProgress) {      void File::Save(const String& Path, progress_t* pProgress) {
2109          {          // calculate number of tasks to notify progress appropriately
2110            const size_t nExtFiles = ExtensionFiles.size();
2111            const float tasks = 2.f + nExtFiles;
2112    
2113            // save extension files (if required)
2114            if (!ExtensionFiles.empty()) {
2115                // for assembling path of extension files to be saved to
2116                const std::string baseName = pathWithoutExtension(Path);
2117                // save the individual extension files
2118                std::list<RIFF::File*>::iterator it = ExtensionFiles.begin();
2119                for (int i = 0; it != ExtensionFiles.end(); ++i, ++it) {
2120                    //FIXME: the .gx99 file is always used by GSt for convolution
2121                    // data (GigaPulse); so we should better detect by subchunk
2122                    // whether the extension file is intended for convolution
2123                    // instead of checkking for a file name, because the latter does
2124                    // not work for saving new gigs created from scratch
2125                    const std::string oldName = (*it)->GetFileName();
2126                    const bool isGigaPulseFile = (extensionOfPath(oldName) == "gx99");
2127                    std::string ext = (isGigaPulseFile) ? ".gx99" : strPrint(".gx%02d", i+1);
2128                    std::string newPath = baseName + ext;
2129                    // save extension file to its new location
2130                    if (pProgress) {
2131                         // divide local progress into subprogress
2132                        progress_t subprogress;
2133                        __divide_progress(pProgress, &subprogress, tasks, 0.f + i); // subdivided into amount of extension files
2134                        // do the actual work
2135                        (*it)->Save(newPath, &subprogress);
2136                    } else
2137                        (*it)->Save(newPath);
2138                }
2139            }
2140    
2141            if (pProgress) {
2142              // divide local progress into subprogress              // divide local progress into subprogress
2143              progress_t subprogress;              progress_t subprogress;
2144              __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)
2145              // do the actual work              // do the actual work
2146              UpdateChunks(&subprogress);              UpdateChunks(&subprogress);
2147                        } else
2148          }              UpdateChunks(NULL);
2149          {  
2150            if (pProgress) {
2151              // divide local progress into subprogress              // divide local progress into subprogress
2152              progress_t subprogress;              progress_t subprogress;
2153              __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)
2154              // do the actual work              // do the actual work
2155              pRIFF->Save(Path, &subprogress);              pRIFF->Save(Path, &subprogress);
2156          }          } else
2157                pRIFF->Save(Path);
2158    
2159          UpdateFileOffsets();          UpdateFileOffsets();
2160          __notify_progress(pProgress, 1.0); // notify done  
2161            if (pProgress)
2162                __notify_progress(pProgress, 1.0); // notify done
2163      }      }
2164    
2165      /** @brief Save changes to same file.      /** @brief Save changes to same file.
# Line 1811  namespace DLS { Line 2169  namespace DLS {
2169       * have at the end of the saving process.       * have at the end of the saving process.
2170       *       *
2171       * @param pProgress - optional: callback function for progress notification       * @param pProgress - optional: callback function for progress notification
2172       * @throws RIFF::Exception if any kind of IO error occured       * @throws RIFF::Exception if any kind of IO error occurred
2173       * @throws DLS::Exception  if any kind of DLS specific error occured       * @throws DLS::Exception  if any kind of DLS specific error occurred
2174       */       */
2175      void File::Save(progress_t* pProgress) {      void File::Save(progress_t* pProgress) {
2176          {          // calculate number of tasks to notify progress appropriately
2177            const size_t nExtFiles = ExtensionFiles.size();
2178            const float tasks = 2.f + nExtFiles;
2179    
2180            // save extension files (if required)
2181            if (!ExtensionFiles.empty()) {
2182                std::list<RIFF::File*>::iterator it = ExtensionFiles.begin();
2183                for (int i = 0; it != ExtensionFiles.end(); ++i, ++it) {
2184                    // save extension file
2185                    if (pProgress) {
2186                        // divide local progress into subprogress
2187                        progress_t subprogress;
2188                        __divide_progress(pProgress, &subprogress, tasks, 0.f + i); // subdivided into amount of extension files
2189                        // do the actual work
2190                        (*it)->Save(&subprogress);
2191                    } else
2192                        (*it)->Save();
2193                }
2194            }
2195    
2196            if (pProgress) {
2197              // divide local progress into subprogress              // divide local progress into subprogress
2198              progress_t subprogress;              progress_t subprogress;
2199              __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)
2200              // do the actual work              // do the actual work
2201              UpdateChunks(&subprogress);              UpdateChunks(&subprogress);
2202          }          } else
2203          {              UpdateChunks(NULL);
2204    
2205            if (pProgress) {
2206              // divide local progress into subprogress              // divide local progress into subprogress
2207              progress_t subprogress;              progress_t subprogress;
2208              __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)
2209              // do the actual work              // do the actual work
2210              pRIFF->Save(&subprogress);              pRIFF->Save(&subprogress);
2211          }          } else
2212                pRIFF->Save();
2213    
2214          UpdateFileOffsets();          UpdateFileOffsets();
2215          __notify_progress(pProgress, 1.0); // notify done  
2216            if (pProgress)
2217                __notify_progress(pProgress, 1.0); // notify done
2218      }      }
2219    
2220      /** @brief Updates all file offsets stored all over the file.      /** @brief Updates all file offsets stored all over the file.
# Line 1881  namespace DLS { Line 2265  namespace DLS {
2265          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);
2266          const int iOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;          const int iOffsetSize = (b64BitWavePoolOffsets) ? 8 : 4;
2267          // check if 'ptbl' chunk is large enough          // check if 'ptbl' chunk is large enough
2268          WavePoolCount = (pSamples) ? pSamples->size() : 0;          WavePoolCount = (pSamples) ? uint32_t(pSamples->size()) : 0;
2269          const unsigned long ulRequiredSize = WavePoolHeaderSize + iOffsetSize * WavePoolCount;          const file_offset_t ulRequiredSize = WavePoolHeaderSize + iOffsetSize * WavePoolCount;
2270          if (ptbl->GetSize() < ulRequiredSize) throw Exception("Fatal error, 'ptbl' chunk too small");          if (ptbl->GetSize() < ulRequiredSize) throw Exception("Fatal error, 'ptbl' chunk too small");
2271          // save the 'ptbl' chunk's current read/write position          // save the 'ptbl' chunk's current read/write position
2272          unsigned long ulOriginalPos = ptbl->GetPos();          file_offset_t ullOriginalPos = ptbl->GetPos();
2273          // update headers          // update headers
2274          ptbl->SetPos(0);          ptbl->SetPos(0);
2275          uint32_t tmp = WavePoolHeaderSize;          uint32_t tmp = WavePoolHeaderSize;
# Line 1908  namespace DLS { Line 2292  namespace DLS {
2292              }              }
2293          }          }
2294          // restore 'ptbl' chunk's original read/write position          // restore 'ptbl' chunk's original read/write position
2295          ptbl->SetPos(ulOriginalPos);          ptbl->SetPos(ullOriginalPos);
2296      }      }
2297    
2298      /**      /**
# Line 1917  namespace DLS { Line 2301  namespace DLS {
2301       * exists already.       * exists already.
2302       */       */
2303      void File::__UpdateWavePoolTable() {      void File::__UpdateWavePoolTable() {
2304          WavePoolCount = (pSamples) ? pSamples->size() : 0;          WavePoolCount = (pSamples) ? uint32_t(pSamples->size()) : 0;
2305          // resize wave pool table arrays          // resize wave pool table arrays
2306          if (pWavePoolTable)   delete[] pWavePoolTable;          if (pWavePoolTable)   delete[] pWavePoolTable;
2307          if (pWavePoolTableHi) delete[] pWavePoolTableHi;          if (pWavePoolTableHi) delete[] pWavePoolTableHi;
2308          pWavePoolTable   = new uint32_t[WavePoolCount];          pWavePoolTable   = new uint32_t[WavePoolCount];
2309          pWavePoolTableHi = new uint32_t[WavePoolCount];          pWavePoolTableHi = new uint32_t[WavePoolCount];
2310          if (!pSamples) return;          if (!pSamples) return;
2311          // update offsets int wave pool table          // update offsets in wave pool table
2312          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
2313          uint64_t wvplFileOffset = wvpl->GetFilePos();          uint64_t wvplFileOffset = wvpl->GetFilePos() -
2314          if (b64BitWavePoolOffsets) {                                    wvpl->GetPos(); // mandatory, since position might have changed
2315              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;  
                 (*iter)->ulWavePoolOffset = _64BitOffset;  
                 pWavePoolTableHi[i] = (uint32_t) (_64BitOffset >> 32);  
                 pWavePoolTable[i]   = (uint32_t) _64BitOffset;  
             }  
         } else { // conventional 32 bit offsets  
2316              SampleList::iterator iter = pSamples->begin();              SampleList::iterator iter = pSamples->begin();
2317              SampleList::iterator end  = pSamples->end();              SampleList::iterator end  = pSamples->end();
2318              for (int i = 0 ; iter != end ; ++iter, i++) {              for (int i = 0 ; iter != end ; ++iter, i++) {
2319                  uint64_t _64BitOffset = (*iter)->pWaveList->GetFilePos() - wvplFileOffset - LIST_HEADER_SIZE;                  uint64_t _64BitOffset =
2320                  (*iter)->ulWavePoolOffset = _64BitOffset;                      (*iter)->pWaveList->GetFilePos() -
2321                        (*iter)->pWaveList->GetPos() - // should be zero, but just to be sure
2322                        wvplFileOffset -
2323                        LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());
2324                    (*iter)->ullWavePoolOffset = _64BitOffset;
2325                  pWavePoolTable[i] = (uint32_t) _64BitOffset;                  pWavePoolTable[i] = (uint32_t) _64BitOffset;
2326              }              }
2327            } else { // a) native 64 bit offsets without extension files or b) 32 bit offsets with extension files ...
2328                if (ExtensionFiles.empty()) { // native 64 bit offsets (and no extension files) [not compatible with GigaStudio] ...
2329                    SampleList::iterator iter = pSamples->begin();
2330                    SampleList::iterator end  = pSamples->end();
2331                    for (int i = 0 ; iter != end ; ++iter, i++) {
2332                        uint64_t _64BitOffset =
2333                            (*iter)->pWaveList->GetFilePos() -
2334                            (*iter)->pWaveList->GetPos() - // should be zero, but just to be sure
2335                            wvplFileOffset -
2336                            LIST_HEADER_SIZE(pRIFF->GetFileOffsetSize());
2337                        (*iter)->ullWavePoolOffset = _64BitOffset;
2338                        pWavePoolTableHi[i] = (uint32_t) (_64BitOffset >> 32);
2339                        pWavePoolTable[i]   = (uint32_t) _64BitOffset;
2340                    }
2341                } else { // 32 bit offsets with extension files (GigaStudio legacy support) ...
2342                    // the main gig and the extension files may contain wave data
2343                    std::vector<RIFF::File*> poolFiles;
2344                    poolFiles.push_back(pRIFF);
2345                    poolFiles.insert(poolFiles.end(), ExtensionFiles.begin(), ExtensionFiles.end());
2346    
2347                    RIFF::File* pCurPoolFile = NULL;
2348                    int fileNo = 0;
2349                    int waveOffset = 0;
2350                    SampleList::iterator iter = pSamples->begin();
2351                    SampleList::iterator end  = pSamples->end();
2352                    for (int i = 0 ; iter != end ; ++iter, i++) {
2353                        RIFF::File* pPoolFile = (*iter)->pWaveList->GetFile();
2354                        // if this sample is located in the same pool file as the
2355                        // last we reuse the previously computed fileNo and waveOffset
2356                        if (pPoolFile != pCurPoolFile) { // it is a different pool file than the last sample ...
2357                            pCurPoolFile = pPoolFile;
2358    
2359                            std::vector<RIFF::File*>::iterator sIter;
2360                            sIter = std::find(poolFiles.begin(), poolFiles.end(), pPoolFile);
2361                            if (sIter != poolFiles.end())
2362                                fileNo = std::distance(poolFiles.begin(), sIter);
2363                            else
2364                                throw DLS::Exception("Fatal error, unknown pool file");
2365    
2366                            RIFF::List* extWvpl = pCurPoolFile->GetSubList(LIST_TYPE_WVPL);
2367                            if (!extWvpl)
2368                                throw DLS::Exception("Fatal error, pool file has no 'wvpl' list chunk");
2369                            waveOffset =
2370                                extWvpl->GetFilePos() -
2371                                extWvpl->GetPos() + // mandatory, since position might have changed
2372                                LIST_HEADER_SIZE(pCurPoolFile->GetFileOffsetSize());
2373                        }
2374                        uint64_t _64BitOffset =
2375                            (*iter)->pWaveList->GetFilePos() -
2376                            (*iter)->pWaveList->GetPos() - // should be zero, but just to be sure
2377                            waveOffset;
2378                        // pWavePoolTableHi stores file number when extension files are in use
2379                        pWavePoolTableHi[i] = (uint32_t) fileNo;
2380                        pWavePoolTable[i]   = (uint32_t) _64BitOffset;
2381                        (*iter)->ullWavePoolOffset = _64BitOffset;
2382                    }
2383                }
2384          }          }
2385      }      }
2386    
2387    
   
2388  // *************** Exception ***************  // *************** Exception ***************
2389  // *  // *
2390    
2391      Exception::Exception(String Message) : RIFF::Exception(Message) {      Exception::Exception() : RIFF::Exception() {
2392        }
2393    
2394        Exception::Exception(String format, ...) : RIFF::Exception() {
2395            va_list arg;
2396            va_start(arg, format);
2397            Message = assemble(format, arg);
2398            va_end(arg);
2399        }
2400    
2401        Exception::Exception(String format, va_list arg) : RIFF::Exception() {
2402            Message = assemble(format, arg);
2403      }      }
2404    
2405      void Exception::PrintMessage() {      void Exception::PrintMessage() {
Legend:
Removed from v.2698  
changed lines
  Added in v.3922
  ViewVC Help
Powered by ViewVC