/[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 804 by schoenebeck, Sat Nov 12 19:16:01 2005 UTC revision 1183 by persson, Sun May 13 10:34:29 2007 UTC
# Line 1  Line 1 
1  /***************************************************************************  /***************************************************************************
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file loader library    *   *   libgig - C++ cross-platform Gigasampler format file access library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003-2005 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2007 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 45  Line 45 
45  #define CONN_TRANSFORM_INVERT_SRC_ENCODE(x)             ((x) ? 0x8000 : 0)  #define CONN_TRANSFORM_INVERT_SRC_ENCODE(x)             ((x) ? 0x8000 : 0)
46  #define CONN_TRANSFORM_INVERT_CTL_ENCODE(x)             ((x) ? 0x0200 : 0)  #define CONN_TRANSFORM_INVERT_CTL_ENCODE(x)             ((x) ? 0x0200 : 0)
47    
48  #define DRUM_TYPE_MASK                  0x00000001  #define DRUM_TYPE_MASK                  0x80000000
49    
50  #define F_RGN_OPTION_SELFNONEXCLUSIVE   0x0001  #define F_RGN_OPTION_SELFNONEXCLUSIVE   0x0001
51    
# Line 142  namespace DLS { Line 142  namespace DLS {
142          const int iEntrySize = 12; // 12 bytes per connection block          const int iEntrySize = 12; // 12 bytes per connection block
143          pArticulationCk->Resize(HeaderSize + Connections * iEntrySize);          pArticulationCk->Resize(HeaderSize + Connections * iEntrySize);
144          uint8_t* pData = (uint8_t*) pArticulationCk->LoadChunkData();          uint8_t* pData = (uint8_t*) pArticulationCk->LoadChunkData();
145          memccpy(&pData[0], &HeaderSize, 1, 2);          store16(&pData[0], HeaderSize);
146          memccpy(&pData[2], &Connections, 1, 2);          store16(&pData[2], Connections);
147          for (uint32_t i = 0; i < Connections; i++) {          for (uint32_t i = 0; i < Connections; i++) {
148              Connection::conn_block_t c = pConnections[i].ToConnBlock();              Connection::conn_block_t c = pConnections[i].ToConnBlock();
149              memccpy(&pData[HeaderSize + i * iEntrySize],     &c.source, 1, 2);              store16(&pData[HeaderSize + i * iEntrySize],     c.source);
150              memccpy(&pData[HeaderSize + i * iEntrySize + 2], &c.control, 1, 2);              store16(&pData[HeaderSize + i * iEntrySize + 2], c.control);
151              memccpy(&pData[HeaderSize + i * iEntrySize + 4], &c.destination, 1, 2);              store16(&pData[HeaderSize + i * iEntrySize + 4], c.destination);
152              memccpy(&pData[HeaderSize + i * iEntrySize + 6], &c.transform, 1, 2);              store16(&pData[HeaderSize + i * iEntrySize + 6], c.transform);
153              memccpy(&pData[HeaderSize + i * iEntrySize + 8], &c.scale, 1, 4);              store32(&pData[HeaderSize + i * iEntrySize + 8], c.scale);
154          }          }
155      }      }
156    
# Line 228  namespace DLS { Line 228  namespace DLS {
228    
229      /** @brief Constructor.      /** @brief Constructor.
230       *       *
231       * Initializes the info strings with values provided by a INFO list chunk.       * Initializes the info strings with values provided by an INFO list chunk.
232       *       *
233       * @param list - pointer to a list chunk which contains a INFO list chunk       * @param list - pointer to a list chunk which contains an INFO list chunk
234       */       */
235      Info::Info(RIFF::List* list) {      Info::Info(RIFF::List* list) {
236            FixedStringLengths = NULL;
237          pResourceListChunk = list;          pResourceListChunk = list;
238          if (list) {          if (list) {
239              RIFF::List* lstINFO = list->GetSubList(LIST_TYPE_INFO);              RIFF::List* lstINFO = list->GetSubList(LIST_TYPE_INFO);
# Line 253  namespace DLS { Line 254  namespace DLS {
254                  LoadString(CHUNK_ID_ISRC, lstINFO, Source);                  LoadString(CHUNK_ID_ISRC, lstINFO, Source);
255                  LoadString(CHUNK_ID_ISRF, lstINFO, SourceForm);                  LoadString(CHUNK_ID_ISRF, lstINFO, SourceForm);
256                  LoadString(CHUNK_ID_ICMS, lstINFO, Commissioned);                  LoadString(CHUNK_ID_ICMS, lstINFO, Commissioned);
257                    LoadString(CHUNK_ID_ISBJ, lstINFO, Subject);
258              }              }
259          }          }
260      }      }
261    
262        Info::~Info() {
263        }
264    
265      /** @brief Load given INFO field.      /** @brief Load given INFO field.
266       *       *
267       * Load INFO field from INFO chunk with chunk ID \a ChunkID from INFO       * Load INFO field from INFO chunk with chunk ID \a ChunkID from INFO
# Line 264  namespace DLS { Line 269  namespace DLS {
269       */       */
270      void Info::LoadString(uint32_t ChunkID, RIFF::List* lstINFO, String& s) {      void Info::LoadString(uint32_t ChunkID, RIFF::List* lstINFO, String& s) {
271          RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID);          RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID);
272          if (ck) {          ::LoadString(ck, s); // function from helper.h
             // TODO: no check for ZSTR terminated strings yet  
             s = (char*) ck->LoadChunkData();  
             ck->ReleaseChunkData();  
         }  
273      }      }
274    
275      /** @brief Apply given INFO field to the respective chunk.      /** @brief Apply given INFO field to the respective chunk.
# Line 287  namespace DLS { Line 288  namespace DLS {
288       * @param sDefault - default value       * @param sDefault - default value
289       */       */
290      void Info::SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault) {      void Info::SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault) {
291          RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID);          int size = 0;
292          if (ck) { // if chunk exists already, use 's' as value          if (FixedStringLengths) {
293              ck->Resize(s.size() + 1);              for (int i = 0 ; FixedStringLengths[i].length ; i++) {
294              char* pData = (char*) ck->LoadChunkData();                  if (FixedStringLengths[i].chunkId == ChunkID) {
295              memcpy(pData, s.c_str(), s.size() + 1);                      size = FixedStringLengths[i].length;
296          } else if (s != "" || sDefault != "") { // create chunk                  }
297              const String& sToSave = (s != "") ? s : sDefault;              }
             ck = lstINFO->AddSubChunk(ChunkID, sToSave.size() + 1);  
             char* pData = (char*) ck->LoadChunkData();  
             memcpy(pData, sToSave.c_str(), sToSave.size() + 1);  
298          }          }
299            RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID);
300            ::SaveString(ChunkID, ck, lstINFO, s, sDefault, size != 0, size); // function from helper.h
301      }      }
302    
303      /** @brief Update chunks with current info values.      /** @brief Update chunks with current info values.
# Line 310  namespace DLS { Line 310  namespace DLS {
310    
311          // make sure INFO list chunk exists          // make sure INFO list chunk exists
312          RIFF::List* lstINFO   = pResourceListChunk->GetSubList(LIST_TYPE_INFO);          RIFF::List* lstINFO   = pResourceListChunk->GetSubList(LIST_TYPE_INFO);
         if (!lstINFO) lstINFO = pResourceListChunk->AddSubList(LIST_TYPE_INFO);  
313    
314          // assemble default values in case the respective chunk is missing yet          String defaultName = "";
315          String defaultName = "NONAME";          String defaultCreationDate = "";
316          // get current date          String defaultSoftware = "";
317          time_t now = time(NULL);          String defaultComments = "";
318          tm* pNowBroken = localtime(&now);  
319          String defaultCreationDate = ToString(1900 + pNowBroken->tm_year) + "-" +          uint32_t resourceType = pResourceListChunk->GetListType();
320                                       ToString(pNowBroken->tm_mon + 1)  + "-" +  
321                                       ToString(pNowBroken->tm_mday);          if (!lstINFO) {
322          String defaultSoftware = libraryName() + " " + libraryVersion();              lstINFO = pResourceListChunk->AddSubList(LIST_TYPE_INFO);
323          String defaultComments = "Created with " + libraryName() + " " + libraryVersion();  
324                // assemble default values
325                defaultName = "NONAME";
326    
327                if (resourceType == RIFF_TYPE_DLS) {
328                    // get current date
329                    time_t now = time(NULL);
330                    tm* pNowBroken = localtime(&now);
331                    char buf[11];
332                    strftime(buf, 11, "%F", pNowBroken);
333                    defaultCreationDate = buf;
334    
335                    defaultComments = "Created with " + libraryName() + " " + libraryVersion();
336                }
337                if (resourceType == RIFF_TYPE_DLS || resourceType == LIST_TYPE_INS)
338                {
339                    defaultSoftware = libraryName() + " " + libraryVersion();
340                }
341            }
342    
343          // save values          // save values
344          SaveString(CHUNK_ID_INAM, lstINFO, Name, defaultName);  
345          SaveString(CHUNK_ID_IARL, lstINFO, ArchivalLocation, String(""));          SaveString(CHUNK_ID_IARL, lstINFO, ArchivalLocation, String(""));
346          SaveString(CHUNK_ID_ICRD, lstINFO, CreationDate, defaultCreationDate);          SaveString(CHUNK_ID_IART, lstINFO, Artists, String(""));
347            SaveString(CHUNK_ID_ICMS, lstINFO, Commissioned, String(""));
348          SaveString(CHUNK_ID_ICMT, lstINFO, Comments, defaultComments);          SaveString(CHUNK_ID_ICMT, lstINFO, Comments, defaultComments);
         SaveString(CHUNK_ID_IPRD, lstINFO, Product, String(""));  
349          SaveString(CHUNK_ID_ICOP, lstINFO, Copyright, String(""));          SaveString(CHUNK_ID_ICOP, lstINFO, Copyright, String(""));
350          SaveString(CHUNK_ID_IART, lstINFO, Artists, String(""));          SaveString(CHUNK_ID_ICRD, lstINFO, CreationDate, defaultCreationDate);
351            SaveString(CHUNK_ID_IENG, lstINFO, Engineer, String(""));
352          SaveString(CHUNK_ID_IGNR, lstINFO, Genre, String(""));          SaveString(CHUNK_ID_IGNR, lstINFO, Genre, String(""));
353          SaveString(CHUNK_ID_IKEY, lstINFO, Keywords, String(""));          SaveString(CHUNK_ID_IKEY, lstINFO, Keywords, String(""));
         SaveString(CHUNK_ID_IENG, lstINFO, Engineer, String(""));  
         SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String(""));  
         SaveString(CHUNK_ID_ISFT, lstINFO, Software, defaultSoftware);  
354          SaveString(CHUNK_ID_IMED, lstINFO, Medium, String(""));          SaveString(CHUNK_ID_IMED, lstINFO, Medium, String(""));
355            SaveString(CHUNK_ID_INAM, lstINFO, Name, defaultName);
356            SaveString(CHUNK_ID_IPRD, lstINFO, Product, String(""));
357            SaveString(CHUNK_ID_ISBJ, lstINFO, Subject, String(""));
358            SaveString(CHUNK_ID_ISFT, lstINFO, Software, defaultSoftware);
359          SaveString(CHUNK_ID_ISRC, lstINFO, Source, String(""));          SaveString(CHUNK_ID_ISRC, lstINFO, Source, String(""));
360          SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String(""));          SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String(""));
361          SaveString(CHUNK_ID_ICMS, lstINFO, Commissioned, String(""));          SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String(""));
362      }      }
363    
364    
# Line 445  namespace DLS { Line 464  namespace DLS {
464          }          }
465          uint8_t* pData = (uint8_t*) wsmp->LoadChunkData();          uint8_t* pData = (uint8_t*) wsmp->LoadChunkData();
466          // update headers size          // update headers size
467          memccpy(&pData[0], &uiHeaderSize, 1, 4);          store32(&pData[0], uiHeaderSize);
468          // update respective sampler options bits          // update respective sampler options bits
469          SamplerOptions = (NoSampleDepthTruncation) ? SamplerOptions | F_WSMP_NO_TRUNCATION          SamplerOptions = (NoSampleDepthTruncation) ? SamplerOptions | F_WSMP_NO_TRUNCATION
470                                                     : SamplerOptions & (~F_WSMP_NO_TRUNCATION);                                                     : SamplerOptions & (~F_WSMP_NO_TRUNCATION);
471          SamplerOptions = (NoSampleCompression) ? SamplerOptions | F_WSMP_NO_COMPRESSION          SamplerOptions = (NoSampleCompression) ? SamplerOptions | F_WSMP_NO_COMPRESSION
472                                                 : SamplerOptions & (~F_WSMP_NO_COMPRESSION);                                                 : SamplerOptions & (~F_WSMP_NO_COMPRESSION);
473            store16(&pData[4], UnityNote);
474            store16(&pData[6], FineTune);
475            store32(&pData[8], Gain);
476            store32(&pData[12], SamplerOptions);
477            store32(&pData[16], SampleLoops);
478          // update loop definitions          // update loop definitions
479          for (uint32_t i = 0; i < SampleLoops; i++) {          for (uint32_t i = 0; i < SampleLoops; i++) {
480              //FIXME: this does not handle extended loop structs correctly              //FIXME: this does not handle extended loop structs correctly
481              memccpy(&pData[uiHeaderSize + i * 16], pSampleLoops + i, 4, 4);              store32(&pData[uiHeaderSize + i * 16], pSampleLoops[i].Size);
482                store32(&pData[uiHeaderSize + i * 16 + 4], pSampleLoops[i].LoopType);
483                store32(&pData[uiHeaderSize + i * 16 + 8], pSampleLoops[i].LoopStart);
484                store32(&pData[uiHeaderSize + i * 16 + 12], pSampleLoops[i].LoopLength);
485          }          }
486      }      }
487    
488        /**
489         * Adds a new sample loop with the provided loop definition.
490         *
491         * @param - points to a loop definition that is to be copied
492         */
493        void Sampler::AddSampleLoop(sample_loop_t* pLoopDef) {
494            sample_loop_t* pNewLoops = new sample_loop_t[SampleLoops + 1];
495            // copy old loops array
496            for (int i = 0; i < SampleLoops; i++) {
497                pNewLoops[i] = pSampleLoops[i];
498            }
499            // add the new loop
500            pNewLoops[SampleLoops] = *pLoopDef;
501            // auto correct size field
502            pNewLoops[SampleLoops].Size = sizeof(DLS::sample_loop_t);
503            // free the old array and update the member variables
504            if (SampleLoops) delete[] pSampleLoops;
505            pSampleLoops = pNewLoops;
506            SampleLoops++;
507        }
508    
509        /**
510         * Deletes an existing sample loop.
511         *
512         * @param pLoopDef - pointer to existing loop definition
513         * @throws Exception - if given loop definition does not exist
514         */
515        void Sampler::DeleteSampleLoop(sample_loop_t* pLoopDef) {
516            sample_loop_t* pNewLoops = new sample_loop_t[SampleLoops - 1];
517            // copy old loops array (skipping given loop)
518            for (int i = 0, o = 0; i < SampleLoops; i++) {
519                if (&pSampleLoops[i] == pLoopDef) continue;
520                if (o == SampleLoops - 1)
521                    throw Exception("Could not delete Sample Loop, because it does not exist");
522                pNewLoops[o] = pSampleLoops[i];
523                o++;
524            }
525            // free the old array and update the member variables
526            if (SampleLoops) delete[] pSampleLoops;
527            pSampleLoops = pNewLoops;
528            SampleLoops--;
529        }
530    
531    
532    
533  // *************** Sample ***************  // *************** Sample ***************
# Line 491  namespace DLS { Line 561  namespace DLS {
561              AverageBytesPerSecond  = pCkFormat->ReadUint32();              AverageBytesPerSecond  = pCkFormat->ReadUint32();
562              BlockAlign             = pCkFormat->ReadUint16();              BlockAlign             = pCkFormat->ReadUint16();
563              // PCM format specific              // PCM format specific
564              if (FormatTag == WAVE_FORMAT_PCM) {              if (FormatTag == DLS_WAVE_FORMAT_PCM) {
565                  BitDepth     = pCkFormat->ReadUint16();                  BitDepth     = pCkFormat->ReadUint16();
566                  FrameSize    = (FormatTag == WAVE_FORMAT_PCM) ? (BitDepth / 8) * Channels                  FrameSize    = (BitDepth / 8) * Channels;
                                                             : 0;  
567              } else { // unsupported sample data format              } else { // unsupported sample data format
568                  BitDepth     = 0;                  BitDepth     = 0;
569                  FrameSize    = 0;                  FrameSize    = 0;
570              }              }
571          } else { // 'fmt' chunk missing          } else { // 'fmt' chunk missing
572              FormatTag              = WAVE_FORMAT_PCM;              FormatTag              = DLS_WAVE_FORMAT_PCM;
573              BitDepth               = 16;              BitDepth               = 16;
574              Channels               = 1;              Channels               = 1;
575              SamplesPerSecond       = 44100;              SamplesPerSecond       = 44100;
# Line 508  namespace DLS { Line 577  namespace DLS {
577              FrameSize              = (BitDepth / 8) * Channels;              FrameSize              = (BitDepth / 8) * Channels;
578              BlockAlign             = FrameSize;              BlockAlign             = FrameSize;
579          }          }
580          SamplesTotal = (pCkData) ? (FormatTag == WAVE_FORMAT_PCM) ? pCkData->GetSize() / FrameSize          SamplesTotal = (pCkData) ? (FormatTag == DLS_WAVE_FORMAT_PCM) ? pCkData->GetSize() / FrameSize
581                                                                    : 0                                                                        : 0
582                                   : 0;                                   : 0;
583      }      }
584    
# Line 569  namespace DLS { Line 638  namespace DLS {
638       * the RIFF chunk which encapsulates the sample's wave data. The       * the RIFF chunk which encapsulates the sample's wave data. The
639       * returned value is dependant to the current FrameSize value.       * returned value is dependant to the current FrameSize value.
640       *       *
641       * @returns number of sample points or 0 if FormatTag != WAVE_FORMAT_PCM       * @returns number of sample points or 0 if FormatTag != DLS_WAVE_FORMAT_PCM
642       * @see FrameSize, FormatTag       * @see FrameSize, FormatTag
643       */       */
644      unsigned long Sample::GetSize() {      unsigned long Sample::GetSize() {
645          if (FormatTag != WAVE_FORMAT_PCM) return 0;          if (FormatTag != DLS_WAVE_FORMAT_PCM) return 0;
646          return (pCkData) ? pCkData->GetSize() / FrameSize : 0;          return (pCkData) ? pCkData->GetSize() / FrameSize : 0;
647      }      }
648    
# Line 595  namespace DLS { Line 664  namespace DLS {
664       * calling File::Save() as this might exceed the current sample's       * calling File::Save() as this might exceed the current sample's
665       * boundary!       * boundary!
666       *       *
667       * Also note: only WAVE_FORMAT_PCM is currently supported, that is       * Also note: only DLS_WAVE_FORMAT_PCM is currently supported, that is
668       * FormatTag must be WAVE_FORMAT_PCM. Trying to resize samples with       * FormatTag must be DLS_WAVE_FORMAT_PCM. Trying to resize samples with
669       * other formats will fail!       * other formats will fail!
670       *       *
671       * @param iNewSize - new sample wave data size in sample points (must be       * @param iNewSize - new sample wave data size in sample points (must be
672       *                   greater than zero)       *                   greater than zero)
673       * @throws Excecption if FormatTag != WAVE_FORMAT_PCM       * @throws Excecption if FormatTag != DLS_WAVE_FORMAT_PCM
674       * @throws Exception if \a iNewSize is less than 1       * @throws Exception if \a iNewSize is less than 1
675       * @see File::Save(), FrameSize, FormatTag       * @see File::Save(), FrameSize, FormatTag
676       */       */
677      void Sample::Resize(int iNewSize) {      void Sample::Resize(int iNewSize) {
678          if (FormatTag != WAVE_FORMAT_PCM) throw Exception("Sample's format is not WAVE_FORMAT_PCM");          if (FormatTag != DLS_WAVE_FORMAT_PCM) throw Exception("Sample's format is not DLS_WAVE_FORMAT_PCM");
679          if (iNewSize < 1) throw Exception("Sample size must be at least one sample point");          if (iNewSize < 1) throw Exception("Sample size must be at least one sample point");
680          const int iSizeInBytes = iNewSize * FrameSize;          const int iSizeInBytes = iNewSize * FrameSize;
681          pCkData = pWaveList->GetSubChunk(CHUNK_ID_DATA);          pCkData = pWaveList->GetSubChunk(CHUNK_ID_DATA);
# Line 619  namespace DLS { Line 688  namespace DLS {
688       * bytes). Use this method and <i>Read()</i> if you don't want to load       * bytes). Use this method and <i>Read()</i> if you don't want to load
689       * the sample into RAM, thus for disk streaming.       * the sample into RAM, thus for disk streaming.
690       *       *
691       * Also note: only WAVE_FORMAT_PCM is currently supported, that is       * Also note: only DLS_WAVE_FORMAT_PCM is currently supported, that is
692       * FormatTag must be WAVE_FORMAT_PCM. Trying to reposition the sample       * FormatTag must be DLS_WAVE_FORMAT_PCM. Trying to reposition the sample
693       * with other formats will fail!       * with other formats will fail!
694       *       *
695       * @param SampleCount  number of sample points       * @param SampleCount  number of sample points
696       * @param Whence       to which relation \a SampleCount refers to       * @param Whence       to which relation \a SampleCount refers to
697       * @returns new position within the sample, 0 if       * @returns new position within the sample, 0 if
698       *          FormatTag != WAVE_FORMAT_PCM       *          FormatTag != DLS_WAVE_FORMAT_PCM
699       * @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
700       * @see FrameSize, FormatTag       * @see FrameSize, FormatTag
701       */       */
702      unsigned long Sample::SetPos(unsigned long SampleCount, RIFF::stream_whence_t Whence) {      unsigned long Sample::SetPos(unsigned long SampleCount, RIFF::stream_whence_t Whence) {
703          if (FormatTag != 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
704          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");
705          unsigned long orderedBytes = SampleCount * FrameSize;          unsigned long orderedBytes = SampleCount * FrameSize;
706          unsigned long result = pCkData->SetPos(orderedBytes, Whence);          unsigned long result = pCkData->SetPos(orderedBytes, Whence);
# Line 649  namespace DLS { Line 718  namespace DLS {
718       * @param SampleCount  number of sample points to read       * @param SampleCount  number of sample points to read
719       */       */
720      unsigned long Sample::Read(void* pBuffer, unsigned long SampleCount) {      unsigned long Sample::Read(void* pBuffer, unsigned long SampleCount) {
721          if (FormatTag != 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
722          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?
723      }      }
724    
# Line 669  namespace DLS { Line 738  namespace DLS {
738       * @see LoadSampleData()       * @see LoadSampleData()
739       */       */
740      unsigned long Sample::Write(void* pBuffer, unsigned long SampleCount) {      unsigned long Sample::Write(void* pBuffer, unsigned long SampleCount) {
741          if (FormatTag != 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
742          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");
743          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?
744      }      }
# Line 678  namespace DLS { Line 747  namespace DLS {
747       * Apply sample and its settings to the respective RIFF chunks. You have       * Apply sample and its settings to the respective RIFF chunks. You have
748       * to call File::Save() to make changes persistent.       * to call File::Save() to make changes persistent.
749       *       *
750       * @throws Exception if FormatTag != WAVE_FORMAT_PCM or no sample data       * @throws Exception if FormatTag != DLS_WAVE_FORMAT_PCM or no sample data
751       *                   was provided yet       *                   was provided yet
752       */       */
753      void Sample::UpdateChunks() {      void Sample::UpdateChunks() {
754          if (FormatTag != WAVE_FORMAT_PCM)          if (FormatTag != DLS_WAVE_FORMAT_PCM)
755              throw Exception("Could not save sample, only PCM format is supported");              throw Exception("Could not save sample, only PCM format is supported");
756          // we refuse to do anything if not sample wave form was provided yet          // we refuse to do anything if not sample wave form was provided yet
757          if (!pCkData)          if (!pCkData)
# Line 694  namespace DLS { Line 763  namespace DLS {
763          if (!pCkFormat) pCkFormat = pWaveList->AddSubChunk(CHUNK_ID_FMT, 16); // assumes PCM format          if (!pCkFormat) pCkFormat = pWaveList->AddSubChunk(CHUNK_ID_FMT, 16); // assumes PCM format
764          uint8_t* pData = (uint8_t*) pCkFormat->LoadChunkData();          uint8_t* pData = (uint8_t*) pCkFormat->LoadChunkData();
765          // update 'fmt' chunk          // update 'fmt' chunk
766          memccpy(&pData[0], &FormatTag, 1, 2);          store16(&pData[0], FormatTag);
767          memccpy(&pData[2], &Channels,  1, 2);          store16(&pData[2], Channels);
768          memccpy(&pData[4], &SamplesPerSecond, 1, 4);          store32(&pData[4], SamplesPerSecond);
769          memccpy(&pData[8], &AverageBytesPerSecond, 1, 4);          store32(&pData[8], AverageBytesPerSecond);
770          memccpy(&pData[12], &BlockAlign, 1, 2);          store16(&pData[12], BlockAlign);
771          memccpy(&pData[14], &BitDepth, 1, 2); // assuming PCM format          store16(&pData[14], BitDepth); // assuming PCM format
772      }      }
773    
774    
# Line 791  namespace DLS { Line 860  namespace DLS {
860      void Region::UpdateChunks() {      void Region::UpdateChunks() {
861          // make sure 'rgnh' chunk exists          // make sure 'rgnh' chunk exists
862          RIFF::Chunk* rgnh = pCkRegion->GetSubChunk(CHUNK_ID_RGNH);          RIFF::Chunk* rgnh = pCkRegion->GetSubChunk(CHUNK_ID_RGNH);
863          if (!rgnh) rgnh = pCkRegion->AddSubChunk(CHUNK_ID_RGNH, 14);          if (!rgnh) rgnh = pCkRegion->AddSubChunk(CHUNK_ID_RGNH, Layer ? 14 : 12);
864          uint8_t* pData = (uint8_t*) rgnh->LoadChunkData();          uint8_t* pData = (uint8_t*) rgnh->LoadChunkData();
865          FormatOptionFlags = (SelfNonExclusive)          FormatOptionFlags = (SelfNonExclusive)
866                                  ? FormatOptionFlags | F_RGN_OPTION_SELFNONEXCLUSIVE                                  ? FormatOptionFlags | F_RGN_OPTION_SELFNONEXCLUSIVE
867                                  : FormatOptionFlags & (~F_RGN_OPTION_SELFNONEXCLUSIVE);                                  : FormatOptionFlags & (~F_RGN_OPTION_SELFNONEXCLUSIVE);
868          // update 'rgnh' chunk          // update 'rgnh' chunk
869          memccpy(&pData[0], &KeyRange, 2, 2);          store16(&pData[0], KeyRange.low);
870          memccpy(&pData[4], &VelocityRange, 2, 2);          store16(&pData[2], KeyRange.high);
871          memccpy(&pData[8], &FormatOptionFlags, 1, 2);          store16(&pData[4], VelocityRange.low);
872          memccpy(&pData[10], &KeyGroup, 1, 2);          store16(&pData[6], VelocityRange.high);
873          memccpy(&pData[12], &Layer, 1, 2);          store16(&pData[8], FormatOptionFlags);
874            store16(&pData[10], KeyGroup);
875            if (rgnh->GetSize() >= 14) store16(&pData[12], Layer);
876    
877          // update chunks of base classes as well          // update chunks of base classes as well (but skip Resource,
878          Resource::UpdateChunks();          // as a rgn doesn't seem to have dlid and INFO chunks)
879          Articulator::UpdateChunks();          Articulator::UpdateChunks();
880          Sampler::UpdateChunks();          Sampler::UpdateChunks();
881    
# Line 834  namespace DLS { Line 905  namespace DLS {
905          if (index < 0) throw Exception("Could not save Region, could not find Region's sample");          if (index < 0) throw Exception("Could not save Region, could not find Region's sample");
906          WavePoolTableIndex = index;          WavePoolTableIndex = index;
907          // update 'wlnk' chunk          // update 'wlnk' chunk
908          memccpy(&pData[0], &WaveLinkOptionFlags, 1, 2);          store16(&pData[0], WaveLinkOptionFlags);
909          memccpy(&pData[2], &PhaseGroup, 1, 2);          store16(&pData[2], PhaseGroup);
910          memccpy(&pData[4], &Channel, 1, 4);          store32(&pData[4], Channel);
911          memccpy(&pData[8], &WavePoolTableIndex, 1, 4);          store32(&pData[8], WavePoolTableIndex);
912      }      }
913    
914    
# Line 895  namespace DLS { Line 966  namespace DLS {
966      }      }
967    
968      void Instrument::LoadRegions() {      void Instrument::LoadRegions() {
969            if (!pRegions) pRegions = new RegionList;
970          RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN);          RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN);
971          if (!lrgn) throw DLS::Exception("DLS::Instrument doesn't seem to have any Region (mandatory chunks in <ins > chunk not found)");          if (lrgn) {
972          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
973          RIFF::List* rgn = lrgn->GetFirstSubList();              RIFF::List* rgn = lrgn->GetFirstSubList();
974          while (rgn) {              while (rgn) {
975              if (rgn->GetListType() == regionCkType) {                  if (rgn->GetListType() == regionCkType) {
976                  if (!pRegions) pRegions = new RegionList;                      pRegions->push_back(new Region(this, rgn));
977                  pRegions->push_back(new Region(this, rgn));                  }
978                    rgn = lrgn->GetNextSubList();
979              }              }
             rgn = lrgn->GetNextSubList();  
980          }          }
981      }      }
982    
983      Region* Instrument::AddRegion() {      Region* Instrument::AddRegion() {
984          if (!pRegions) pRegions = new RegionList;          if (!pRegions) LoadRegions();
985          RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN);          RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN);
986          if (!lrgn)  lrgn = pCkInstrument->AddSubList(LIST_TYPE_LRGN);          if (!lrgn)  lrgn = pCkInstrument->AddSubList(LIST_TYPE_LRGN);
987          RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);          RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);
988          Region* pNewRegion = new Region(this, rgn);          Region* pNewRegion = new Region(this, rgn);
989          pRegions->push_back(pNewRegion);          pRegions->push_back(pNewRegion);
990            Regions = pRegions->size();
991          return pNewRegion;          return pNewRegion;
992      }      }
993    
994        void Instrument::MoveRegion(Region* pSrc, Region* pDst) {
995            RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN);
996            lrgn->MoveSubChunk(pSrc->pCkRegion, pDst ? pDst->pCkRegion : 0);
997    
998            pRegions->remove(pSrc);
999            RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pDst);
1000            pRegions->insert(iter, pSrc);
1001        }
1002    
1003      void Instrument::DeleteRegion(Region* pRegion) {      void Instrument::DeleteRegion(Region* pRegion) {
1004          if (!pRegions) return;          if (!pRegions) return;
1005          RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pRegion);          RegionList::iterator iter = find(pRegions->begin(), pRegions->end(), pRegion);
1006          if (iter == pRegions->end()) return;          if (iter == pRegions->end()) return;
1007          pRegions->erase(iter);          pRegions->erase(iter);
1008            Regions = pRegions->size();
1009          delete pRegion;          delete pRegion;
1010      }      }
1011    
# Line 947  namespace DLS { Line 1030  namespace DLS {
1030          locale.bank       = MIDI_BANK_ENCODE(MIDIBankCoarse, MIDIBankFine);          locale.bank       = MIDI_BANK_ENCODE(MIDIBankCoarse, MIDIBankFine);
1031          locale.bank       = (IsDrum) ? locale.bank | DRUM_TYPE_MASK : locale.bank & (~DRUM_TYPE_MASK);          locale.bank       = (IsDrum) ? locale.bank | DRUM_TYPE_MASK : locale.bank & (~DRUM_TYPE_MASK);
1032          MIDIBank          = MIDI_BANK_MERGE(MIDIBankCoarse, MIDIBankFine); // just a sync, when we're at it          MIDIBank          = MIDI_BANK_MERGE(MIDIBankCoarse, MIDIBankFine); // just a sync, when we're at it
1033          memccpy(&pData[0], &Regions, 1, 4);          store32(&pData[0], Regions);
1034          memccpy(&pData[4], &locale, 2, 4);          store32(&pData[4], locale.bank);
1035            store32(&pData[8], locale.instrument);
1036          // update Region's chunks          // update Region's chunks
1037          if (!pRegions) return;          if (!pRegions) return;
1038          RegionList::iterator iter = pRegions->begin();          RegionList::iterator iter = pRegions->begin();
# Line 989  namespace DLS { Line 1073  namespace DLS {
1073       * to add samples, instruments and finally call Save() to actually write       * to add samples, instruments and finally call Save() to actually write
1074       * a DLS file.       * a DLS file.
1075       */       */
1076      File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS)) {      File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS, RIFF::endian_little)) {
1077          pVersion = new version_t;          pVersion = new version_t;
1078          pVersion->major   = 0;          pVersion->major   = 0;
1079          pVersion->minor   = 0;          pVersion->minor   = 0;
# Line 1033  namespace DLS { Line 1117  namespace DLS {
1117          Instruments = colh->ReadUint32();          Instruments = colh->ReadUint32();
1118    
1119          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);          RIFF::Chunk* ptbl = pRIFF->GetSubChunk(CHUNK_ID_PTBL);
1120          if (!ptbl) throw DLS::Exception("Mandatory <ptbl> chunk not found.");          if (!ptbl) { // pool table is missing - this is probably an ".art" file
1121          WavePoolHeaderSize = ptbl->ReadUint32();              WavePoolCount    = 0;
1122          WavePoolCount  = ptbl->ReadUint32();              pWavePoolTable   = NULL;
1123          pWavePoolTable = new uint32_t[WavePoolCount];              pWavePoolTableHi = NULL;
1124          pWavePoolTableHi = new uint32_t[WavePoolCount];              WavePoolHeaderSize = 8;
1125          ptbl->SetPos(WavePoolHeaderSize);              b64BitWavePoolOffsets = false;
1126            } else {
1127          // Check for 64 bit offsets (used in gig v3 files)              WavePoolHeaderSize = ptbl->ReadUint32();
1128          b64BitWavePoolOffsets = (ptbl->GetSize() - WavePoolHeaderSize == WavePoolCount * 8);              WavePoolCount  = ptbl->ReadUint32();
1129          if (b64BitWavePoolOffsets) {              pWavePoolTable = new uint32_t[WavePoolCount];
1130              for (int i = 0 ; i < WavePoolCount ; i++) {              pWavePoolTableHi = new uint32_t[WavePoolCount];
1131                  pWavePoolTableHi[i] = ptbl->ReadUint32();              ptbl->SetPos(WavePoolHeaderSize);
1132                  pWavePoolTable[i] = ptbl->ReadUint32();  
1133                  if (pWavePoolTable[i] & 0x80000000)              // Check for 64 bit offsets (used in gig v3 files)
1134                      throw DLS::Exception("Files larger than 2 GB not yet supported");              b64BitWavePoolOffsets = (ptbl->GetSize() - WavePoolHeaderSize == WavePoolCount * 8);
1135                if (b64BitWavePoolOffsets) {
1136                    for (int i = 0 ; i < WavePoolCount ; i++) {
1137                        pWavePoolTableHi[i] = ptbl->ReadUint32();
1138                        pWavePoolTable[i] = ptbl->ReadUint32();
1139                        if (pWavePoolTable[i] & 0x80000000)
1140                            throw DLS::Exception("Files larger than 2 GB not yet supported");
1141                    }
1142                } else { // conventional 32 bit offsets
1143                    ptbl->Read(pWavePoolTable, WavePoolCount, sizeof(uint32_t));
1144                    for (int i = 0 ; i < WavePoolCount ; i++) pWavePoolTableHi[i] = 0;
1145              }              }
         } else { // conventional 32 bit offsets  
             ptbl->Read(pWavePoolTable, WavePoolCount, sizeof(uint32_t));  
             for (int i = 0 ; i < WavePoolCount ; i++) pWavePoolTableHi[i] = 0;  
1146          }          }
1147    
1148          pSamples     = NULL;          pSamples     = NULL;
# Line 1082  namespace DLS { Line 1173  namespace DLS {
1173          if (pWavePoolTable) delete[] pWavePoolTable;          if (pWavePoolTable) delete[] pWavePoolTable;
1174          if (pWavePoolTableHi) delete[] pWavePoolTableHi;          if (pWavePoolTableHi) delete[] pWavePoolTableHi;
1175          if (pVersion) delete pVersion;          if (pVersion) delete pVersion;
1176            for (std::list<RIFF::File*>::iterator i = ExtensionFiles.begin() ; i != ExtensionFiles.end() ; i++)
1177                delete *i;
1178      }      }
1179    
1180      Sample* File::GetFirstSample() {      Sample* File::GetFirstSample() {
# Line 1098  namespace DLS { Line 1191  namespace DLS {
1191      }      }
1192    
1193      void File::LoadSamples() {      void File::LoadSamples() {
1194            if (!pSamples) pSamples = new SampleList;
1195          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);          RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
1196          if (wvpl) {          if (wvpl) {
1197              unsigned long wvplFileOffset = wvpl->GetFilePos();              unsigned long wvplFileOffset = wvpl->GetFilePos();
1198              RIFF::List* wave = wvpl->GetFirstSubList();              RIFF::List* wave = wvpl->GetFirstSubList();
1199              while (wave) {              while (wave) {
1200                  if (wave->GetListType() == LIST_TYPE_WAVE) {                  if (wave->GetListType() == LIST_TYPE_WAVE) {
                     if (!pSamples) pSamples = new SampleList;  
1201                      unsigned long waveFileOffset = wave->GetFilePos();                      unsigned long waveFileOffset = wave->GetFilePos();
1202                      pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));                      pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));
1203                  }                  }
# Line 1118  namespace DLS { Line 1211  namespace DLS {
1211                  RIFF::List* wave = dwpl->GetFirstSubList();                  RIFF::List* wave = dwpl->GetFirstSubList();
1212                  while (wave) {                  while (wave) {
1213                      if (wave->GetListType() == LIST_TYPE_WAVE) {                      if (wave->GetListType() == LIST_TYPE_WAVE) {
                         if (!pSamples) pSamples = new SampleList;  
1214                          unsigned long waveFileOffset = wave->GetFilePos();                          unsigned long waveFileOffset = wave->GetFilePos();
1215                          pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset));                          pSamples->push_back(new Sample(this, wave, waveFileOffset - dwplFileOffset));
1216                      }                      }
# Line 1136  namespace DLS { Line 1228  namespace DLS {
1228       * @returns pointer to new Sample object       * @returns pointer to new Sample object
1229       */       */
1230      Sample* File::AddSample() {      Sample* File::AddSample() {
1231           if (!pSamples) LoadSamples();
1232         __ensureMandatoryChunksExist();         __ensureMandatoryChunksExist();
1233         RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);         RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
1234         // create new Sample object and its respective 'wave' list chunk         // create new Sample object and its respective 'wave' list chunk
        if (!pSamples) pSamples = new SampleList;  
1235         RIFF::List* wave = wvpl->AddSubList(LIST_TYPE_WAVE);         RIFF::List* wave = wvpl->AddSubList(LIST_TYPE_WAVE);
1236         Sample* pSample = new Sample(this, wave, 0 /*arbitrary value, we update offsets when we save*/);         Sample* pSample = new Sample(this, wave, 0 /*arbitrary value, we update offsets when we save*/);
1237         pSamples->push_back(pSample);         pSamples->push_back(pSample);
# Line 1175  namespace DLS { Line 1267  namespace DLS {
1267      }      }
1268    
1269      void File::LoadInstruments() {      void File::LoadInstruments() {
1270            if (!pInstruments) pInstruments = new InstrumentList;
1271          RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);          RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);
1272          if (lstInstruments) {          if (lstInstruments) {
1273              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();
1274              while (lstInstr) {              while (lstInstr) {
1275                  if (lstInstr->GetListType() == LIST_TYPE_INS) {                  if (lstInstr->GetListType() == LIST_TYPE_INS) {
                     if (!pInstruments) pInstruments = new InstrumentList;  
1276                      pInstruments->push_back(new Instrument(this, lstInstr));                      pInstruments->push_back(new Instrument(this, lstInstr));
1277                  }                  }
1278                  lstInstr = lstInstruments->GetNextSubList();                  lstInstr = lstInstruments->GetNextSubList();
# Line 1196  namespace DLS { Line 1288  namespace DLS {
1288       * @returns pointer to new Instrument object       * @returns pointer to new Instrument object
1289       */       */
1290      Instrument* File::AddInstrument() {      Instrument* File::AddInstrument() {
1291           if (!pInstruments) LoadInstruments();
1292         __ensureMandatoryChunksExist();         __ensureMandatoryChunksExist();
        if (!pInstruments) pInstruments = new InstrumentList;  
1293         RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);         RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);
1294         RIFF::List* lstInstr = lstInstruments->AddSubList(LIST_TYPE_INS);         RIFF::List* lstInstr = lstInstruments->AddSubList(LIST_TYPE_INS);
1295         Instrument* pInstrument = new Instrument(this, lstInstr);         Instrument* pInstrument = new Instrument(this, lstInstr);
# Line 1205  namespace DLS { Line 1297  namespace DLS {
1297         return pInstrument;         return pInstrument;
1298      }      }
1299    
1300      /** @brief Delete a instrument.      /** @brief Delete an instrument.
1301       *       *
1302       * This will delete the given Instrument object from the DLS file. You       * This will delete the given Instrument object from the DLS file. You
1303       * have to call Save() to make this persistent to the file.       * have to call Save() to make this persistent to the file.
# Line 1236  namespace DLS { Line 1328  namespace DLS {
1328              RIFF::Chunk* ckVersion    = pRIFF->GetSubChunk(CHUNK_ID_VERS);              RIFF::Chunk* ckVersion    = pRIFF->GetSubChunk(CHUNK_ID_VERS);
1329              if (!ckVersion) ckVersion = pRIFF->AddSubChunk(CHUNK_ID_VERS, 8);              if (!ckVersion) ckVersion = pRIFF->AddSubChunk(CHUNK_ID_VERS, 8);
1330              uint8_t* pData = (uint8_t*) ckVersion->LoadChunkData();              uint8_t* pData = (uint8_t*) ckVersion->LoadChunkData();
1331              memccpy(pData, pVersion, 2, 4);              store16(&pData[0], pVersion->minor);
1332                store16(&pData[2], pVersion->major);
1333                store16(&pData[4], pVersion->build);
1334                store16(&pData[6], pVersion->release);
1335          }          }
1336    
1337          // update 'colh' chunk          // update 'colh' chunk
# Line 1244  namespace DLS { Line 1339  namespace DLS {
1339          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);
1340          if (!colh)   colh = pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);          if (!colh)   colh = pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);
1341          uint8_t* pData = (uint8_t*) colh->LoadChunkData();          uint8_t* pData = (uint8_t*) colh->LoadChunkData();
1342          memccpy(pData, &Instruments, 1, 4);          store32(pData, Instruments);
1343    
1344          // update instrument's chunks          // update instrument's chunks
1345          if (pInstruments) {          if (pInstruments) {
# Line 1264  namespace DLS { Line 1359  namespace DLS {
1359          ptbl->Resize(iPtblSize);          ptbl->Resize(iPtblSize);
1360          pData = (uint8_t*) ptbl->LoadChunkData();          pData = (uint8_t*) ptbl->LoadChunkData();
1361          WavePoolCount = iSamples;          WavePoolCount = iSamples;
1362          memccpy(&pData[4], &WavePoolCount, 1, 4);          store32(&pData[4], WavePoolCount);
1363          // we actually update the sample offsets in the pool table when we Save()          // we actually update the sample offsets in the pool table when we Save()
1364          memset(&pData[WavePoolHeaderSize], 0, iPtblSize - WavePoolHeaderSize);          memset(&pData[WavePoolHeaderSize], 0, iPtblSize - WavePoolHeaderSize);
1365    
# Line 1353  namespace DLS { Line 1448  namespace DLS {
1448          unsigned long ulOriginalPos = ptbl->GetPos();          unsigned long ulOriginalPos = ptbl->GetPos();
1449          // update headers          // update headers
1450          ptbl->SetPos(0);          ptbl->SetPos(0);
1451          ptbl->WriteUint32(&WavePoolHeaderSize);          uint32_t tmp = WavePoolHeaderSize;
1452          ptbl->WriteUint32(&WavePoolCount);          ptbl->WriteUint32(&tmp);
1453            tmp = WavePoolCount;
1454            ptbl->WriteUint32(&tmp);
1455          // update offsets          // update offsets
1456          ptbl->SetPos(WavePoolHeaderSize);          ptbl->SetPos(WavePoolHeaderSize);
1457          if (b64BitWavePoolOffsets) {          if (b64BitWavePoolOffsets) {
1458              for (int i = 0 ; i < WavePoolCount ; i++) {              for (int i = 0 ; i < WavePoolCount ; i++) {
1459                  ptbl->WriteUint32(&pWavePoolTableHi[i]);                  tmp = pWavePoolTableHi[i];
1460                  ptbl->WriteUint32(&pWavePoolTable[i]);                  ptbl->WriteUint32(&tmp);
1461                    tmp = pWavePoolTable[i];
1462                    ptbl->WriteUint32(&tmp);
1463              }              }
1464          } else { // conventional 32 bit offsets          } else { // conventional 32 bit offsets
1465              for (int i = 0 ; i < WavePoolCount ; i++)              for (int i = 0 ; i < WavePoolCount ; i++) {
1466                  ptbl->WriteUint32(&pWavePoolTable[i]);                  tmp = pWavePoolTable[i];
1467                    ptbl->WriteUint32(&tmp);
1468                }
1469          }          }
1470          // restore 'ptbl' chunk's original read/write position          // restore 'ptbl' chunk's original read/write position
1471          ptbl->SetPos(ulOriginalPos);          ptbl->SetPos(ulOriginalPos);
Legend:
Removed from v.804  
changed lines
  Added in v.1183
  ViewVC Help
Powered by ViewVC