/[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 1106 by schoenebeck, Sun Mar 18 19:38:47 2007 UTC revision 1358 by schoenebeck, Sun Sep 30 18:13:33 2007 UTC
# Line 25  Line 25 
25    
26  #include <time.h>  #include <time.h>
27    
28    #ifdef __APPLE__
29    #include <CoreFoundation/CFUUID.h>
30    #elif defined(HAVE_UUID_UUID_H)
31    #include <uuid/uuid.h>
32    #endif
33    
34  #include "helper.h"  #include "helper.h"
35    
36  // macros to decode connection transforms  // macros to decode connection transforms
# Line 142  namespace DLS { Line 148  namespace DLS {
148          const int iEntrySize = 12; // 12 bytes per connection block          const int iEntrySize = 12; // 12 bytes per connection block
149          pArticulationCk->Resize(HeaderSize + Connections * iEntrySize);          pArticulationCk->Resize(HeaderSize + Connections * iEntrySize);
150          uint8_t* pData = (uint8_t*) pArticulationCk->LoadChunkData();          uint8_t* pData = (uint8_t*) pArticulationCk->LoadChunkData();
151          memcpy(&pData[0], &HeaderSize, 2);          store16(&pData[0], HeaderSize);
152          memcpy(&pData[2], &Connections, 2);          store16(&pData[2], Connections);
153          for (uint32_t i = 0; i < Connections; i++) {          for (uint32_t i = 0; i < Connections; i++) {
154              Connection::conn_block_t c = pConnections[i].ToConnBlock();              Connection::conn_block_t c = pConnections[i].ToConnBlock();
155              memcpy(&pData[HeaderSize + i * iEntrySize],     &c.source, 2);              store16(&pData[HeaderSize + i * iEntrySize],     c.source);
156              memcpy(&pData[HeaderSize + i * iEntrySize + 2], &c.control, 2);              store16(&pData[HeaderSize + i * iEntrySize + 2], c.control);
157              memcpy(&pData[HeaderSize + i * iEntrySize + 4], &c.destination, 2);              store16(&pData[HeaderSize + i * iEntrySize + 4], c.destination);
158              memcpy(&pData[HeaderSize + i * iEntrySize + 6], &c.transform, 2);              store16(&pData[HeaderSize + i * iEntrySize + 6], c.transform);
159              memcpy(&pData[HeaderSize + i * iEntrySize + 8], &c.scale, 4);              store32(&pData[HeaderSize + i * iEntrySize + 8], c.scale);
160          }          }
161      }      }
162    
# Line 233  namespace DLS { Line 239  namespace DLS {
239       * @param list - pointer to a list chunk which contains an INFO list chunk       * @param list - pointer to a list chunk which contains an INFO list chunk
240       */       */
241      Info::Info(RIFF::List* list) {      Info::Info(RIFF::List* list) {
242          UseFixedLengthStrings = false;          FixedStringLengths = NULL;
243          pResourceListChunk = list;          pResourceListChunk = list;
244          if (list) {          if (list) {
245              RIFF::List* lstINFO = list->GetSubList(LIST_TYPE_INFO);              RIFF::List* lstINFO = list->GetSubList(LIST_TYPE_INFO);
# Line 286  namespace DLS { Line 292  namespace DLS {
292       * @param lstINFO  - parent (INFO) RIFF list chunk       * @param lstINFO  - parent (INFO) RIFF list chunk
293       * @param s        - current value of info field       * @param s        - current value of info field
294       * @param sDefault - default value       * @param sDefault - default value
      * @param bUseFixedLengthStrings - should a specific string size be forced in the chunk?  
      * @param size     - wanted size of the INFO chunk. This is ignored if bUseFixedLengthStrings is false.  
295       */       */
296      void Info::SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault, bool bUseFixedLengthStrings, int size) {      void Info::SaveString(uint32_t ChunkID, RIFF::List* lstINFO, const String& s, const String& sDefault) {
297            int size = 0;
298            if (FixedStringLengths) {
299                for (int i = 0 ; FixedStringLengths[i].length ; i++) {
300                    if (FixedStringLengths[i].chunkId == ChunkID) {
301                        size = FixedStringLengths[i].length;
302                        break;
303                    }
304                }
305            }
306          RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID);          RIFF::Chunk* ck = lstINFO->GetSubChunk(ChunkID);
307          ::SaveString(ChunkID, ck, lstINFO, s, sDefault, bUseFixedLengthStrings, size); // function from helper.h          ::SaveString(ChunkID, ck, lstINFO, s, sDefault, size != 0, size); // function from helper.h
308      }      }
309    
310      /** @brief Update chunks with current info values.      /** @brief Update chunks with current info values.
# Line 336  namespace DLS { Line 349  namespace DLS {
349    
350          // save values          // save values
351    
352          // (the string size values are for gig files; they are only          SaveString(CHUNK_ID_IARL, lstINFO, ArchivalLocation, String(""));
353          // used if UseFixedLengthStrings is set to true)          SaveString(CHUNK_ID_IART, lstINFO, Artists, String(""));
354          SaveString(CHUNK_ID_INAM, lstINFO, Name, defaultName, UseFixedLengthStrings,          SaveString(CHUNK_ID_ICMS, lstINFO, Commissioned, String(""));
355                     resourceType == RIFF_TYPE_DLS ? 128 : 64);          SaveString(CHUNK_ID_ICMT, lstINFO, Comments, defaultComments);
356          SaveString(CHUNK_ID_IARL, lstINFO, ArchivalLocation, String(""), UseFixedLengthStrings, 256);          SaveString(CHUNK_ID_ICOP, lstINFO, Copyright, String(""));
357          SaveString(CHUNK_ID_ICRD, lstINFO, CreationDate, defaultCreationDate, UseFixedLengthStrings, 128);          SaveString(CHUNK_ID_ICRD, lstINFO, CreationDate, defaultCreationDate);
358          SaveString(CHUNK_ID_ICMT, lstINFO, Comments, defaultComments, UseFixedLengthStrings, 1024);          SaveString(CHUNK_ID_IENG, lstINFO, Engineer, String(""));
359          SaveString(CHUNK_ID_IPRD, lstINFO, Product, String(""), UseFixedLengthStrings, 128);          SaveString(CHUNK_ID_IGNR, lstINFO, Genre, String(""));
360          SaveString(CHUNK_ID_ICOP, lstINFO, Copyright, String(""), UseFixedLengthStrings, 128);          SaveString(CHUNK_ID_IKEY, lstINFO, Keywords, String(""));
361          SaveString(CHUNK_ID_IART, lstINFO, Artists, String(""), UseFixedLengthStrings, 128);          SaveString(CHUNK_ID_IMED, lstINFO, Medium, String(""));
362          SaveString(CHUNK_ID_IGNR, lstINFO, Genre, String(""), UseFixedLengthStrings, 128);          SaveString(CHUNK_ID_INAM, lstINFO, Name, defaultName);
363          SaveString(CHUNK_ID_IKEY, lstINFO, Keywords, String(""), UseFixedLengthStrings, 128);          SaveString(CHUNK_ID_IPRD, lstINFO, Product, String(""));
364          SaveString(CHUNK_ID_IENG, lstINFO, Engineer, String(""), UseFixedLengthStrings, 128);          SaveString(CHUNK_ID_ISBJ, lstINFO, Subject, String(""));
365          SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String(""), UseFixedLengthStrings, 128);          SaveString(CHUNK_ID_ISFT, lstINFO, Software, defaultSoftware);
366          SaveString(CHUNK_ID_ISFT, lstINFO, Software, defaultSoftware, UseFixedLengthStrings,          SaveString(CHUNK_ID_ISRC, lstINFO, Source, String(""));
367                     resourceType == LIST_TYPE_INS ?          SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String(""));
368                     (Software == "" ? defaultSoftware.length()+1 : Software.length()+1) : 128);          SaveString(CHUNK_ID_ITCH, lstINFO, Technician, String(""));
         SaveString(CHUNK_ID_IMED, lstINFO, Medium, String(""), UseFixedLengthStrings, 128);  
         SaveString(CHUNK_ID_ISRC, lstINFO, Source, String(""), UseFixedLengthStrings, 128);  
         SaveString(CHUNK_ID_ISRF, lstINFO, SourceForm, String(""), UseFixedLengthStrings, 128);  
         SaveString(CHUNK_ID_ICMS, lstINFO, Commissioned, String(""), UseFixedLengthStrings, 128);  
         SaveString(CHUNK_ID_ISBJ, lstINFO, Subject, String(""), UseFixedLengthStrings, 128);  
369      }      }
370    
371    
# Line 406  namespace DLS { Line 414  namespace DLS {
414       */       */
415      void Resource::UpdateChunks() {      void Resource::UpdateChunks() {
416          pInfo->UpdateChunks();          pInfo->UpdateChunks();
417          //TODO: save DLSID  
418            if (pDLSID) {
419                // make sure 'dlid' chunk exists
420                RIFF::Chunk* ckDLSID = pResourceList->GetSubChunk(CHUNK_ID_DLID);
421                if (!ckDLSID) ckDLSID = pResourceList->AddSubChunk(CHUNK_ID_DLID, 16);
422                uint8_t* pData = (uint8_t*)ckDLSID->LoadChunkData();
423                // update 'dlid' chunk
424                store32(&pData[0], pDLSID->ulData1);
425                store16(&pData[4], pDLSID->usData2);
426                store16(&pData[6], pDLSID->usData3);
427                memcpy(&pData[8], pDLSID->abData, 8);
428            }
429      }      }
430    
431        /**
432         * Generates a new DLSID for the resource.
433         */
434        void Resource::GenerateDLSID() {
435    #if defined(WIN32) || defined(__APPLE__) || defined(HAVE_UUID_GENERATE)
436    
437            if (!pDLSID) pDLSID = new dlsid_t;
438    
439    #ifdef WIN32
440    
441            UUID uuid;
442            UuidCreate(&uuid);
443            pDLSID->ulData1 = uuid.Data1;
444            pDLSID->usData2 = uuid.Data2;
445            pDLSID->usData3 = uuid.Data3;
446            memcpy(pDLSID->abData, uuid.Data4, 8);
447    
448    #elif defined(__APPLE__)
449    
450            CFUUIDRef uuidRef = CFUUIDCreate(NULL);
451            CFUUIDBytes uuid = CFUUIDGetUUIDBytes(uuidRef);
452            CFRelease(uuidRef);
453            pDLSID->ulData1 = uuid.byte0 | uuid.byte1 << 8 | uuid.byte2 << 16 | uuid.byte3 << 24;
454            pDLSID->usData2 = uuid.byte4 | uuid.byte5 << 8;
455            pDLSID->usData3 = uuid.byte6 | uuid.byte7 << 8;
456            pDLSID->abData[0] = uuid.byte8;
457            pDLSID->abData[1] = uuid.byte9;
458            pDLSID->abData[2] = uuid.byte10;
459            pDLSID->abData[3] = uuid.byte11;
460            pDLSID->abData[4] = uuid.byte12;
461            pDLSID->abData[5] = uuid.byte13;
462            pDLSID->abData[6] = uuid.byte14;
463            pDLSID->abData[7] = uuid.byte15;
464    #else
465            uuid_t uuid;
466            uuid_generate(uuid);
467            pDLSID->ulData1 = uuid[0] | uuid[1] << 8 | uuid[2] << 16 | uuid[3] << 24;
468            pDLSID->usData2 = uuid[4] | uuid[5] << 8;
469            pDLSID->usData3 = uuid[6] | uuid[7] << 8;
470            memcpy(pDLSID->abData, &uuid[8], 8);
471    #endif
472    #endif
473        }
474    
475    
476  // *************** Sampler ***************  // *************** Sampler ***************
# Line 426  namespace DLS { Line 488  namespace DLS {
488              SampleLoops    = wsmp->ReadUint32();              SampleLoops    = wsmp->ReadUint32();
489          } else { // 'wsmp' chunk missing          } else { // 'wsmp' chunk missing
490              uiHeaderSize   = 0;              uiHeaderSize   = 0;
491              UnityNote      = 64;              UnityNote      = 60;
492              FineTune       = 0; // +- 0 cents              FineTune       = 0; // +- 0 cents
493              Gain           = 0; // 0 dB              Gain           = 0; // 0 dB
494              SamplerOptions = F_WSMP_NO_COMPRESSION;              SamplerOptions = F_WSMP_NO_COMPRESSION;
# Line 450  namespace DLS { Line 512  namespace DLS {
512          if (pSampleLoops) delete[] pSampleLoops;          if (pSampleLoops) delete[] pSampleLoops;
513      }      }
514    
515        void Sampler::SetGain(int32_t gain) {
516            Gain = gain;
517        }
518    
519      /**      /**
520       * Apply all sample player options to the respective RIFF chunk. You       * Apply all sample player options to the respective RIFF chunk. You
521       * have to call File::Save() to make changes persistent.       * have to call File::Save() to make changes persistent.
# Line 463  namespace DLS { Line 529  namespace DLS {
529          }          }
530          uint8_t* pData = (uint8_t*) wsmp->LoadChunkData();          uint8_t* pData = (uint8_t*) wsmp->LoadChunkData();
531          // update headers size          // update headers size
532          memcpy(&pData[0], &uiHeaderSize, 4);          store32(&pData[0], uiHeaderSize);
533          // update respective sampler options bits          // update respective sampler options bits
534          SamplerOptions = (NoSampleDepthTruncation) ? SamplerOptions | F_WSMP_NO_TRUNCATION          SamplerOptions = (NoSampleDepthTruncation) ? SamplerOptions | F_WSMP_NO_TRUNCATION
535                                                     : SamplerOptions & (~F_WSMP_NO_TRUNCATION);                                                     : SamplerOptions & (~F_WSMP_NO_TRUNCATION);
536          SamplerOptions = (NoSampleCompression) ? SamplerOptions | F_WSMP_NO_COMPRESSION          SamplerOptions = (NoSampleCompression) ? SamplerOptions | F_WSMP_NO_COMPRESSION
537                                                 : SamplerOptions & (~F_WSMP_NO_COMPRESSION);                                                 : SamplerOptions & (~F_WSMP_NO_COMPRESSION);
538          memcpy(&pData[4], &UnityNote, 2);          store16(&pData[4], UnityNote);
539          memcpy(&pData[6], &FineTune, 2);          store16(&pData[6], FineTune);
540          memcpy(&pData[8], &Gain, 4);          store32(&pData[8], Gain);
541          memcpy(&pData[12], &SamplerOptions, 4);          store32(&pData[12], SamplerOptions);
542          memcpy(&pData[16], &SampleLoops, 4);          store32(&pData[16], SampleLoops);
543          // update loop definitions          // update loop definitions
544          for (uint32_t i = 0; i < SampleLoops; i++) {          for (uint32_t i = 0; i < SampleLoops; i++) {
545              //FIXME: this does not handle extended loop structs correctly              //FIXME: this does not handle extended loop structs correctly
546              memcpy(&pData[uiHeaderSize + i * 16], pSampleLoops + i, 4 * 4);              store32(&pData[uiHeaderSize + i * 16], pSampleLoops[i].Size);
547                store32(&pData[uiHeaderSize + i * 16 + 4], pSampleLoops[i].LoopType);
548                store32(&pData[uiHeaderSize + i * 16 + 8], pSampleLoops[i].LoopStart);
549                store32(&pData[uiHeaderSize + i * 16 + 12], pSampleLoops[i].LoopLength);
550          }          }
551      }      }
552    
553        /**
554         * Adds a new sample loop with the provided loop definition.
555         *
556         * @param pLoopDef - points to a loop definition that is to be copied
557         */
558        void Sampler::AddSampleLoop(sample_loop_t* pLoopDef) {
559            sample_loop_t* pNewLoops = new sample_loop_t[SampleLoops + 1];
560            // copy old loops array
561            for (int i = 0; i < SampleLoops; i++) {
562                pNewLoops[i] = pSampleLoops[i];
563            }
564            // add the new loop
565            pNewLoops[SampleLoops] = *pLoopDef;
566            // auto correct size field
567            pNewLoops[SampleLoops].Size = sizeof(DLS::sample_loop_t);
568            // free the old array and update the member variables
569            if (SampleLoops) delete[] pSampleLoops;
570            pSampleLoops = pNewLoops;
571            SampleLoops++;
572        }
573    
574        /**
575         * Deletes an existing sample loop.
576         *
577         * @param pLoopDef - pointer to existing loop definition
578         * @throws Exception - if given loop definition does not exist
579         */
580        void Sampler::DeleteSampleLoop(sample_loop_t* pLoopDef) {
581            sample_loop_t* pNewLoops = new sample_loop_t[SampleLoops - 1];
582            // copy old loops array (skipping given loop)
583            for (int i = 0, o = 0; i < SampleLoops; i++) {
584                if (&pSampleLoops[i] == pLoopDef) continue;
585                if (o == SampleLoops - 1)
586                    throw Exception("Could not delete Sample Loop, because it does not exist");
587                pNewLoops[o] = pSampleLoops[i];
588                o++;
589            }
590            // free the old array and update the member variables
591            if (SampleLoops) delete[] pSampleLoops;
592            pSampleLoops = pNewLoops;
593            SampleLoops--;
594        }
595    
596    
597    
598  // *************** Sample ***************  // *************** Sample ***************
# Line 716  namespace DLS { Line 828  namespace DLS {
828          if (!pCkFormat) pCkFormat = pWaveList->AddSubChunk(CHUNK_ID_FMT, 16); // assumes PCM format          if (!pCkFormat) pCkFormat = pWaveList->AddSubChunk(CHUNK_ID_FMT, 16); // assumes PCM format
829          uint8_t* pData = (uint8_t*) pCkFormat->LoadChunkData();          uint8_t* pData = (uint8_t*) pCkFormat->LoadChunkData();
830          // update 'fmt' chunk          // update 'fmt' chunk
831          memcpy(&pData[0], &FormatTag, 2);          store16(&pData[0], FormatTag);
832          memcpy(&pData[2], &Channels,  2);          store16(&pData[2], Channels);
833          memcpy(&pData[4], &SamplesPerSecond, 4);          store32(&pData[4], SamplesPerSecond);
834          memcpy(&pData[8], &AverageBytesPerSecond, 4);          store32(&pData[8], AverageBytesPerSecond);
835          memcpy(&pData[12], &BlockAlign, 2);          store16(&pData[12], BlockAlign);
836          memcpy(&pData[14], &BitDepth, 2); // assuming PCM format          store16(&pData[14], BitDepth); // assuming PCM format
837      }      }
838    
839    
# Line 805  namespace DLS { Line 917  namespace DLS {
917      }      }
918    
919      /**      /**
920         * Modifies the key range of this Region and makes sure the respective
921         * chunks are in correct order.
922         *
923         * @param Low  - lower end of key range
924         * @param High - upper end of key range
925         */
926        void Region::SetKeyRange(uint16_t Low, uint16_t High) {
927            KeyRange.low  = Low;
928            KeyRange.high = High;
929    
930            // make sure regions are already loaded
931            Instrument* pInstrument = (Instrument*) GetParent();
932            if (!pInstrument->pRegions) pInstrument->LoadRegions();
933            if (!pInstrument->pRegions) return;
934    
935            // find the r which is the first one to the right of this region
936            // at its new position
937            Region* r = NULL;
938            Region* prev_region = NULL;
939            for (
940                Instrument::RegionList::iterator iter = pInstrument->pRegions->begin();
941                iter != pInstrument->pRegions->end(); iter++
942            ) {
943                if ((*iter)->KeyRange.low > this->KeyRange.low) {
944                    r = *iter;
945                    break;
946                }
947                prev_region = *iter;
948            }
949    
950            // place this region before r if it's not already there
951            if (prev_region != this) pInstrument->MoveRegion(this, r);
952        }
953    
954        /**
955       * Apply Region settings to the respective RIFF chunks. You have to       * Apply Region settings to the respective RIFF chunks. You have to
956       * call File::Save() to make changes persistent.       * call File::Save() to make changes persistent.
957       *       *
# Line 819  namespace DLS { Line 966  namespace DLS {
966                                  ? FormatOptionFlags | F_RGN_OPTION_SELFNONEXCLUSIVE                                  ? FormatOptionFlags | F_RGN_OPTION_SELFNONEXCLUSIVE
967                                  : FormatOptionFlags & (~F_RGN_OPTION_SELFNONEXCLUSIVE);                                  : FormatOptionFlags & (~F_RGN_OPTION_SELFNONEXCLUSIVE);
968          // update 'rgnh' chunk          // update 'rgnh' chunk
969          memcpy(&pData[0], &KeyRange, 2 * 2);          store16(&pData[0], KeyRange.low);
970          memcpy(&pData[4], &VelocityRange, 2 * 2);          store16(&pData[2], KeyRange.high);
971          memcpy(&pData[8], &FormatOptionFlags, 2);          store16(&pData[4], VelocityRange.low);
972          memcpy(&pData[10], &KeyGroup, 2);          store16(&pData[6], VelocityRange.high);
973          if (rgnh->GetSize() >= 14) memcpy(&pData[12], &Layer, 2);          store16(&pData[8], FormatOptionFlags);
974            store16(&pData[10], KeyGroup);
975            if (rgnh->GetSize() >= 14) store16(&pData[12], Layer);
976    
977          // update chunks of base classes as well (but skip Resource,          // update chunks of base classes as well (but skip Resource,
978          // as a rgn doesn't seem to have dlid and INFO chunks)          // as a rgn doesn't seem to have dlid and INFO chunks)
# Line 853  namespace DLS { Line 1002  namespace DLS {
1002                  }                  }
1003              }              }
1004          }          }
         if (index < 0) throw Exception("Could not save Region, could not find Region's sample");  
1005          WavePoolTableIndex = index;          WavePoolTableIndex = index;
1006          // update 'wlnk' chunk          // update 'wlnk' chunk
1007          memcpy(&pData[0], &WaveLinkOptionFlags, 2);          store16(&pData[0], WaveLinkOptionFlags);
1008          memcpy(&pData[2], &PhaseGroup, 2);          store16(&pData[2], PhaseGroup);
1009          memcpy(&pData[4], &Channel, 4);          store32(&pData[4], Channel);
1010          memcpy(&pData[8], &WavePoolTableIndex, 4);          store32(&pData[8], WavePoolTableIndex);
1011      }      }
1012    
1013    
# Line 981  namespace DLS { Line 1129  namespace DLS {
1129          locale.bank       = MIDI_BANK_ENCODE(MIDIBankCoarse, MIDIBankFine);          locale.bank       = MIDI_BANK_ENCODE(MIDIBankCoarse, MIDIBankFine);
1130          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);
1131          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
1132          memcpy(&pData[0], &Regions, 4);          store32(&pData[0], Regions);
1133          memcpy(&pData[4], &locale, 2 * 4);          store32(&pData[4], locale.bank);
1134            store32(&pData[8], locale.instrument);
1135          // update Region's chunks          // update Region's chunks
1136          if (!pRegions) return;          if (!pRegions) return;
1137          RegionList::iterator iter = pRegions->begin();          RegionList::iterator iter = pRegions->begin();
# Line 1024  namespace DLS { Line 1173  namespace DLS {
1173       * a DLS file.       * a DLS file.
1174       */       */
1175      File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS)) {      File::File() : Resource(NULL, pRIFF = new RIFF::File(RIFF_TYPE_DLS)) {
1176            pRIFF->SetByteOrder(RIFF::endian_little);
1177          pVersion = new version_t;          pVersion = new version_t;
1178          pVersion->major   = 0;          pVersion->major   = 0;
1179          pVersion->minor   = 0;          pVersion->minor   = 0;
# Line 1278  namespace DLS { Line 1428  namespace DLS {
1428              RIFF::Chunk* ckVersion    = pRIFF->GetSubChunk(CHUNK_ID_VERS);              RIFF::Chunk* ckVersion    = pRIFF->GetSubChunk(CHUNK_ID_VERS);
1429              if (!ckVersion) ckVersion = pRIFF->AddSubChunk(CHUNK_ID_VERS, 8);              if (!ckVersion) ckVersion = pRIFF->AddSubChunk(CHUNK_ID_VERS, 8);
1430              uint8_t* pData = (uint8_t*) ckVersion->LoadChunkData();              uint8_t* pData = (uint8_t*) ckVersion->LoadChunkData();
1431              memcpy(pData, pVersion, 2 * 4);              store16(&pData[0], pVersion->minor);
1432                store16(&pData[2], pVersion->major);
1433                store16(&pData[4], pVersion->build);
1434                store16(&pData[6], pVersion->release);
1435          }          }
1436    
1437          // update 'colh' chunk          // update 'colh' chunk
# Line 1286  namespace DLS { Line 1439  namespace DLS {
1439          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);          RIFF::Chunk* colh = pRIFF->GetSubChunk(CHUNK_ID_COLH);
1440          if (!colh)   colh = pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);          if (!colh)   colh = pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);
1441          uint8_t* pData = (uint8_t*) colh->LoadChunkData();          uint8_t* pData = (uint8_t*) colh->LoadChunkData();
1442          memcpy(pData, &Instruments, 4);          store32(pData, Instruments);
1443    
1444          // update instrument's chunks          // update instrument's chunks
1445          if (pInstruments) {          if (pInstruments) {
# Line 1306  namespace DLS { Line 1459  namespace DLS {
1459          ptbl->Resize(iPtblSize);          ptbl->Resize(iPtblSize);
1460          pData = (uint8_t*) ptbl->LoadChunkData();          pData = (uint8_t*) ptbl->LoadChunkData();
1461          WavePoolCount = iSamples;          WavePoolCount = iSamples;
1462          memcpy(&pData[4], &WavePoolCount, 4);          store32(&pData[4], WavePoolCount);
1463          // 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()
1464          memset(&pData[WavePoolHeaderSize], 0, iPtblSize - WavePoolHeaderSize);          memset(&pData[WavePoolHeaderSize], 0, iPtblSize - WavePoolHeaderSize);
1465    
# Line 1395  namespace DLS { Line 1548  namespace DLS {
1548          unsigned long ulOriginalPos = ptbl->GetPos();          unsigned long ulOriginalPos = ptbl->GetPos();
1549          // update headers          // update headers
1550          ptbl->SetPos(0);          ptbl->SetPos(0);
1551          ptbl->WriteUint32(&WavePoolHeaderSize);          uint32_t tmp = WavePoolHeaderSize;
1552          ptbl->WriteUint32(&WavePoolCount);          ptbl->WriteUint32(&tmp);
1553            tmp = WavePoolCount;
1554            ptbl->WriteUint32(&tmp);
1555          // update offsets          // update offsets
1556          ptbl->SetPos(WavePoolHeaderSize);          ptbl->SetPos(WavePoolHeaderSize);
1557          if (b64BitWavePoolOffsets) {          if (b64BitWavePoolOffsets) {
1558              for (int i = 0 ; i < WavePoolCount ; i++) {              for (int i = 0 ; i < WavePoolCount ; i++) {
1559                  ptbl->WriteUint32(&pWavePoolTableHi[i]);                  tmp = pWavePoolTableHi[i];
1560                  ptbl->WriteUint32(&pWavePoolTable[i]);                  ptbl->WriteUint32(&tmp);
1561                    tmp = pWavePoolTable[i];
1562                    ptbl->WriteUint32(&tmp);
1563              }              }
1564          } else { // conventional 32 bit offsets          } else { // conventional 32 bit offsets
1565              for (int i = 0 ; i < WavePoolCount ; i++)              for (int i = 0 ; i < WavePoolCount ; i++) {
1566                  ptbl->WriteUint32(&pWavePoolTable[i]);                  tmp = pWavePoolTable[i];
1567                    ptbl->WriteUint32(&tmp);
1568                }
1569          }          }
1570          // restore 'ptbl' chunk's original read/write position          // restore 'ptbl' chunk's original read/write position
1571          ptbl->SetPos(ulOriginalPos);          ptbl->SetPos(ulOriginalPos);
Legend:
Removed from v.1106  
changed lines
  Added in v.1358
  ViewVC Help
Powered by ViewVC