/[svn]/libgig/trunk/src/gig.cpp

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

Parent Directory | Revision Log | View Patch Patch

-revision 728 by persson,
Tue Jul 26 11:13:53 2005 UTC
+revision 1317 by persson,
Sat Sep  1 07:15:53 2007 UTC
 Line 1
  /***************************************************************************
   *                                                                         *
-  *   libgig - C++ cross-platform Gigasampler format file loader library    *
+  *   libgig - C++ cross-platform Gigasampler format file access library    *
   *                                                                         *
-  *   Copyright (C) 2003-2005 by Christian Schoenebeck                      *
+  *   Copyright (C) 2003-2007 by Christian Schoenebeck                      *
   *                              <cuse@users.sourceforge.net>               *
   *                                                                         *
   *   This library is free software; you can redistribute it and/or modify  *
 Line 23
  #include "gig.h"
+ #include "helper.h"
+ #include <math.h>
  #include <iostream>
+ /// Initial size of the sample buffer which is used for decompression of
+ /// compressed sample wave streams - this value should always be bigger than
+ /// the biggest sample piece expected to be read by the sampler engine,
+ /// otherwise the buffer size will be raised at runtime and thus the buffer
+ /// reallocated which is time consuming and unefficient.
+ #define INITIAL_SAMPLE_BUFFER_SIZE              512000 // 512 kB
+ /** (so far) every exponential paramater in the gig format has a basis of 1.000000008813822 */
+ #define GIG_EXP_DECODE(x)                       (pow(1.000000008813822, x))
+ #define GIG_EXP_ENCODE(x)                       (log(x) / log(1.000000008813822))
+ #define GIG_PITCH_TRACK_EXTRACT(x)              (!(x & 0x01))
+ #define GIG_PITCH_TRACK_ENCODE(x)               ((x) ? 0x00 : 0x01)
+ #define GIG_VCF_RESONANCE_CTRL_EXTRACT(x)       ((x >> 4) & 0x03)
+ #define GIG_VCF_RESONANCE_CTRL_ENCODE(x)        ((x & 0x03) << 4)
+ #define GIG_EG_CTR_ATTACK_INFLUENCE_EXTRACT(x)  ((x >> 1) & 0x03)
+ #define GIG_EG_CTR_DECAY_INFLUENCE_EXTRACT(x)   ((x >> 3) & 0x03)
+ #define GIG_EG_CTR_RELEASE_INFLUENCE_EXTRACT(x) ((x >> 5) & 0x03)
+ #define GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(x)   ((x & 0x03) << 1)
+ #define GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(x)    ((x & 0x03) << 3)
+ #define GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(x)  ((x & 0x03) << 5)
  namespace gig {
  // *************** progress_t ***************
-Line 59 
 namespace gig {
+Line 83 
 namespace gig {
      }
- // *************** Internal functions for sample decopmression ***************
+ // *************** Internal functions for sample decompression ***************
  // *
  namespace {
-Line 87 
 namespace {
+Line 111 
 namespace {
          return x & 0x800000 ? x - 0x1000000 : x;
      }
+     inline void store24(unsigned char* pDst, int x)
+     {
+         pDst[0] = x;
+         pDst[1] = x >> 8;
+         pDst[2] = x >> 16;
+     }
      void Decompress16(int compressionmode, const unsigned char* params,
                        int srcStep, int dstStep,
                        const unsigned char* pSrc, int16_t* pDst,
-Line 126 
 namespace {
+Line 157 
 namespace {
      }
      void Decompress24(int compressionmode, const unsigned char* params,
-                       int dstStep, const unsigned char* pSrc, int16_t* pDst,
+                       int dstStep, const unsigned char* pSrc, uint8_t* pDst,
                        unsigned long currentframeoffset,
                        unsigned long copysamples, int truncatedBits)
      {
-         // Note: The 24 bits are truncated to 16 bits for now.
          int y, dy, ddy, dddy;
-         const int shift = 8 - truncatedBits;
  #define GET_PARAMS(params)                      \
          y    = get24(params);                   \
-Line 149 
 namespace {
+Line 177 
 namespace {
  #define COPY_ONE(x)                             \
          SKIP_ONE(x);                            \
-         *pDst = y >> shift;                     \
+         store24(pDst, y << truncatedBits);      \
          pDst += dstStep
          switch (compressionmode) {
              case 2: // 24 bit uncompressed
                  pSrc += currentframeoffset * 3;
                  while (copysamples) {
-                     *pDst = get24(pSrc) >> shift;
+                     store24(pDst, get24(pSrc) << truncatedBits);
                      pDst += dstStep;
                      pSrc += 3;
                      copysamples--;
-Line 226 
 namespace {
+Line 254 
 namespace {
  }
+ // *************** Other Internal functions  ***************
+ // *
+     static split_type_t __resolveSplitType(dimension_t dimension) {
+         return (
+             dimension == dimension_layer ||
+             dimension == dimension_samplechannel ||
+             dimension == dimension_releasetrigger ||
+             dimension == dimension_keyboard ||
+             dimension == dimension_roundrobin ||
+             dimension == dimension_random ||
+             dimension == dimension_smartmidi ||
+             dimension == dimension_roundrobinkeyboard
+         ) ? split_type_bit : split_type_normal;
+     }
+     static int __resolveZoneSize(dimension_def_t& dimension_definition) {
+         return (dimension_definition.split_type == split_type_normal)
+         ? int(128.0 / dimension_definition.zones) : 0;
+     }
+ // *************** CRC ***************
+ // *
+     const uint32_t* CRC::table(initTable());
+     uint32_t* CRC::initTable() {
+         uint32_t* res = new uint32_t[256];
+         for (int i = 0 ; i < 256 ; i++) {
+             uint32_t c = i;
+             for (int j = 0 ; j < 8 ; j++) {
+                 c = (c & 1) ? 0xedb88320 ^ (c >> 1) : c >> 1;
+             }
+             res[i] = c;
+         }
+         return res;
+     }
  // *************** Sample ***************
  // *
      unsigned int Sample::Instances = 0;
      buffer_t     Sample::InternalDecompressionBuffer;
+     /** @brief Constructor.
+      *
+      * Load an existing sample or create a new one. A 'wave' list chunk must
+      * be given to this constructor. In case the given 'wave' list chunk
+      * contains a 'fmt', 'data' (and optionally a '3gix', 'smpl') chunk, the
+      * format and sample data will be loaded from there, otherwise default
+      * values will be used and those chunks will be created when
+      * File::Save() will be called later on.
+      *
+      * @param pFile          - pointer to gig::File where this sample is
+      *                         located (or will be located)
+      * @param waveList       - pointer to 'wave' list chunk which is (or
+      *                         will be) associated with this sample
+      * @param WavePoolOffset - offset of this sample data from wave pool
+      *                         ('wvpl') list chunk
+      * @param fileNo         - number of an extension file where this sample
+      *                         is located, 0 otherwise
+      */
      Sample::Sample(File* pFile, RIFF::List* waveList, unsigned long WavePoolOffset, unsigned long fileNo) : DLS::Sample((DLS::File*) pFile, waveList, WavePoolOffset) {
+         static const DLS::Info::FixedStringLength fixedStringLengths[] = {
+             { CHUNK_ID_INAM, 64 },
+             { 0, 0 }
+         };
+         pInfo->FixedStringLengths = fixedStringLengths;
          Instances++;
          FileNo = fileNo;
-         RIFF::Chunk* _3gix = waveList->GetSubChunk(CHUNK_ID_3GIX);
+         pCk3gix = waveList->GetSubChunk(CHUNK_ID_3GIX);
-         if (!_3gix) throw gig::Exception("Mandatory chunks in <wave> list chunk not found.");
+         if (pCk3gix) {
-         SampleGroup = _3gix->ReadInt16();
+             uint16_t iSampleGroup = pCk3gix->ReadInt16();
+             pGroup = pFile->GetGroup(iSampleGroup);
-         RIFF::Chunk* smpl = waveList->GetSubChunk(CHUNK_ID_SMPL);
+         } else { // '3gix' chunk missing
-         if (!smpl) throw gig::Exception("Mandatory chunks in <wave> list chunk not found.");
+             // by default assigned to that mandatory "Default Group"
-         Manufacturer      = smpl->ReadInt32();
+             pGroup = pFile->GetGroup(0);
-         Product           = smpl->ReadInt32();
+         }
-         SamplePeriod      = smpl->ReadInt32();
-         MIDIUnityNote     = smpl->ReadInt32();
+         pCkSmpl = waveList->GetSubChunk(CHUNK_ID_SMPL);
-         FineTune          = smpl->ReadInt32();
+         if (pCkSmpl) {
-         smpl->Read(&SMPTEFormat, 1, 4);
+             Manufacturer  = pCkSmpl->ReadInt32();
-         SMPTEOffset       = smpl->ReadInt32();
+             Product       = pCkSmpl->ReadInt32();
-         Loops             = smpl->ReadInt32();
+             SamplePeriod  = pCkSmpl->ReadInt32();
-         smpl->ReadInt32(); // manufByt
+             MIDIUnityNote = pCkSmpl->ReadInt32();
-         LoopID            = smpl->ReadInt32();
+             FineTune      = pCkSmpl->ReadInt32();
-         smpl->Read(&LoopType, 1, 4);
+             pCkSmpl->Read(&SMPTEFormat, 1, 4);
-         LoopStart         = smpl->ReadInt32();
+             SMPTEOffset   = pCkSmpl->ReadInt32();
-         LoopEnd           = smpl->ReadInt32();
+             Loops         = pCkSmpl->ReadInt32();
-         LoopFraction      = smpl->ReadInt32();
+             pCkSmpl->ReadInt32(); // manufByt
-         LoopPlayCount     = smpl->ReadInt32();
+             LoopID        = pCkSmpl->ReadInt32();
+             pCkSmpl->Read(&LoopType, 1, 4);
+             LoopStart     = pCkSmpl->ReadInt32();
+             LoopEnd       = pCkSmpl->ReadInt32();
+             LoopFraction  = pCkSmpl->ReadInt32();
+             LoopPlayCount = pCkSmpl->ReadInt32();
+         } else { // 'smpl' chunk missing
+             // use default values
+             Manufacturer  = 0;
+             Product       = 0;
+             SamplePeriod  = uint32_t(1000000000.0 / SamplesPerSecond + 0.5);
+             MIDIUnityNote = 60;
+             FineTune      = 0;
+             SMPTEFormat   = smpte_format_no_offset;
+             SMPTEOffset   = 0;
+             Loops         = 0;
+             LoopID        = 0;
+             LoopType      = loop_type_normal;
+             LoopStart     = 0;
+             LoopEnd       = 0;
+             LoopFraction  = 0;
+             LoopPlayCount = 0;
+         }
          FrameTable                 = NULL;
          SamplePos                  = 0;
-Line 287 
 namespace {
+Line 404 
 namespace {
          }
          FrameOffset = 0; // just for streaming compressed samples
-         LoopSize = LoopEnd - LoopStart;
+         LoopSize = LoopEnd - LoopStart + 1;
+     }
+     /**
+      * Apply sample and its settings to the respective RIFF chunks. You have
+      * to call File::Save() to make changes persistent.
+      *
+      * Usually there is absolutely no need to call this method explicitly.
+      * It will be called automatically when File::Save() was called.
+      *
+      * @throws DLS::Exception if FormatTag != DLS_WAVE_FORMAT_PCM or no sample data
+      *                        was provided yet
+      * @throws gig::Exception if there is any invalid sample setting
+      */
+     void Sample::UpdateChunks() {
+         // first update base class's chunks
+         DLS::Sample::UpdateChunks();
+         // make sure 'smpl' chunk exists
+         pCkSmpl = pWaveList->GetSubChunk(CHUNK_ID_SMPL);
+         if (!pCkSmpl) {
+             pCkSmpl = pWaveList->AddSubChunk(CHUNK_ID_SMPL, 60);
+             memset(pCkSmpl->LoadChunkData(), 0, 60);
+         }
+         // update 'smpl' chunk
+         uint8_t* pData = (uint8_t*) pCkSmpl->LoadChunkData();
+         SamplePeriod = uint32_t(1000000000.0 / SamplesPerSecond + 0.5);
+         store32(&pData[0], Manufacturer);
+         store32(&pData[4], Product);
+         store32(&pData[8], SamplePeriod);
+         store32(&pData[12], MIDIUnityNote);
+         store32(&pData[16], FineTune);
+         store32(&pData[20], SMPTEFormat);
+         store32(&pData[24], SMPTEOffset);
+         store32(&pData[28], Loops);
+         // we skip 'manufByt' for now (4 bytes)
+         store32(&pData[36], LoopID);
+         store32(&pData[40], LoopType);
+         store32(&pData[44], LoopStart);
+         store32(&pData[48], LoopEnd);
+         store32(&pData[52], LoopFraction);
+         store32(&pData[56], LoopPlayCount);
+         // make sure '3gix' chunk exists
+         pCk3gix = pWaveList->GetSubChunk(CHUNK_ID_3GIX);
+         if (!pCk3gix) pCk3gix = pWaveList->AddSubChunk(CHUNK_ID_3GIX, 4);
+         // determine appropriate sample group index (to be stored in chunk)
+         uint16_t iSampleGroup = 0; // 0 refers to default sample group
+         File* pFile = static_cast<File*>(pParent);
+         if (pFile->pGroups) {
+             std::list<Group*>::iterator iter = pFile->pGroups->begin();
+             std::list<Group*>::iterator end  = pFile->pGroups->end();
+             for (int i = 0; iter != end; i++, iter++) {
+                 if (*iter == pGroup) {
+                     iSampleGroup = i;
+                     break; // found
+                 }
+             }
+         }
+         // update '3gix' chunk
+         pData = (uint8_t*) pCk3gix->LoadChunkData();
+         store16(&pData[0], iSampleGroup);
      }
      /// Scans compressed samples for mandatory informations (e.g. actual number of total sample points).
-Line 490 
 namespace {
+Line 670 
 namespace {
          RAMCache.Size   = 0;
      }
+     /** @brief Resize sample.
+      *
+      * Resizes the sample's wave form data, that is the actual size of
+      * sample wave data possible to be written for this sample. This call
+      * will return immediately and just schedule the resize operation. You
+      * should call File::Save() to actually perform the resize operation(s)
+      * "physically" to the file. As this can take a while on large files, it
+      * is recommended to call Resize() first on all samples which have to be
+      * resized and finally to call File::Save() to perform all those resize
+      * operations in one rush.
+      *
+      * The actual size (in bytes) is dependant to the current FrameSize
+      * value. You may want to set FrameSize before calling Resize().
+      *
+      * <b>Caution:</b> You cannot directly write (i.e. with Write()) to
+      * enlarged samples before calling File::Save() as this might exceed the
+      * current sample's boundary!
+      *
+      * Also note: only DLS_WAVE_FORMAT_PCM is currently supported, that is
+      * FormatTag must be DLS_WAVE_FORMAT_PCM. Trying to resize samples with
+      * other formats will fail!
+      *
+      * @param iNewSize - new sample wave data size in sample points (must be
+      *                   greater than zero)
+      * @throws DLS::Excecption if FormatTag != DLS_WAVE_FORMAT_PCM
+      *                         or if \a iNewSize is less than 1
+      * @throws gig::Exception if existing sample is compressed
+      * @see DLS::Sample::GetSize(), DLS::Sample::FrameSize,
+      *      DLS::Sample::FormatTag, File::Save()
+      */
+     void Sample::Resize(int iNewSize) {
+         if (Compressed) throw gig::Exception("There is no support for modifying compressed samples (yet)");
+         DLS::Sample::Resize(iNewSize);
+     }
      /**
       * Sets the position within the sample (in sample points, not in
       * bytes). Use this method and <i>Read()</i> if you don't want to load
-Line 579 
 namespace {
+Line 794 
 namespace {
       * @param SampleCount      number of sample points to read
       * @param pPlaybackState   will be used to store and reload the playback
       *                         state for the next ReadAndLoop() call
+      * @param pDimRgn          dimension region with looping information
       * @param pExternalDecompressionBuffer  (optional) external buffer to use for decompression
       * @returns                number of successfully read sample points
       * @see                    CreateDecompressionBuffer()
       */
-     unsigned long Sample::ReadAndLoop(void* pBuffer, unsigned long SampleCount, playback_state_t* pPlaybackState, buffer_t* pExternalDecompressionBuffer) {
+     unsigned long Sample::ReadAndLoop(void* pBuffer, unsigned long SampleCount, playback_state_t* pPlaybackState,
+                                       DimensionRegion* pDimRgn, buffer_t* pExternalDecompressionBuffer) {
          unsigned long samplestoread = SampleCount, totalreadsamples = 0, readsamples, samplestoloopend;
          uint8_t* pDst = (uint8_t*) pBuffer;
          SetPos(pPlaybackState->position); // recover position from the last time
-         if (this->Loops && GetPos() <= this->LoopEnd) { // honor looping if there are loop points defined
+         if (pDimRgn->SampleLoops) { // honor looping if there are loop points defined
-             switch (this->LoopType) {
+             const DLS::sample_loop_t& loop = pDimRgn->pSampleLoops[0];
+             const uint32_t loopEnd = loop.LoopStart + loop.LoopLength;
-                 case loop_type_bidirectional: { //TODO: not tested yet!
+             if (GetPos() <= loopEnd) {
-                     do {
+                 switch (loop.LoopType) {
-                         // if not endless loop check if max. number of loop cycles have been passed
-                         if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
-                         if (!pPlaybackState->reverse) { // forward playback
-                             do {
-                                 samplestoloopend  = this->LoopEnd - GetPos();
-                                 readsamples       = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
-                                 samplestoread    -= readsamples;
-                                 totalreadsamples += readsamples;
-                                 if (readsamples == samplestoloopend) {
-                                     pPlaybackState->reverse = true;
-                                     break;
-                                 }
-                             } while (samplestoread && readsamples);
-                         }
-                         else { // backward playback
-                             // as we can only read forward from disk, we have to
+                     case loop_type_bidirectional: { //TODO: not tested yet!
-                             // determine the end position within the loop first,
+                         do {
-                             // read forward from that 'end' and finally after
+                             // if not endless loop check if max. number of loop cycles have been passed
-                             // reading, swap all sample frames so it reflects
+                             if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
-                             // backward playback
+                             if (!pPlaybackState->reverse) { // forward playback
-                             unsigned long swapareastart       = totalreadsamples;
+                                 do {
-                             unsigned long loopoffset          = GetPos() - this->LoopStart;
+                                     samplestoloopend  = loopEnd - GetPos();
-                             unsigned long samplestoreadinloop = Min(samplestoread, loopoffset);
+                                     readsamples       = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
-                             unsigned long reverseplaybackend  = GetPos() - samplestoreadinloop;
+                                     samplestoread    -= readsamples;
+                                     totalreadsamples += readsamples;
-                             SetPos(reverseplaybackend);
+                                     if (readsamples == samplestoloopend) {
+                                         pPlaybackState->reverse = true;
-                             // read samples for backward playback
+                                         break;
-                             do {
+                                     }
-                                 readsamples          = Read(&pDst[totalreadsamples * this->FrameSize], samplestoreadinloop, pExternalDecompressionBuffer);
+                                 } while (samplestoread && readsamples);
-                                 samplestoreadinloop -= readsamples;
+                             }
-                                 samplestoread       -= readsamples;
+                             else { // backward playback
-                                 totalreadsamples    += readsamples;
-                             } while (samplestoreadinloop && readsamples);
-                             SetPos(reverseplaybackend); // pretend we really read backwards
+                                 // as we can only read forward from disk, we have to
+                                 // determine the end position within the loop first,
+                                 // read forward from that 'end' and finally after
+                                 // reading, swap all sample frames so it reflects
+                                 // backward playback
+                                 unsigned long swapareastart       = totalreadsamples;
+                                 unsigned long loopoffset          = GetPos() - loop.LoopStart;
+                                 unsigned long samplestoreadinloop = Min(samplestoread, loopoffset);
+                                 unsigned long reverseplaybackend  = GetPos() - samplestoreadinloop;
+                                 SetPos(reverseplaybackend);
+                                 // read samples for backward playback
+                                 do {
+                                     readsamples          = Read(&pDst[totalreadsamples * this->FrameSize], samplestoreadinloop, pExternalDecompressionBuffer);
+                                     samplestoreadinloop -= readsamples;
+                                     samplestoread       -= readsamples;
+                                     totalreadsamples    += readsamples;
+                                 } while (samplestoreadinloop && readsamples);
+                                 SetPos(reverseplaybackend); // pretend we really read backwards
+                                 if (reverseplaybackend == loop.LoopStart) {
+                                     pPlaybackState->loop_cycles_left--;
+                                     pPlaybackState->reverse = false;
+                                 }
-                             if (reverseplaybackend == this->LoopStart) {
+                                 // reverse the sample frames for backward playback
-                                 pPlaybackState->loop_cycles_left--;
+                                 SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
-                                 pPlaybackState->reverse = false;
                              }
+                         } while (samplestoread && readsamples);
+                         break;
+                     }
-                             // reverse the sample frames for backward playback
+                     case loop_type_backward: { // TODO: not tested yet!
-                             SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
+                         // forward playback (not entered the loop yet)
-                         }
+                         if (!pPlaybackState->reverse) do {
-                     } while (samplestoread && readsamples);
+                             samplestoloopend  = loopEnd - GetPos();
-                     break;
+                             readsamples       = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
-                 }
+                             samplestoread    -= readsamples;
+                             totalreadsamples += readsamples;
-                 case loop_type_backward: { // TODO: not tested yet!
+                             if (readsamples == samplestoloopend) {
-                     // forward playback (not entered the loop yet)
+                                 pPlaybackState->reverse = true;
-                     if (!pPlaybackState->reverse) do {
+                                 break;
-                         samplestoloopend  = this->LoopEnd - GetPos();
+                             }
-                         readsamples       = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
+                         } while (samplestoread && readsamples);
-                         samplestoread    -= readsamples;
-                         totalreadsamples += readsamples;
-                         if (readsamples == samplestoloopend) {
-                             pPlaybackState->reverse = true;
-                             break;
-                         }
-                     } while (samplestoread && readsamples);
-                     if (!samplestoread) break;
+                         if (!samplestoread) break;
-                     // as we can only read forward from disk, we have to
+                         // as we can only read forward from disk, we have to
-                     // determine the end position within the loop first,
+                         // determine the end position within the loop first,
-                     // read forward from that 'end' and finally after
+                         // read forward from that 'end' and finally after
-                     // reading, swap all sample frames so it reflects
+                         // reading, swap all sample frames so it reflects
-                     // backward playback
+                         // backward playback
-                     unsigned long swapareastart       = totalreadsamples;
+                         unsigned long swapareastart       = totalreadsamples;
-                     unsigned long loopoffset          = GetPos() - this->LoopStart;
+                         unsigned long loopoffset          = GetPos() - loop.LoopStart;
-                     unsigned long samplestoreadinloop = (this->LoopPlayCount) ? Min(samplestoread, pPlaybackState->loop_cycles_left * LoopSize - loopoffset)
+                         unsigned long samplestoreadinloop = (this->LoopPlayCount) ? Min(samplestoread, pPlaybackState->loop_cycles_left * loop.LoopLength - loopoffset)
-                                                                               : samplestoread;
+                                                                                   : samplestoread;
-                     unsigned long reverseplaybackend  = this->LoopStart + Abs((loopoffset - samplestoreadinloop) % this->LoopSize);
+                         unsigned long reverseplaybackend  = loop.LoopStart + Abs((loopoffset - samplestoreadinloop) % loop.LoopLength);
-                     SetPos(reverseplaybackend);
+                         SetPos(reverseplaybackend);
-                     // read samples for backward playback
+                         // read samples for backward playback
-                     do {
+                         do {
-                         // if not endless loop check if max. number of loop cycles have been passed
+                             // if not endless loop check if max. number of loop cycles have been passed
-                         if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
+                             if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
-                         samplestoloopend     = this->LoopEnd - GetPos();
+                             samplestoloopend     = loopEnd - GetPos();
-                         readsamples          = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoreadinloop, samplestoloopend), pExternalDecompressionBuffer);
+                             readsamples          = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoreadinloop, samplestoloopend), pExternalDecompressionBuffer);
-                         samplestoreadinloop -= readsamples;
+                             samplestoreadinloop -= readsamples;
-                         samplestoread       -= readsamples;
+                             samplestoread       -= readsamples;
-                         totalreadsamples    += readsamples;
+                             totalreadsamples    += readsamples;
-                         if (readsamples == samplestoloopend) {
+                             if (readsamples == samplestoloopend) {
-                             pPlaybackState->loop_cycles_left--;
+                                 pPlaybackState->loop_cycles_left--;
-                             SetPos(this->LoopStart);
+                                 SetPos(loop.LoopStart);
-                         }
+                             }
-                     } while (samplestoreadinloop && readsamples);
+                         } while (samplestoreadinloop && readsamples);
-                     SetPos(reverseplaybackend); // pretend we really read backwards
+                         SetPos(reverseplaybackend); // pretend we really read backwards
-                     // reverse the sample frames for backward playback
+                         // reverse the sample frames for backward playback
-                     SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
+                         SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
-                     break;
+                         break;
-                 }
+                     }
-                 default: case loop_type_normal: {
+                     default: case loop_type_normal: {
-                     do {
+                         do {
-                         // if not endless loop check if max. number of loop cycles have been passed
+                             // if not endless loop check if max. number of loop cycles have been passed
-                         if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
+                             if (this->LoopPlayCount && !pPlaybackState->loop_cycles_left) break;
-                         samplestoloopend  = this->LoopEnd - GetPos();
+                             samplestoloopend  = loopEnd - GetPos();
-                         readsamples       = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
+                             readsamples       = Read(&pDst[totalreadsamples * this->FrameSize], Min(samplestoread, samplestoloopend), pExternalDecompressionBuffer);
-                         samplestoread    -= readsamples;
+                             samplestoread    -= readsamples;
-                         totalreadsamples += readsamples;
+                             totalreadsamples += readsamples;
-                         if (readsamples == samplestoloopend) {
+                             if (readsamples == samplestoloopend) {
-                             pPlaybackState->loop_cycles_left--;
+                                 pPlaybackState->loop_cycles_left--;
-                             SetPos(this->LoopStart);
+                                 SetPos(loop.LoopStart);
-                         }
+                             }
-                     } while (samplestoread && readsamples);
+                         } while (samplestoread && readsamples);
-                     break;
+                         break;
+                     }
                  }
              }
          }
-Line 741 
 namespace {
+Line 963 
 namespace {
       * have to use an external decompression buffer for <b>EACH</b>
       * streaming thread to avoid race conditions and crashes!
       *
+      * For 16 bit samples, the data in the buffer will be int16_t
+      * (using native endianness). For 24 bit, the buffer will
+      * contain three bytes per sample, little-endian.
+      *
       * @param pBuffer      destination buffer
       * @param SampleCount  number of sample points to read
       * @param pExternalDecompressionBuffer  (optional) external buffer to use for decompression
-Line 751 
 namespace {
+Line 977 
 namespace {
          if (SampleCount == 0) return 0;
          if (!Compressed) {
              if (BitDepth == 24) {
-                 // 24 bit sample. For now just truncate to 16 bit.
+                 return pCkData->Read(pBuffer, SampleCount * FrameSize, 1) / FrameSize;
-                 unsigned char* pSrc = (unsigned char*) ((pExternalDecompressionBuffer) ? pExternalDecompressionBuffer->pStart : this->InternalDecompressionBuffer.pStart);
-                 int16_t* pDst = static_cast<int16_t*>(pBuffer);
-                 if (Channels == 2) { // Stereo
-                     unsigned long readBytes = pCkData->Read(pSrc, SampleCount * 6, 1);
-                     pSrc++;
-                     for (unsigned long i = readBytes ; i > 0 ; i -= 3) {
-                         *pDst++ = get16(pSrc);
-                         pSrc += 3;
-                     }
-                     return (pDst - static_cast<int16_t*>(pBuffer)) >> 1;
-                 }
-                 else { // Mono
-                     unsigned long readBytes = pCkData->Read(pSrc, SampleCount * 3, 1);
-                     pSrc++;
-                     for (unsigned long i = readBytes ; i > 0 ; i -= 3) {
-                         *pDst++ = get16(pSrc);
-                         pSrc += 3;
-                     }
-                     return pDst - static_cast<int16_t*>(pBuffer);
-                 }
              }
              else { // 16 bit
                  // (pCkData->Read does endian correction)
-Line 801 
 namespace {
+Line 1007 
 namespace {
              unsigned char* pSrc = (unsigned char*) pDecompressionBuffer->pStart;
              int16_t* pDst = static_cast<int16_t*>(pBuffer);
+             uint8_t* pDst24 = static_cast<uint8_t*>(pBuffer);
              remainingbytes = pCkData->Read(pSrc, assumedsize, 1);
              while (remainingsamples && remainingbytes) {
-Line 882 
 namespace {
+Line 1089 
 namespace {
                              const unsigned char* const param_r = pSrc;
                              if (mode_r != 2) pSrc += 12;
-                             Decompress24(mode_l, param_l, 2, pSrc, pDst,
+                             Decompress24(mode_l, param_l, 6, pSrc, pDst24,
                                           skipsamples, copysamples, TruncatedBits);
-                             Decompress24(mode_r, param_r, 2, pSrc + rightChannelOffset, pDst + 1,
+                             Decompress24(mode_r, param_r, 6, pSrc + rightChannelOffset, pDst24 + 3,
                                           skipsamples, copysamples, TruncatedBits);
-                             pDst += copysamples << 1;
+                             pDst24 += copysamples * 6;
                          }
                          else { // Mono
-                             Decompress24(mode_l, param_l, 1, pSrc, pDst,
+                             Decompress24(mode_l, param_l, 3, pSrc, pDst24,
                                           skipsamples, copysamples, TruncatedBits);
-                             pDst += copysamples;
+                             pDst24 += copysamples * 3;
                          }
                      }
                      else { // 16 bit
-Line 933 
 namespace {
+Line 1140 
 namespace {
          }
      }
+     /** @brief Write sample wave data.
+      *
+      * Writes \a SampleCount number of sample points from the buffer pointed
+      * by \a pBuffer and increments the position within the sample. Use this
+      * method to directly write the sample data to disk, i.e. if you don't
+      * want or cannot load the whole sample data into RAM.
+      *
+      * You have to Resize() the sample to the desired size and call
+      * File::Save() <b>before</b> using Write().
+      *
+      * Note: there is currently no support for writing compressed samples.
+      *
+      * For 16 bit samples, the data in the source buffer should be
+      * int16_t (using native endianness). For 24 bit, the buffer
+      * should contain three bytes per sample, little-endian.
+      *
+      * @param pBuffer     - source buffer
+      * @param SampleCount - number of sample points to write
+      * @throws DLS::Exception if current sample size is too small
+      * @throws gig::Exception if sample is compressed
+      * @see DLS::LoadSampleData()
+      */
+     unsigned long Sample::Write(void* pBuffer, unsigned long SampleCount) {
+         if (Compressed) throw gig::Exception("There is no support for writing compressed gig samples (yet)");
+         // if this is the first write in this sample, reset the
+         // checksum calculator
+         if (pCkData->GetPos() == 0) {
+             crc.reset();
+         }
+         if (GetSize() < SampleCount) throw Exception("Could not write sample data, current sample size to small");
+         unsigned long res;
+         if (BitDepth == 24) {
+             res = pCkData->Write(pBuffer, SampleCount * FrameSize, 1) / FrameSize;
+         } else { // 16 bit
+             res = Channels == 2 ? pCkData->Write(pBuffer, SampleCount << 1, 2) >> 1
+                                 : pCkData->Write(pBuffer, SampleCount, 2);
+         }
+         crc.update((unsigned char *)pBuffer, SampleCount * FrameSize);
+         // if this is the last write, update the checksum chunk in the
+         // file
+         if (pCkData->GetPos() == pCkData->GetSize()) {
+             File* pFile = static_cast<File*>(GetParent());
+             pFile->SetSampleChecksum(this, crc.getValue());
+         }
+         return res;
+     }
      /**
       * Allocates a decompression buffer for streaming (compressed) samples
       * with Sample::Read(). If you are using more than one streaming thread
-Line 975 
 namespace {
+Line 1231 
 namespace {
          }
      }
+     /**
+      * Returns pointer to the Group this Sample belongs to. In the .gig
+      * format a sample always belongs to one group. If it wasn't explicitly
+      * assigned to a certain group, it will be automatically assigned to a
+      * default group.
+      *
+      * @returns Sample's Group (never NULL)
+      */
+     Group* Sample::GetGroup() const {
+         return pGroup;
+     }
      Sample::~Sample() {
          Instances--;
          if (!Instances && InternalDecompressionBuffer.Size) {
-Line 994 
 namespace {
+Line 1262 
 namespace {
      uint                               DimensionRegion::Instances       = 0;
      DimensionRegion::VelocityTableMap* DimensionRegion::pVelocityTables = NULL;
-     DimensionRegion::DimensionRegion(RIFF::List* _3ewl) : DLS::Sampler(_3ewl) {
+     DimensionRegion::DimensionRegion(Region* pParent, RIFF::List* _3ewl) : DLS::Sampler(_3ewl) {
          Instances++;
-         memcpy(&Crossfade, &SamplerOptions, 4);
+         pSample = NULL;
+         pRegion = pParent;
+         if (_3ewl->GetSubChunk(CHUNK_ID_WSMP)) memcpy(&Crossfade, &SamplerOptions, 4);
+         else memset(&Crossfade, 0, 4);
          if (!pVelocityTables) pVelocityTables = new VelocityTableMap;
          RIFF::Chunk* _3ewa = _3ewl->GetSubChunk(CHUNK_ID_3EWA);
-         _3ewa->ReadInt32(); // unknown, always 0x0000008C ?
+         if (_3ewa) { // if '3ewa' chunk exists
-         LFO3Frequency = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
+             _3ewa->ReadInt32(); // unknown, always == chunk size ?
-         EG3Attack     = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
+             LFO3Frequency = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-         _3ewa->ReadInt16(); // unknown
+             EG3Attack     = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-         LFO1InternalDepth = _3ewa->ReadUint16();
+             _3ewa->ReadInt16(); // unknown
-         _3ewa->ReadInt16(); // unknown
+             LFO1InternalDepth = _3ewa->ReadUint16();
-         LFO3InternalDepth = _3ewa->ReadInt16();
+             _3ewa->ReadInt16(); // unknown
-         _3ewa->ReadInt16(); // unknown
+             LFO3InternalDepth = _3ewa->ReadInt16();
-         LFO1ControlDepth = _3ewa->ReadUint16();
+             _3ewa->ReadInt16(); // unknown
-         _3ewa->ReadInt16(); // unknown
+             LFO1ControlDepth = _3ewa->ReadUint16();
-         LFO3ControlDepth = _3ewa->ReadInt16();
+             _3ewa->ReadInt16(); // unknown
-         EG1Attack           = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
+             LFO3ControlDepth = _3ewa->ReadInt16();
-         EG1Decay1           = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
+             EG1Attack           = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-         _3ewa->ReadInt16(); // unknown
+             EG1Decay1           = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-         EG1Sustain          = _3ewa->ReadUint16();
+             _3ewa->ReadInt16(); // unknown
-         EG1Release          = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
+             EG1Sustain          = _3ewa->ReadUint16();
-         EG1Controller       = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
+             EG1Release          = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-         uint8_t eg1ctrloptions        = _3ewa->ReadUint8();
+             EG1Controller       = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
-         EG1ControllerInvert           = eg1ctrloptions & 0x01;
+             uint8_t eg1ctrloptions        = _3ewa->ReadUint8();
-         EG1ControllerAttackInfluence  = GIG_EG_CTR_ATTACK_INFLUENCE_EXTRACT(eg1ctrloptions);
+             EG1ControllerInvert           = eg1ctrloptions & 0x01;
-         EG1ControllerDecayInfluence   = GIG_EG_CTR_DECAY_INFLUENCE_EXTRACT(eg1ctrloptions);
+             EG1ControllerAttackInfluence  = GIG_EG_CTR_ATTACK_INFLUENCE_EXTRACT(eg1ctrloptions);
-         EG1ControllerReleaseInfluence = GIG_EG_CTR_RELEASE_INFLUENCE_EXTRACT(eg1ctrloptions);
+             EG1ControllerDecayInfluence   = GIG_EG_CTR_DECAY_INFLUENCE_EXTRACT(eg1ctrloptions);
-         EG2Controller       = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
+             EG1ControllerReleaseInfluence = GIG_EG_CTR_RELEASE_INFLUENCE_EXTRACT(eg1ctrloptions);
-         uint8_t eg2ctrloptions        = _3ewa->ReadUint8();
+             EG2Controller       = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
-         EG2ControllerInvert           = eg2ctrloptions & 0x01;
+             uint8_t eg2ctrloptions        = _3ewa->ReadUint8();
-         EG2ControllerAttackInfluence  = GIG_EG_CTR_ATTACK_INFLUENCE_EXTRACT(eg2ctrloptions);
+             EG2ControllerInvert           = eg2ctrloptions & 0x01;
-         EG2ControllerDecayInfluence   = GIG_EG_CTR_DECAY_INFLUENCE_EXTRACT(eg2ctrloptions);
+             EG2ControllerAttackInfluence  = GIG_EG_CTR_ATTACK_INFLUENCE_EXTRACT(eg2ctrloptions);
-         EG2ControllerReleaseInfluence = GIG_EG_CTR_RELEASE_INFLUENCE_EXTRACT(eg2ctrloptions);
+             EG2ControllerDecayInfluence   = GIG_EG_CTR_DECAY_INFLUENCE_EXTRACT(eg2ctrloptions);
-         LFO1Frequency    = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
+             EG2ControllerReleaseInfluence = GIG_EG_CTR_RELEASE_INFLUENCE_EXTRACT(eg2ctrloptions);
-         EG2Attack        = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
+             LFO1Frequency    = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-         EG2Decay1        = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
+             EG2Attack        = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-         _3ewa->ReadInt16(); // unknown
+             EG2Decay1        = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-         EG2Sustain       = _3ewa->ReadUint16();
+             _3ewa->ReadInt16(); // unknown
-         EG2Release       = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
+             EG2Sustain       = _3ewa->ReadUint16();
-         _3ewa->ReadInt16(); // unknown
+             EG2Release       = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-         LFO2ControlDepth = _3ewa->ReadUint16();
+             _3ewa->ReadInt16(); // unknown
-         LFO2Frequency    = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
+             LFO2ControlDepth = _3ewa->ReadUint16();
-         _3ewa->ReadInt16(); // unknown
+             LFO2Frequency    = (double) GIG_EXP_DECODE(_3ewa->ReadInt32());
-         LFO2InternalDepth = _3ewa->ReadUint16();
+             _3ewa->ReadInt16(); // unknown
-         int32_t eg1decay2 = _3ewa->ReadInt32();
+             LFO2InternalDepth = _3ewa->ReadUint16();
-         EG1Decay2          = (double) GIG_EXP_DECODE(eg1decay2);
+             int32_t eg1decay2 = _3ewa->ReadInt32();
-         EG1InfiniteSustain = (eg1decay2 == 0x7fffffff);
+             EG1Decay2          = (double) GIG_EXP_DECODE(eg1decay2);
-         _3ewa->ReadInt16(); // unknown
+             EG1InfiniteSustain = (eg1decay2 == 0x7fffffff);
-         EG1PreAttack      = _3ewa->ReadUint16();
+             _3ewa->ReadInt16(); // unknown
-         int32_t eg2decay2 = _3ewa->ReadInt32();
+             EG1PreAttack      = _3ewa->ReadUint16();
-         EG2Decay2         = (double) GIG_EXP_DECODE(eg2decay2);
+             int32_t eg2decay2 = _3ewa->ReadInt32();
-         EG2InfiniteSustain = (eg2decay2 == 0x7fffffff);
+             EG2Decay2         = (double) GIG_EXP_DECODE(eg2decay2);
-         _3ewa->ReadInt16(); // unknown
+             EG2InfiniteSustain = (eg2decay2 == 0x7fffffff);
-         EG2PreAttack      = _3ewa->ReadUint16();
+             _3ewa->ReadInt16(); // unknown
-         uint8_t velocityresponse = _3ewa->ReadUint8();
+             EG2PreAttack      = _3ewa->ReadUint16();
-         if (velocityresponse < 5) {
+             uint8_t velocityresponse = _3ewa->ReadUint8();
-             VelocityResponseCurve = curve_type_nonlinear;
+             if (velocityresponse < 5) {
-             VelocityResponseDepth = velocityresponse;
+                 VelocityResponseCurve = curve_type_nonlinear;
-         }
+                 VelocityResponseDepth = velocityresponse;
-         else if (velocityresponse < 10) {
+             } else if (velocityresponse < 10) {
-             VelocityResponseCurve = curve_type_linear;
+                 VelocityResponseCurve = curve_type_linear;
-             VelocityResponseDepth = velocityresponse - 5;
+                 VelocityResponseDepth = velocityresponse - 5;
-         }
+             } else if (velocityresponse < 15) {
-         else if (velocityresponse < 15) {
+                 VelocityResponseCurve = curve_type_special;
-             VelocityResponseCurve = curve_type_special;
+                 VelocityResponseDepth = velocityresponse - 10;
-             VelocityResponseDepth = velocityresponse - 10;
+             } else {
-         }
+                 VelocityResponseCurve = curve_type_unknown;
-         else {
+                 VelocityResponseDepth = 0;
-             VelocityResponseCurve = curve_type_unknown;
+             }
-             VelocityResponseDepth = 0;
+             uint8_t releasevelocityresponse = _3ewa->ReadUint8();
-         }
+             if (releasevelocityresponse < 5) {
-         uint8_t releasevelocityresponse = _3ewa->ReadUint8();
+                 ReleaseVelocityResponseCurve = curve_type_nonlinear;
-         if (releasevelocityresponse < 5) {
+                 ReleaseVelocityResponseDepth = releasevelocityresponse;
-             ReleaseVelocityResponseCurve = curve_type_nonlinear;
+             } else if (releasevelocityresponse < 10) {
-             ReleaseVelocityResponseDepth = releasevelocityresponse;
+                 ReleaseVelocityResponseCurve = curve_type_linear;
-         }
+                 ReleaseVelocityResponseDepth = releasevelocityresponse - 5;
-         else if (releasevelocityresponse < 10) {
+             } else if (releasevelocityresponse < 15) {
-             ReleaseVelocityResponseCurve = curve_type_linear;
+                 ReleaseVelocityResponseCurve = curve_type_special;
-             ReleaseVelocityResponseDepth = releasevelocityresponse - 5;
+                 ReleaseVelocityResponseDepth = releasevelocityresponse - 10;
-         }
+             } else {
-         else if (releasevelocityresponse < 15) {
+                 ReleaseVelocityResponseCurve = curve_type_unknown;
-             ReleaseVelocityResponseCurve = curve_type_special;
+                 ReleaseVelocityResponseDepth = 0;
-             ReleaseVelocityResponseDepth = releasevelocityresponse - 10;
+             }
-         }
+             VelocityResponseCurveScaling = _3ewa->ReadUint8();
-         else {
+             AttenuationControllerThreshold = _3ewa->ReadInt8();
-             ReleaseVelocityResponseCurve = curve_type_unknown;
+             _3ewa->ReadInt32(); // unknown
-             ReleaseVelocityResponseDepth = 0;
+             SampleStartOffset = (uint16_t) _3ewa->ReadInt16();
-         }
+             _3ewa->ReadInt16(); // unknown
-         VelocityResponseCurveScaling = _3ewa->ReadUint8();
+             uint8_t pitchTrackDimensionBypass = _3ewa->ReadInt8();
-         AttenuationControllerThreshold = _3ewa->ReadInt8();
+             PitchTrack = GIG_PITCH_TRACK_EXTRACT(pitchTrackDimensionBypass);
-         _3ewa->ReadInt32(); // unknown
+             if      (pitchTrackDimensionBypass & 0x10) DimensionBypass = dim_bypass_ctrl_94;
-         SampleStartOffset = (uint16_t) _3ewa->ReadInt16();
+             else if (pitchTrackDimensionBypass & 0x20) DimensionBypass = dim_bypass_ctrl_95;
-         _3ewa->ReadInt16(); // unknown
+             else                                       DimensionBypass = dim_bypass_ctrl_none;
-         uint8_t pitchTrackDimensionBypass = _3ewa->ReadInt8();
+             uint8_t pan = _3ewa->ReadUint8();
-         PitchTrack = GIG_PITCH_TRACK_EXTRACT(pitchTrackDimensionBypass);
+             Pan         = (pan < 64) ? pan : -((int)pan - 63); // signed 7 bit -> signed 8 bit
-         if      (pitchTrackDimensionBypass & 0x10) DimensionBypass = dim_bypass_ctrl_94;
+             SelfMask = _3ewa->ReadInt8() & 0x01;
-         else if (pitchTrackDimensionBypass & 0x20) DimensionBypass = dim_bypass_ctrl_95;
+             _3ewa->ReadInt8(); // unknown
-         else                                       DimensionBypass = dim_bypass_ctrl_none;
+             uint8_t lfo3ctrl = _3ewa->ReadUint8();
-         uint8_t pan = _3ewa->ReadUint8();
+             LFO3Controller           = static_cast<lfo3_ctrl_t>(lfo3ctrl & 0x07); // lower 3 bits
-         Pan         = (pan < 64) ? pan : -((int)pan - 63); // signed 7 bit -> signed 8 bit
+             LFO3Sync                 = lfo3ctrl & 0x20; // bit 5
-         SelfMask = _3ewa->ReadInt8() & 0x01;
+             InvertAttenuationController = lfo3ctrl & 0x80; // bit 7
-         _3ewa->ReadInt8(); // unknown
+             AttenuationController  = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
-         uint8_t lfo3ctrl = _3ewa->ReadUint8();
+             uint8_t lfo2ctrl       = _3ewa->ReadUint8();
-         LFO3Controller           = static_cast<lfo3_ctrl_t>(lfo3ctrl & 0x07); // lower 3 bits
+             LFO2Controller         = static_cast<lfo2_ctrl_t>(lfo2ctrl & 0x07); // lower 3 bits
-         LFO3Sync                 = lfo3ctrl & 0x20; // bit 5
+             LFO2FlipPhase          = lfo2ctrl & 0x80; // bit 7
-         InvertAttenuationController = lfo3ctrl & 0x80; // bit 7
+             LFO2Sync               = lfo2ctrl & 0x20; // bit 5
-         AttenuationController  = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
+             bool extResonanceCtrl  = lfo2ctrl & 0x40; // bit 6
-         uint8_t lfo2ctrl       = _3ewa->ReadUint8();
+             uint8_t lfo1ctrl       = _3ewa->ReadUint8();
-         LFO2Controller         = static_cast<lfo2_ctrl_t>(lfo2ctrl & 0x07); // lower 3 bits
+             LFO1Controller         = static_cast<lfo1_ctrl_t>(lfo1ctrl & 0x07); // lower 3 bits
-         LFO2FlipPhase          = lfo2ctrl & 0x80; // bit 7
+             LFO1FlipPhase          = lfo1ctrl & 0x80; // bit 7
-         LFO2Sync               = lfo2ctrl & 0x20; // bit 5
+             LFO1Sync               = lfo1ctrl & 0x40; // bit 6
-         bool extResonanceCtrl  = lfo2ctrl & 0x40; // bit 6
+             VCFResonanceController = (extResonanceCtrl) ? static_cast<vcf_res_ctrl_t>(GIG_VCF_RESONANCE_CTRL_EXTRACT(lfo1ctrl))
-         uint8_t lfo1ctrl       = _3ewa->ReadUint8();
+                                                         : vcf_res_ctrl_none;
-         LFO1Controller         = static_cast<lfo1_ctrl_t>(lfo1ctrl & 0x07); // lower 3 bits
+             uint16_t eg3depth = _3ewa->ReadUint16();
-         LFO1FlipPhase          = lfo1ctrl & 0x80; // bit 7
+             EG3Depth = (eg3depth <= 1200) ? eg3depth /* positives */
-         LFO1Sync               = lfo1ctrl & 0x40; // bit 6
+                                         : (-1) * (int16_t) ((eg3depth ^ 0xffff) + 1); /* binary complementary for negatives */
-         VCFResonanceController = (extResonanceCtrl) ? static_cast<vcf_res_ctrl_t>(GIG_VCF_RESONANCE_CTRL_EXTRACT(lfo1ctrl))
+             _3ewa->ReadInt16(); // unknown
-                                                     : vcf_res_ctrl_none;
+             ChannelOffset = _3ewa->ReadUint8() / 4;
-         uint16_t eg3depth = _3ewa->ReadUint16();
+             uint8_t regoptions = _3ewa->ReadUint8();
-         EG3Depth = (eg3depth <= 1200) ? eg3depth /* positives */
+             MSDecode           = regoptions & 0x01; // bit 0
-                                       : (-1) * (int16_t) ((eg3depth ^ 0xffff) + 1); /* binary complementary for negatives */
+             SustainDefeat      = regoptions & 0x02; // bit 1
-         _3ewa->ReadInt16(); // unknown
+             _3ewa->ReadInt16(); // unknown
-         ChannelOffset = _3ewa->ReadUint8() / 4;
+             VelocityUpperLimit = _3ewa->ReadInt8();
-         uint8_t regoptions = _3ewa->ReadUint8();
+             _3ewa->ReadInt8(); // unknown
-         MSDecode           = regoptions & 0x01; // bit 0
+             _3ewa->ReadInt16(); // unknown
-         SustainDefeat      = regoptions & 0x02; // bit 1
+             ReleaseTriggerDecay = _3ewa->ReadUint8(); // release trigger decay
-         _3ewa->ReadInt16(); // unknown
+             _3ewa->ReadInt8(); // unknown
-         VelocityUpperLimit = _3ewa->ReadInt8();
+             _3ewa->ReadInt8(); // unknown
-         _3ewa->ReadInt8(); // unknown
+             EG1Hold = _3ewa->ReadUint8() & 0x80; // bit 7
-         _3ewa->ReadInt16(); // unknown
+             uint8_t vcfcutoff = _3ewa->ReadUint8();
-         ReleaseTriggerDecay = _3ewa->ReadUint8(); // release trigger decay
+             VCFEnabled = vcfcutoff & 0x80; // bit 7
-         _3ewa->ReadInt8(); // unknown
+             VCFCutoff  = vcfcutoff & 0x7f; // lower 7 bits
-         _3ewa->ReadInt8(); // unknown
+             VCFCutoffController = static_cast<vcf_cutoff_ctrl_t>(_3ewa->ReadUint8());
-         EG1Hold = _3ewa->ReadUint8() & 0x80; // bit 7
+             uint8_t vcfvelscale = _3ewa->ReadUint8();
-         uint8_t vcfcutoff = _3ewa->ReadUint8();
+             VCFCutoffControllerInvert = vcfvelscale & 0x80; // bit 7
-         VCFEnabled = vcfcutoff & 0x80; // bit 7
+             VCFVelocityScale = vcfvelscale & 0x7f; // lower 7 bits
-         VCFCutoff  = vcfcutoff & 0x7f; // lower 7 bits
+             _3ewa->ReadInt8(); // unknown
-         VCFCutoffController = static_cast<vcf_cutoff_ctrl_t>(_3ewa->ReadUint8());
+             uint8_t vcfresonance = _3ewa->ReadUint8();
-         uint8_t vcfvelscale = _3ewa->ReadUint8();
+             VCFResonance = vcfresonance & 0x7f; // lower 7 bits
-         VCFCutoffControllerInvert = vcfvelscale & 0x80; // bit 7
+             VCFResonanceDynamic = !(vcfresonance & 0x80); // bit 7
-         VCFVelocityScale = vcfvelscale & 0x7f; // lower 7 bits
+             uint8_t vcfbreakpoint         = _3ewa->ReadUint8();
-         _3ewa->ReadInt8(); // unknown
+             VCFKeyboardTracking           = vcfbreakpoint & 0x80; // bit 7
-         uint8_t vcfresonance = _3ewa->ReadUint8();
+             VCFKeyboardTrackingBreakpoint = vcfbreakpoint & 0x7f; // lower 7 bits
-         VCFResonance = vcfresonance & 0x7f; // lower 7 bits
+             uint8_t vcfvelocity = _3ewa->ReadUint8();
-         VCFResonanceDynamic = !(vcfresonance & 0x80); // bit 7
+             VCFVelocityDynamicRange = vcfvelocity % 5;
-         uint8_t vcfbreakpoint         = _3ewa->ReadUint8();
+             VCFVelocityCurve        = static_cast<curve_type_t>(vcfvelocity / 5);
-         VCFKeyboardTracking           = vcfbreakpoint & 0x80; // bit 7
+             VCFType = static_cast<vcf_type_t>(_3ewa->ReadUint8());
-         VCFKeyboardTrackingBreakpoint = vcfbreakpoint & 0x7f; // lower 7 bits
+             if (VCFType == vcf_type_lowpass) {
-         uint8_t vcfvelocity = _3ewa->ReadUint8();
+                 if (lfo3ctrl & 0x40) // bit 6
-         VCFVelocityDynamicRange = vcfvelocity % 5;
+                     VCFType = vcf_type_lowpassturbo;
-         VCFVelocityCurve        = static_cast<curve_type_t>(vcfvelocity / 5);
+             }
-         VCFType = static_cast<vcf_type_t>(_3ewa->ReadUint8());
+             if (_3ewa->RemainingBytes() >= 8) {
-         if (VCFType == vcf_type_lowpass) {
+                 _3ewa->Read(DimensionUpperLimits, 1, 8);
-             if (lfo3ctrl & 0x40) // bit 6
+             } else {
-                 VCFType = vcf_type_lowpassturbo;
+                 memset(DimensionUpperLimits, 0, 8);
+             }
+         } else { // '3ewa' chunk does not exist yet
+             // use default values
+             LFO3Frequency                   = 1.0;
+             EG3Attack                       = 0.0;
+             LFO1InternalDepth               = 0;
+             LFO3InternalDepth               = 0;
+             LFO1ControlDepth                = 0;
+             LFO3ControlDepth                = 0;
+             EG1Attack                       = 0.0;
+             EG1Decay1                       = 0.005;
+             EG1Sustain                      = 1000;
+             EG1Release                      = 0.3;
+             EG1Controller.type              = eg1_ctrl_t::type_none;
+             EG1Controller.controller_number = 0;
+             EG1ControllerInvert             = false;
+             EG1ControllerAttackInfluence    = 0;
+             EG1ControllerDecayInfluence     = 0;
+             EG1ControllerReleaseInfluence   = 0;
+             EG2Controller.type              = eg2_ctrl_t::type_none;
+             EG2Controller.controller_number = 0;
+             EG2ControllerInvert             = false;
+             EG2ControllerAttackInfluence    = 0;
+             EG2ControllerDecayInfluence     = 0;
+             EG2ControllerReleaseInfluence   = 0;
+             LFO1Frequency                   = 1.0;
+             EG2Attack                       = 0.0;
+             EG2Decay1                       = 0.005;
+             EG2Sustain                      = 1000;
+             EG2Release                      = 0.3;
+             LFO2ControlDepth                = 0;
+             LFO2Frequency                   = 1.0;
+             LFO2InternalDepth               = 0;
+             EG1Decay2                       = 0.0;
+             EG1InfiniteSustain              = true;
+             EG1PreAttack                    = 0;
+             EG2Decay2                       = 0.0;
+             EG2InfiniteSustain              = true;
+             EG2PreAttack                    = 0;
+             VelocityResponseCurve           = curve_type_nonlinear;
+             VelocityResponseDepth           = 3;
+             ReleaseVelocityResponseCurve    = curve_type_nonlinear;
+             ReleaseVelocityResponseDepth    = 3;
+             VelocityResponseCurveScaling    = 32;
+             AttenuationControllerThreshold  = 0;
+             SampleStartOffset               = 0;
+             PitchTrack                      = true;
+             DimensionBypass                 = dim_bypass_ctrl_none;
+             Pan                             = 0;
+             SelfMask                        = true;
+             LFO3Controller                  = lfo3_ctrl_modwheel;
+             LFO3Sync                        = false;
+             InvertAttenuationController     = false;
+             AttenuationController.type      = attenuation_ctrl_t::type_none;
+             AttenuationController.controller_number = 0;
+             LFO2Controller                  = lfo2_ctrl_internal;
+             LFO2FlipPhase                   = false;
+             LFO2Sync                        = false;
+             LFO1Controller                  = lfo1_ctrl_internal;
+             LFO1FlipPhase                   = false;
+             LFO1Sync                        = false;
+             VCFResonanceController          = vcf_res_ctrl_none;
+             EG3Depth                        = 0;
+             ChannelOffset                   = 0;
+             MSDecode                        = false;
+             SustainDefeat                   = false;
+             VelocityUpperLimit              = 0;
+             ReleaseTriggerDecay             = 0;
+             EG1Hold                         = false;
+             VCFEnabled                      = false;
+             VCFCutoff                       = 0;
+             VCFCutoffController             = vcf_cutoff_ctrl_none;
+             VCFCutoffControllerInvert       = false;
+             VCFVelocityScale                = 0;
+             VCFResonance                    = 0;
+             VCFResonanceDynamic             = false;
+             VCFKeyboardTracking             = false;
+             VCFKeyboardTrackingBreakpoint   = 0;
+             VCFVelocityDynamicRange         = 0x04;
+             VCFVelocityCurve                = curve_type_linear;
+             VCFType                         = vcf_type_lowpass;
+             memset(DimensionUpperLimits, 127, 8);
          }
          pVelocityAttenuationTable = GetVelocityTable(VelocityResponseCurve,
-Line 1182 
 namespace {
+Line 1537 
 namespace {
              depth = 5;
          }
          pVelocityCutoffTable = GetVelocityTable(curveType, depth,
-                                                 VCFCutoffController == vcf_cutoff_ctrl_none ? VCFVelocityScale : 0);
+                                                 VCFCutoffController <= vcf_cutoff_ctrl_none2 ? VCFVelocityScale : 0);
          SampleAttenuation = pow(10.0, -Gain / (20.0 * 655360));
+         VelocityTable = 0;
+     }
+     /*
+      * Constructs a DimensionRegion by copying all parameters from
+      * another DimensionRegion
+      */
+     DimensionRegion::DimensionRegion(RIFF::List* _3ewl, const DimensionRegion& src) : DLS::Sampler(_3ewl) {
+         Instances++;
+         *this = src; // default memberwise shallow copy of all parameters
+         pParentList = _3ewl; // restore the chunk pointer
+         // deep copy of owned structures
+         if (src.VelocityTable) {
+             VelocityTable = new uint8_t[128];
+             for (int k = 0 ; k < 128 ; k++)
+                 VelocityTable[k] = src.VelocityTable[k];
+         }
+         if (src.pSampleLoops) {
+             pSampleLoops = new DLS::sample_loop_t[src.SampleLoops];
+             for (int k = 0 ; k < src.SampleLoops ; k++)
+                 pSampleLoops[k] = src.pSampleLoops[k];
+         }
+     }
+     /**
+      * Apply dimension region settings to the respective RIFF chunks. You
+      * have to call File::Save() to make changes persistent.
+      *
+      * Usually there is absolutely no need to call this method explicitly.
+      * It will be called automatically when File::Save() was called.
+      */
+     void DimensionRegion::UpdateChunks() {
+         // first update base class's chunk
+         DLS::Sampler::UpdateChunks();
+         RIFF::Chunk* wsmp = pParentList->GetSubChunk(CHUNK_ID_WSMP);
+         uint8_t* pData = (uint8_t*) wsmp->LoadChunkData();
+         pData[12] = Crossfade.in_start;
+         pData[13] = Crossfade.in_end;
+         pData[14] = Crossfade.out_start;
+         pData[15] = Crossfade.out_end;
+         // make sure '3ewa' chunk exists
+         RIFF::Chunk* _3ewa = pParentList->GetSubChunk(CHUNK_ID_3EWA);
+         if (!_3ewa) {
+             File* pFile = (File*) GetParent()->GetParent()->GetParent();
+             bool version3 = pFile->pVersion && pFile->pVersion->major == 3;
+             _3ewa = pParentList->AddSubChunk(CHUNK_ID_3EWA, version3 ? 148 : 140);
+         }
+         pData = (uint8_t*) _3ewa->LoadChunkData();
+         // update '3ewa' chunk with DimensionRegion's current settings
+         const uint32_t chunksize = _3ewa->GetNewSize();
+         store32(&pData[0], chunksize); // unknown, always chunk size?
+         const int32_t lfo3freq = (int32_t) GIG_EXP_ENCODE(LFO3Frequency);
+         store32(&pData[4], lfo3freq);
+         const int32_t eg3attack = (int32_t) GIG_EXP_ENCODE(EG3Attack);
+         store32(&pData[8], eg3attack);
+         // next 2 bytes unknown
+         store16(&pData[14], LFO1InternalDepth);
+         // next 2 bytes unknown
+         store16(&pData[18], LFO3InternalDepth);
+         // next 2 bytes unknown
+         store16(&pData[22], LFO1ControlDepth);
+         // next 2 bytes unknown
+         store16(&pData[26], LFO3ControlDepth);
+         const int32_t eg1attack = (int32_t) GIG_EXP_ENCODE(EG1Attack);
+         store32(&pData[28], eg1attack);
+         const int32_t eg1decay1 = (int32_t) GIG_EXP_ENCODE(EG1Decay1);
+         store32(&pData[32], eg1decay1);
+         // next 2 bytes unknown
+         store16(&pData[38], EG1Sustain);
+         const int32_t eg1release = (int32_t) GIG_EXP_ENCODE(EG1Release);
+         store32(&pData[40], eg1release);
+         const uint8_t eg1ctl = (uint8_t) EncodeLeverageController(EG1Controller);
+         pData[44] = eg1ctl;
+         const uint8_t eg1ctrloptions =
+             (EG1ControllerInvert ? 0x01 : 0x00) |
+             GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(EG1ControllerAttackInfluence) |
+             GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(EG1ControllerDecayInfluence) |
+             GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(EG1ControllerReleaseInfluence);
+         pData[45] = eg1ctrloptions;
+         const uint8_t eg2ctl = (uint8_t) EncodeLeverageController(EG2Controller);
+         pData[46] = eg2ctl;
+         const uint8_t eg2ctrloptions =
+             (EG2ControllerInvert ? 0x01 : 0x00) |
+             GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(EG2ControllerAttackInfluence) |
+             GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(EG2ControllerDecayInfluence) |
+             GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(EG2ControllerReleaseInfluence);
+         pData[47] = eg2ctrloptions;
+         const int32_t lfo1freq = (int32_t) GIG_EXP_ENCODE(LFO1Frequency);
+         store32(&pData[48], lfo1freq);
+         const int32_t eg2attack = (int32_t) GIG_EXP_ENCODE(EG2Attack);
+         store32(&pData[52], eg2attack);
+         const int32_t eg2decay1 = (int32_t) GIG_EXP_ENCODE(EG2Decay1);
+         store32(&pData[56], eg2decay1);
+         // next 2 bytes unknown
+         store16(&pData[62], EG2Sustain);
+         const int32_t eg2release = (int32_t) GIG_EXP_ENCODE(EG2Release);
+         store32(&pData[64], eg2release);
+         // next 2 bytes unknown
+         store16(&pData[70], LFO2ControlDepth);
+         const int32_t lfo2freq = (int32_t) GIG_EXP_ENCODE(LFO2Frequency);
+         store32(&pData[72], lfo2freq);
+         // next 2 bytes unknown
+         store16(&pData[78], LFO2InternalDepth);
+         const int32_t eg1decay2 = (int32_t) (EG1InfiniteSustain) ? 0x7fffffff : (int32_t) GIG_EXP_ENCODE(EG1Decay2);
+         store32(&pData[80], eg1decay2);
+         // next 2 bytes unknown
+         store16(&pData[86], EG1PreAttack);
+         const int32_t eg2decay2 = (int32_t) (EG2InfiniteSustain) ? 0x7fffffff : (int32_t) GIG_EXP_ENCODE(EG2Decay2);
+         store32(&pData[88], eg2decay2);
+         // next 2 bytes unknown
+         store16(&pData[94], EG2PreAttack);
+         {
+             if (VelocityResponseDepth > 4) throw Exception("VelocityResponseDepth must be between 0 and 4");
+             uint8_t velocityresponse = VelocityResponseDepth;
+             switch (VelocityResponseCurve) {
+                 case curve_type_nonlinear:
+                     break;
+                 case curve_type_linear:
+                     velocityresponse += 5;
+                     break;
+                 case curve_type_special:
+                     velocityresponse += 10;
+                     break;
+                 case curve_type_unknown:
+                 default:
+                     throw Exception("Could not update DimensionRegion's chunk, unknown VelocityResponseCurve selected");
+             }
+             pData[96] = velocityresponse;
+         }
+         {
+             if (ReleaseVelocityResponseDepth > 4) throw Exception("ReleaseVelocityResponseDepth must be between 0 and 4");
+             uint8_t releasevelocityresponse = ReleaseVelocityResponseDepth;
+             switch (ReleaseVelocityResponseCurve) {
+                 case curve_type_nonlinear:
+                     break;
+                 case curve_type_linear:
+                     releasevelocityresponse += 5;
+                     break;
+                 case curve_type_special:
+                     releasevelocityresponse += 10;
+                     break;
+                 case curve_type_unknown:
+                 default:
+                     throw Exception("Could not update DimensionRegion's chunk, unknown ReleaseVelocityResponseCurve selected");
+             }
+             pData[97] = releasevelocityresponse;
+         }
+         pData[98] = VelocityResponseCurveScaling;
+         pData[99] = AttenuationControllerThreshold;
+         // next 4 bytes unknown
+         store16(&pData[104], SampleStartOffset);
+         // next 2 bytes unknown
+         {
+             uint8_t pitchTrackDimensionBypass = GIG_PITCH_TRACK_ENCODE(PitchTrack);
+             switch (DimensionBypass) {
+                 case dim_bypass_ctrl_94:
+                     pitchTrackDimensionBypass |= 0x10;
+                     break;
+                 case dim_bypass_ctrl_95:
+                     pitchTrackDimensionBypass |= 0x20;
+                     break;
+                 case dim_bypass_ctrl_none:
+                     //FIXME: should we set anything here?
+                     break;
+                 default:
+                     throw Exception("Could not update DimensionRegion's chunk, unknown DimensionBypass selected");
+             }
+             pData[108] = pitchTrackDimensionBypass;
+         }
+         const uint8_t pan = (Pan >= 0) ? Pan : ((-Pan) + 63); // signed 8 bit -> signed 7 bit
+         pData[109] = pan;
+         const uint8_t selfmask = (SelfMask) ? 0x01 : 0x00;
+         pData[110] = selfmask;
+         // next byte unknown
+         {
+             uint8_t lfo3ctrl = LFO3Controller & 0x07; // lower 3 bits
+             if (LFO3Sync) lfo3ctrl |= 0x20; // bit 5
+             if (InvertAttenuationController) lfo3ctrl |= 0x80; // bit 7
+             if (VCFType == vcf_type_lowpassturbo) lfo3ctrl |= 0x40; // bit 6
+             pData[112] = lfo3ctrl;
+         }
+         const uint8_t attenctl = EncodeLeverageController(AttenuationController);
+         pData[113] = attenctl;
+         {
+             uint8_t lfo2ctrl = LFO2Controller & 0x07; // lower 3 bits
+             if (LFO2FlipPhase) lfo2ctrl |= 0x80; // bit 7
+             if (LFO2Sync)      lfo2ctrl |= 0x20; // bit 5
+             if (VCFResonanceController != vcf_res_ctrl_none) lfo2ctrl |= 0x40; // bit 6
+             pData[114] = lfo2ctrl;
+         }
+         {
+             uint8_t lfo1ctrl = LFO1Controller & 0x07; // lower 3 bits
+             if (LFO1FlipPhase) lfo1ctrl |= 0x80; // bit 7
+             if (LFO1Sync)      lfo1ctrl |= 0x40; // bit 6
+             if (VCFResonanceController != vcf_res_ctrl_none)
+                 lfo1ctrl |= GIG_VCF_RESONANCE_CTRL_ENCODE(VCFResonanceController);
+             pData[115] = lfo1ctrl;
+         }
+         const uint16_t eg3depth = (EG3Depth >= 0) ? EG3Depth
+                                                   : uint16_t(((-EG3Depth) - 1) ^ 0xffff); /* binary complementary for negatives */
+         pData[116] = eg3depth;
+         // next 2 bytes unknown
+         const uint8_t channeloffset = ChannelOffset * 4;
+         pData[120] = channeloffset;
+         {
+             uint8_t regoptions = 0;
+             if (MSDecode)      regoptions |= 0x01; // bit 0
+             if (SustainDefeat) regoptions |= 0x02; // bit 1
+             pData[121] = regoptions;
+         }
+         // next 2 bytes unknown
+         pData[124] = VelocityUpperLimit;
+         // next 3 bytes unknown
+         pData[128] = ReleaseTriggerDecay;
+         // next 2 bytes unknown
+         const uint8_t eg1hold = (EG1Hold) ? 0x80 : 0x00; // bit 7
+         pData[131] = eg1hold;
+         const uint8_t vcfcutoff = (VCFEnabled ? 0x80 : 0x00) |  /* bit 7 */
+                                   (VCFCutoff & 0x7f);   /* lower 7 bits */
+         pData[132] = vcfcutoff;
+         pData[133] = VCFCutoffController;
+         const uint8_t vcfvelscale = (VCFCutoffControllerInvert ? 0x80 : 0x00) | /* bit 7 */
+                                     (VCFVelocityScale & 0x7f); /* lower 7 bits */
+         pData[134] = vcfvelscale;
+         // next byte unknown
+         const uint8_t vcfresonance = (VCFResonanceDynamic ? 0x00 : 0x80) | /* bit 7 */
+                                      (VCFResonance & 0x7f); /* lower 7 bits */
+         pData[136] = vcfresonance;
+         const uint8_t vcfbreakpoint = (VCFKeyboardTracking ? 0x80 : 0x00) | /* bit 7 */
+                                       (VCFKeyboardTrackingBreakpoint & 0x7f); /* lower 7 bits */
+         pData[137] = vcfbreakpoint;
+         const uint8_t vcfvelocity = VCFVelocityDynamicRange % 5 |
+                                     VCFVelocityCurve * 5;
+         pData[138] = vcfvelocity;
+         const uint8_t vcftype = (VCFType == vcf_type_lowpassturbo) ? vcf_type_lowpass : VCFType;
+         pData[139] = vcftype;
+         if (chunksize >= 148) {
+             memcpy(&pData[140], DimensionUpperLimits, 8);
+         }
      }
      // get the corresponding velocity table from the table map or create & calculate that table if it doesn't exist yet
-Line 1202 
 namespace {
+Line 1871 
 namespace {
          return table;
      }
+     Region* DimensionRegion::GetParent() const {
+         return pRegion;
+     }
      leverage_ctrl_t DimensionRegion::DecodeLeverageController(_lev_ctrl_t EncodedController) {
          leverage_ctrl_t decodedcontroller;
          switch (EncodedController) {
-Line 1320 
 namespace {
+Line 1993 
 namespace {
          return decodedcontroller;
      }
+     DimensionRegion::_lev_ctrl_t DimensionRegion::EncodeLeverageController(leverage_ctrl_t DecodedController) {
+         _lev_ctrl_t encodedcontroller;
+         switch (DecodedController.type) {
+             // special controller
+             case leverage_ctrl_t::type_none:
+                 encodedcontroller = _lev_ctrl_none;
+                 break;
+             case leverage_ctrl_t::type_velocity:
+                 encodedcontroller = _lev_ctrl_velocity;
+                 break;
+             case leverage_ctrl_t::type_channelaftertouch:
+                 encodedcontroller = _lev_ctrl_channelaftertouch;
+                 break;
+             // ordinary MIDI control change controller
+             case leverage_ctrl_t::type_controlchange:
+                 switch (DecodedController.controller_number) {
+                     case 1:
+                         encodedcontroller = _lev_ctrl_modwheel;
+                         break;
+                     case 2:
+                         encodedcontroller = _lev_ctrl_breath;
+                         break;
+                     case 4:
+                         encodedcontroller = _lev_ctrl_foot;
+                         break;
+                     case 12:
+                         encodedcontroller = _lev_ctrl_effect1;
+                         break;
+                     case 13:
+                         encodedcontroller = _lev_ctrl_effect2;
+                         break;
+                     case 16:
+                         encodedcontroller = _lev_ctrl_genpurpose1;
+                         break;
+                     case 17:
+                         encodedcontroller = _lev_ctrl_genpurpose2;
+                         break;
+                     case 18:
+                         encodedcontroller = _lev_ctrl_genpurpose3;
+                         break;
+                     case 19:
+                         encodedcontroller = _lev_ctrl_genpurpose4;
+                         break;
+                     case 5:
+                         encodedcontroller = _lev_ctrl_portamentotime;
+                         break;
+                     case 64:
+                         encodedcontroller = _lev_ctrl_sustainpedal;
+                         break;
+                     case 65:
+                         encodedcontroller = _lev_ctrl_portamento;
+                         break;
+                     case 66:
+                         encodedcontroller = _lev_ctrl_sostenutopedal;
+                         break;
+                     case 67:
+                         encodedcontroller = _lev_ctrl_softpedal;
+                         break;
+                     case 80:
+                         encodedcontroller = _lev_ctrl_genpurpose5;
+                         break;
+                     case 81:
+                         encodedcontroller = _lev_ctrl_genpurpose6;
+                         break;
+                     case 82:
+                         encodedcontroller = _lev_ctrl_genpurpose7;
+                         break;
+                     case 83:
+                         encodedcontroller = _lev_ctrl_genpurpose8;
+                         break;
+                     case 91:
+                         encodedcontroller = _lev_ctrl_effect1depth;
+                         break;
+                     case 92:
+                         encodedcontroller = _lev_ctrl_effect2depth;
+                         break;
+                     case 93:
+                         encodedcontroller = _lev_ctrl_effect3depth;
+                         break;
+                     case 94:
+                         encodedcontroller = _lev_ctrl_effect4depth;
+                         break;
+                     case 95:
+                         encodedcontroller = _lev_ctrl_effect5depth;
+                         break;
+                     default:
+                         throw gig::Exception("leverage controller number is not supported by the gig format");
+                 }
+                 break;
+             default:
+                 throw gig::Exception("Unknown leverage controller type.");
+         }
+         return encodedcontroller;
+     }
      DimensionRegion::~DimensionRegion() {
          Instances--;
          if (!Instances) {
-Line 1333 
 namespace {
+Line 2102 
 namespace {
              delete pVelocityTables;
              pVelocityTables = NULL;
          }
+         if (VelocityTable) delete[] VelocityTable;
      }
      /**
-Line 1449 
 namespace {
+Line 2219 
 namespace {
              for (int i = 0; i < dimensionBits; i++) {
                  dimension_t dimension = static_cast<dimension_t>(_3lnk->ReadUint8());
                  uint8_t     bits      = _3lnk->ReadUint8();
+                 _3lnk->ReadUint8(); // bit position of the dimension (bits[0] + bits[1] + ... + bits[i-1])
+                 _3lnk->ReadUint8(); // (1 << bit position of next dimension) - (1 << bit position of this dimension)
+                 uint8_t     zones     = _3lnk->ReadUint8(); // new for v3: number of zones doesn't have to be == pow(2,bits)
                  if (dimension == dimension_none) { // inactive dimension
                      pDimensionDefinitions[i].dimension  = dimension_none;
                      pDimensionDefinitions[i].bits       = 0;
                      pDimensionDefinitions[i].zones      = 0;
                      pDimensionDefinitions[i].split_type = split_type_bit;
-                     pDimensionDefinitions[i].ranges     = NULL;
                      pDimensionDefinitions[i].zone_size  = 0;
                  }
                  else { // active dimension
                      pDimensionDefinitions[i].dimension = dimension;
                      pDimensionDefinitions[i].bits      = bits;
-                     pDimensionDefinitions[i].zones     = 0x01 << bits; // = pow(2,bits)
+                     pDimensionDefinitions[i].zones     = zones ? zones : 0x01 << bits; // = pow(2,bits)
-                     pDimensionDefinitions[i].split_type = (dimension == dimension_layer ||
+                     pDimensionDefinitions[i].split_type = __resolveSplitType(dimension);
-                                                            dimension == dimension_samplechannel ||
+                     pDimensionDefinitions[i].zone_size  = __resolveZoneSize(pDimensionDefinitions[i]);
-                                                            dimension == dimension_releasetrigger ||
-                                                            dimension == dimension_roundrobin ||
-                                                            dimension == dimension_random) ? split_type_bit
-                                                                                           : split_type_normal;
-                     pDimensionDefinitions[i].ranges = NULL; // it's not possible to check velocity dimensions for custom defined ranges at this point
-                     pDimensionDefinitions[i].zone_size  =
-                         (pDimensionDefinitions[i].split_type == split_type_normal) ? 128 / pDimensionDefinitions[i].zones
-                                                                                    : 0;
                      Dimensions++;
                      // if this is a layer dimension, remember the amount of layers
                      if (dimension == dimension_layer) Layers = pDimensionDefinitions[i].zones;
                  }
-                 _3lnk->SetPos(6, RIFF::stream_curpos); // jump forward to next dimension definition
+                 _3lnk->SetPos(3, RIFF::stream_curpos); // jump forward to next dimension definition
              }
+             for (int i = dimensionBits ; i < 8 ; i++) pDimensionDefinitions[i].bits = 0;
-             // check velocity dimension (if there is one) for custom defined zone ranges
+             // if there's a velocity dimension and custom velocity zone splits are used,
-             for (uint i = 0; i < Dimensions; i++) {
+             // update the VelocityTables in the dimension regions
-                 dimension_def_t* pDimDef = pDimensionDefinitions + i;
+             UpdateVelocityTable();
-                 if (pDimDef->dimension == dimension_velocity) {
-                     if (pDimensionRegions[0]->VelocityUpperLimit == 0) {
-                         // no custom defined ranges
-                         pDimDef->split_type = split_type_normal;
-                         pDimDef->ranges     = NULL;
-                     }
-                     else { // custom defined ranges
-                         pDimDef->split_type = split_type_customvelocity;
-                         pDimDef->ranges     = new range_t[pDimDef->zones];
-                         uint8_t bits[8] = { 0 };
-                         int previousUpperLimit = -1;
-                         for (int velocityZone = 0; velocityZone < pDimDef->zones; velocityZone++) {
-                             bits[i] = velocityZone;
-                             DimensionRegion* pDimRegion = GetDimensionRegionByBit(bits);
-                             pDimDef->ranges[velocityZone].low  = previousUpperLimit + 1;
-                             pDimDef->ranges[velocityZone].high = pDimRegion->VelocityUpperLimit;
-                             previousUpperLimit = pDimDef->ranges[velocityZone].high;
-                             // fill velocity table
-                             for (int i = pDimDef->ranges[velocityZone].low; i <= pDimDef->ranges[velocityZone].high; i++) {
-                                 VelocityTable[i] = velocityZone;
-                             }
-                         }
-                     }
-                 }
-             }
              // jump to start of the wave pool indices (if not already there)
-             File* file = (File*) GetParent()->GetParent();
              if (file->pVersion && file->pVersion->major == 3)
                  _3lnk->SetPos(68); // version 3 has a different 3lnk structure
              else
-Line 1519 
 namespace {
+Line 2257 
 namespace {
              // load sample references
              for (uint i = 0; i < DimensionRegions; i++) {
                  uint32_t wavepoolindex = _3lnk->ReadUint32();
-                 pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
+                 if (file->pWavePoolTable) pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
              }
+             GetSample(); // load global region sample reference
+         } else {
+             DimensionRegions = 0;
+             for (int i = 0 ; i < 8 ; i++) {
+                 pDimensionDefinitions[i].dimension  = dimension_none;
+                 pDimensionDefinitions[i].bits       = 0;
+                 pDimensionDefinitions[i].zones      = 0;
+             }
+         }
+         // make sure there is at least one dimension region
+         if (!DimensionRegions) {
+             RIFF::List* _3prg = rgnList->GetSubList(LIST_TYPE_3PRG);
+             if (!_3prg) _3prg = rgnList->AddSubList(LIST_TYPE_3PRG);
+             RIFF::List* _3ewl = _3prg->AddSubList(LIST_TYPE_3EWL);
+             pDimensionRegions[0] = new DimensionRegion(this, _3ewl);
+             DimensionRegions = 1;
+         }
+     }
+     /**
+      * Apply Region settings and all its DimensionRegions to the respective
+      * RIFF chunks. You have to call File::Save() to make changes persistent.
+      *
+      * Usually there is absolutely no need to call this method explicitly.
+      * It will be called automatically when File::Save() was called.
+      *
+      * @throws gig::Exception if samples cannot be dereferenced
+      */
+     void Region::UpdateChunks() {
+         // in the gig format we don't care about the Region's sample reference
+         // but we still have to provide some existing one to not corrupt the
+         // file, so to avoid the latter we simply always assign the sample of
+         // the first dimension region of this region
+         pSample = pDimensionRegions[0]->pSample;
+         // first update base class's chunks
+         DLS::Region::UpdateChunks();
+         // update dimension region's chunks
+         for (int i = 0; i < DimensionRegions; i++) {
+             pDimensionRegions[i]->UpdateChunks();
+         }
+         File* pFile = (File*) GetParent()->GetParent();
+         bool version3 = pFile->pVersion && pFile->pVersion->major == 3;
+         const int iMaxDimensions =  version3 ? 8 : 5;
+         const int iMaxDimensionRegions = version3 ? 256 : 32;
+         // make sure '3lnk' chunk exists
+         RIFF::Chunk* _3lnk = pCkRegion->GetSubChunk(CHUNK_ID_3LNK);
+         if (!_3lnk) {
+             const int _3lnkChunkSize = version3 ? 1092 : 172;
+             _3lnk = pCkRegion->AddSubChunk(CHUNK_ID_3LNK, _3lnkChunkSize);
+             memset(_3lnk->LoadChunkData(), 0, _3lnkChunkSize);
+             // move 3prg to last position
+             pCkRegion->MoveSubChunk(pCkRegion->GetSubList(LIST_TYPE_3PRG), 0);
+         }
+         // update dimension definitions in '3lnk' chunk
+         uint8_t* pData = (uint8_t*) _3lnk->LoadChunkData();
+         store32(&pData[0], DimensionRegions);
+         int shift = 0;
+         for (int i = 0; i < iMaxDimensions; i++) {
+             pData[4 + i * 8] = (uint8_t) pDimensionDefinitions[i].dimension;
+             pData[5 + i * 8] = pDimensionDefinitions[i].bits;
+             pData[6 + i * 8] = pDimensionDefinitions[i].dimension == dimension_none ? 0 : shift;
+             pData[7 + i * 8] = (1 << (shift + pDimensionDefinitions[i].bits)) - (1 << shift);
+             pData[8 + i * 8] = pDimensionDefinitions[i].zones;
+             // next 3 bytes unknown, always zero?
+             shift += pDimensionDefinitions[i].bits;
+         }
+         // update wave pool table in '3lnk' chunk
+         const int iWavePoolOffset = version3 ? 68 : 44;
+         for (uint i = 0; i < iMaxDimensionRegions; i++) {
+             int iWaveIndex = -1;
+             if (i < DimensionRegions) {
+                 if (!pFile->pSamples || !pFile->pSamples->size()) throw gig::Exception("Could not update gig::Region, there are no samples");
+                 File::SampleList::iterator iter = pFile->pSamples->begin();
+                 File::SampleList::iterator end  = pFile->pSamples->end();
+                 for (int index = 0; iter != end; ++iter, ++index) {
+                     if (*iter == pDimensionRegions[i]->pSample) {
+                         iWaveIndex = index;
+                         break;
+                     }
+                 }
+             }
+             store32(&pData[iWavePoolOffset + i * 4], iWaveIndex);
          }
-         else throw gig::Exception("Mandatory <3lnk> chunk not found.");
      }
      void Region::LoadDimensionRegions(RIFF::List* rgn) {
-Line 1532 
 namespace {
+Line 2360 
 namespace {
              RIFF::List* _3ewl = _3prg->GetFirstSubList();
              while (_3ewl) {
                  if (_3ewl->GetListType() == LIST_TYPE_3EWL) {
-                     pDimensionRegions[dimensionRegionNr] = new DimensionRegion(_3ewl);
+                     pDimensionRegions[dimensionRegionNr] = new DimensionRegion(this, _3ewl);
                      dimensionRegionNr++;
                  }
                  _3ewl = _3prg->GetNextSubList();
-Line 1541 
 namespace {
+Line 2369 
 namespace {
          }
      }
-     Region::~Region() {
+     void Region::UpdateVelocityTable() {
-         for (uint i = 0; i < Dimensions; i++) {
+         // get velocity dimension's index
-             if (pDimensionDefinitions[i].ranges) delete[] pDimensionDefinitions[i].ranges;
+         int veldim = -1;
+         for (int i = 0 ; i < Dimensions ; i++) {
+             if (pDimensionDefinitions[i].dimension == gig::dimension_velocity) {
+                 veldim = i;
+                 break;
+             }
+         }
+         if (veldim == -1) return;
+         int step = 1;
+         for (int i = 0 ; i < veldim ; i++) step <<= pDimensionDefinitions[i].bits;
+         int skipveldim = (step << pDimensionDefinitions[veldim].bits) - step;
+         int end = step * pDimensionDefinitions[veldim].zones;
+         // loop through all dimension regions for all dimensions except the velocity dimension
+         int dim[8] = { 0 };
+         for (int i = 0 ; i < DimensionRegions ; i++) {
+             if (pDimensionRegions[i]->DimensionUpperLimits[veldim] ||
+                 pDimensionRegions[i]->VelocityUpperLimit) {
+                 // create the velocity table
+                 uint8_t* table = pDimensionRegions[i]->VelocityTable;
+                 if (!table) {
+                     table = new uint8_t[128];
+                     pDimensionRegions[i]->VelocityTable = table;
+                 }
+                 int tableidx = 0;
+                 int velocityZone = 0;
+                 if (pDimensionRegions[i]->DimensionUpperLimits[veldim]) { // gig3
+                     for (int k = i ; k < end ; k += step) {
+                         DimensionRegion *d = pDimensionRegions[k];
+                         for (; tableidx <= d->DimensionUpperLimits[veldim] ; tableidx++) table[tableidx] = velocityZone;
+                         velocityZone++;
+                     }
+                 } else { // gig2
+                     for (int k = i ; k < end ; k += step) {
+                         DimensionRegion *d = pDimensionRegions[k];
+                         for (; tableidx <= d->VelocityUpperLimit ; tableidx++) table[tableidx] = velocityZone;
+                         velocityZone++;
+                     }
+                 }
+             } else {
+                 if (pDimensionRegions[i]->VelocityTable) {
+                     delete[] pDimensionRegions[i]->VelocityTable;
+                     pDimensionRegions[i]->VelocityTable = 0;
+                 }
+             }
+             int j;
+             int shift = 0;
+             for (j = 0 ; j < Dimensions ; j++) {
+                 if (j == veldim) i += skipveldim; // skip velocity dimension
+                 else {
+                     dim[j]++;
+                     if (dim[j] < pDimensionDefinitions[j].zones) break;
+                     else {
+                         // skip unused dimension regions
+                         dim[j] = 0;
+                         i += ((1 << pDimensionDefinitions[j].bits) -
+                               pDimensionDefinitions[j].zones) << shift;
+                     }
+                 }
+                 shift += pDimensionDefinitions[j].bits;
+             }
+             if (j == Dimensions) break;
          }
+     }
+     /** @brief Einstein would have dreamed of it - create a new dimension.
+      *
+      * Creates a new dimension with the dimension definition given by
+      * \a pDimDef. The appropriate amount of DimensionRegions will be created.
+      * There is a hard limit of dimensions and total amount of "bits" all
+      * dimensions can have. This limit is dependant to what gig file format
+      * version this file refers to. The gig v2 (and lower) format has a
+      * dimension limit and total amount of bits limit of 5, whereas the gig v3
+      * format has a limit of 8.
+      *
+      * @param pDimDef - defintion of the new dimension
+      * @throws gig::Exception if dimension of the same type exists already
+      * @throws gig::Exception if amount of dimensions or total amount of
+      *                        dimension bits limit is violated
+      */
+     void Region::AddDimension(dimension_def_t* pDimDef) {
+         // check if max. amount of dimensions reached
+         File* file = (File*) GetParent()->GetParent();
+         const int iMaxDimensions = (file->pVersion && file->pVersion->major == 3) ? 8 : 5;
+         if (Dimensions >= iMaxDimensions)
+             throw gig::Exception("Could not add new dimension, max. amount of " + ToString(iMaxDimensions) + " dimensions already reached");
+         // check if max. amount of dimension bits reached
+         int iCurrentBits = 0;
+         for (int i = 0; i < Dimensions; i++)
+             iCurrentBits += pDimensionDefinitions[i].bits;
+         if (iCurrentBits >= iMaxDimensions)
+             throw gig::Exception("Could not add new dimension, max. amount of " + ToString(iMaxDimensions) + " dimension bits already reached");
+         const int iNewBits = iCurrentBits + pDimDef->bits;
+         if (iNewBits > iMaxDimensions)
+             throw gig::Exception("Could not add new dimension, new dimension would exceed max. amount of " + ToString(iMaxDimensions) + " dimension bits");
+         // check if there's already a dimensions of the same type
+         for (int i = 0; i < Dimensions; i++)
+             if (pDimensionDefinitions[i].dimension == pDimDef->dimension)
+                 throw gig::Exception("Could not add new dimension, there is already a dimension of the same type");
+         // pos is where the new dimension should be placed, normally
+         // last in list, except for the samplechannel dimension which
+         // has to be first in list
+         int pos = pDimDef->dimension == dimension_samplechannel ? 0 : Dimensions;
+         int bitpos = 0;
+         for (int i = 0 ; i < pos ; i++)
+             bitpos += pDimensionDefinitions[i].bits;
+         // make room for the new dimension
+         for (int i = Dimensions ; i > pos ; i--) pDimensionDefinitions[i] = pDimensionDefinitions[i - 1];
+         for (int i = 0 ; i < (1 << iCurrentBits) ; i++) {
+             for (int j = Dimensions ; j > pos ; j--) {
+                 pDimensionRegions[i]->DimensionUpperLimits[j] =
+                     pDimensionRegions[i]->DimensionUpperLimits[j - 1];
+             }
+         }
+         // assign definition of new dimension
+         pDimensionDefinitions[pos] = *pDimDef;
+         // auto correct certain dimension definition fields (where possible)
+         pDimensionDefinitions[pos].split_type  =
+             __resolveSplitType(pDimensionDefinitions[pos].dimension);
+         pDimensionDefinitions[pos].zone_size =
+             __resolveZoneSize(pDimensionDefinitions[pos]);
+         // create new dimension region(s) for this new dimension, and make
+         // sure that the dimension regions are placed correctly in both the
+         // RIFF list and the pDimensionRegions array
+         RIFF::Chunk* moveTo = NULL;
+         RIFF::List* _3prg = pCkRegion->GetSubList(LIST_TYPE_3PRG);
+         for (int i = (1 << iCurrentBits) - (1 << bitpos) ; i >= 0 ; i -= (1 << bitpos)) {
+             for (int k = 0 ; k < (1 << bitpos) ; k++) {
+                 pDimensionRegions[(i << pDimDef->bits) + k] = pDimensionRegions[i + k];
+             }
+             for (int j = 1 ; j < (1 << pDimDef->bits) ; j++) {
+                 for (int k = 0 ; k < (1 << bitpos) ; k++) {
+                     RIFF::List* pNewDimRgnListChunk = _3prg->AddSubList(LIST_TYPE_3EWL);
+                     if (moveTo) _3prg->MoveSubChunk(pNewDimRgnListChunk, moveTo);
+                     // create a new dimension region and copy all parameter values from
+                     // an existing dimension region
+                     pDimensionRegions[(i << pDimDef->bits) + (j << bitpos) + k] =
+                         new DimensionRegion(pNewDimRgnListChunk, *pDimensionRegions[i + k]);
+                     DimensionRegions++;
+                 }
+             }
+             moveTo = pDimensionRegions[i]->pParentList;
+         }
+         // initialize the upper limits for this dimension
+         int mask = (1 << bitpos) - 1;
+         for (int z = 0 ; z < pDimDef->zones ; z++) {
+             uint8_t upperLimit = uint8_t((z + 1) * 128.0 / pDimDef->zones - 1);
+             for (int i = 0 ; i < 1 << iCurrentBits ; i++) {
+                 pDimensionRegions[((i & ~mask) << pDimDef->bits) |
+                                   (z << bitpos) |
+                                   (i & mask)]->DimensionUpperLimits[pos] = upperLimit;
+             }
+         }
+         Dimensions++;
+         // if this is a layer dimension, update 'Layers' attribute
+         if (pDimDef->dimension == dimension_layer) Layers = pDimDef->zones;
+         UpdateVelocityTable();
+     }
+     /** @brief Delete an existing dimension.
+      *
+      * Deletes the dimension given by \a pDimDef and deletes all respective
+      * dimension regions, that is all dimension regions where the dimension's
+      * bit(s) part is greater than 0. In case of a 'sustain pedal' dimension
+      * for example this would delete all dimension regions for the case(s)
+      * where the sustain pedal is pressed down.
+      *
+      * @param pDimDef - dimension to delete
+      * @throws gig::Exception if given dimension cannot be found
+      */
+     void Region::DeleteDimension(dimension_def_t* pDimDef) {
+         // get dimension's index
+         int iDimensionNr = -1;
+         for (int i = 0; i < Dimensions; i++) {
+             if (&pDimensionDefinitions[i] == pDimDef) {
+                 iDimensionNr = i;
+                 break;
+             }
+         }
+         if (iDimensionNr < 0) throw gig::Exception("Invalid dimension_def_t pointer");
+         // get amount of bits below the dimension to delete
+         int iLowerBits = 0;
+         for (int i = 0; i < iDimensionNr; i++)
+             iLowerBits += pDimensionDefinitions[i].bits;
+         // get amount ot bits above the dimension to delete
+         int iUpperBits = 0;
+         for (int i = iDimensionNr + 1; i < Dimensions; i++)
+             iUpperBits += pDimensionDefinitions[i].bits;
+         RIFF::List* _3prg = pCkRegion->GetSubList(LIST_TYPE_3PRG);
+         // delete dimension regions which belong to the given dimension
+         // (that is where the dimension's bit > 0)
+         for (int iUpperBit = 0; iUpperBit < 1 << iUpperBits; iUpperBit++) {
+             for (int iObsoleteBit = 1; iObsoleteBit < 1 << pDimensionDefinitions[iDimensionNr].bits; iObsoleteBit++) {
+                 for (int iLowerBit = 0; iLowerBit < 1 << iLowerBits; iLowerBit++) {
+                     int iToDelete = iUpperBit    << (pDimensionDefinitions[iDimensionNr].bits + iLowerBits) |
+                                     iObsoleteBit << iLowerBits |
+                                     iLowerBit;
+                     _3prg->DeleteSubChunk(pDimensionRegions[iToDelete]->pParentList);
+                     delete pDimensionRegions[iToDelete];
+                     pDimensionRegions[iToDelete] = NULL;
+                     DimensionRegions--;
+                 }
+             }
+         }
+         // defrag pDimensionRegions array
+         // (that is remove the NULL spaces within the pDimensionRegions array)
+         for (int iFrom = 2, iTo = 1; iFrom < 256 && iTo < 256 - 1; iTo++) {
+             if (!pDimensionRegions[iTo]) {
+                 if (iFrom <= iTo) iFrom = iTo + 1;
+                 while (!pDimensionRegions[iFrom] && iFrom < 256) iFrom++;
+                 if (iFrom < 256 && pDimensionRegions[iFrom]) {
+                     pDimensionRegions[iTo]   = pDimensionRegions[iFrom];
+                     pDimensionRegions[iFrom] = NULL;
+                 }
+             }
+         }
+         // remove the this dimension from the upper limits arrays
+         for (int j = 0 ; j < 256 && pDimensionRegions[j] ; j++) {
+             DimensionRegion* d = pDimensionRegions[j];
+             for (int i = iDimensionNr + 1; i < Dimensions; i++) {
+                 d->DimensionUpperLimits[i - 1] = d->DimensionUpperLimits[i];
+             }
+             d->DimensionUpperLimits[Dimensions - 1] = 127;
+         }
+         // 'remove' dimension definition
+         for (int i = iDimensionNr + 1; i < Dimensions; i++) {
+             pDimensionDefinitions[i - 1] = pDimensionDefinitions[i];
+         }
+         pDimensionDefinitions[Dimensions - 1].dimension = dimension_none;
+         pDimensionDefinitions[Dimensions - 1].bits      = 0;
+         pDimensionDefinitions[Dimensions - 1].zones     = 0;
+         Dimensions--;
+         // if this was a layer dimension, update 'Layers' attribute
+         if (pDimDef->dimension == dimension_layer) Layers = 1;
+     }
+     Region::~Region() {
          for (int i = 0; i < 256; i++) {
              if (pDimensionRegions[i]) delete pDimensionRegions[i];
          }
-Line 1569 
 namespace {
+Line 2655 
 namespace {
       * @see             Dimensions
       */
      DimensionRegion* Region::GetDimensionRegionByValue(const uint DimValues[8]) {
-         uint8_t bits[8] = { 0 };
+         uint8_t bits;
+         int veldim = -1;
+         int velbitpos;
+         int bitpos = 0;
+         int dimregidx = 0;
          for (uint i = 0; i < Dimensions; i++) {
-             bits[i] = DimValues[i];
+             if (pDimensionDefinitions[i].dimension == dimension_velocity) {
-             switch (pDimensionDefinitions[i].split_type) {
+                 // the velocity dimension must be handled after the other dimensions
-                 case split_type_normal:
+                 veldim = i;
-                     bits[i] /= pDimensionDefinitions[i].zone_size;
+                 velbitpos = bitpos;
-                     break;
+             } else {
-                 case split_type_customvelocity:
+                 switch (pDimensionDefinitions[i].split_type) {
-                     bits[i] = VelocityTable[bits[i]];
+                     case split_type_normal:
-                     break;
+                         if (pDimensionRegions[0]->DimensionUpperLimits[i]) {
-                 case split_type_bit: // the value is already the sought dimension bit number
+                             // gig3: all normal dimensions (not just the velocity dimension) have custom zone ranges
-                     const uint8_t limiter_mask = (0xff << pDimensionDefinitions[i].bits) ^ 0xff;
+                             for (bits = 0 ; bits < pDimensionDefinitions[i].zones ; bits++) {
-                     bits[i] = bits[i] & limiter_mask; // just make sure the value don't uses more bits than allowed
+                                 if (DimValues[i] <= pDimensionRegions[bits << bitpos]->DimensionUpperLimits[i]) break;
-                     break;
+                             }
-             }
+                         } else {
+                             // gig2: evenly sized zones
+                             bits = uint8_t(DimValues[i] / pDimensionDefinitions[i].zone_size);
+                         }
+                         break;
+                     case split_type_bit: // the value is already the sought dimension bit number
+                         const uint8_t limiter_mask = (0xff << pDimensionDefinitions[i].bits) ^ 0xff;
+                         bits = DimValues[i] & limiter_mask; // just make sure the value doesn't use more bits than allowed
+                         break;
+                 }
+                 dimregidx |= bits << bitpos;
+             }
+             bitpos += pDimensionDefinitions[i].bits;
+         }
+         DimensionRegion* dimreg = pDimensionRegions[dimregidx];
+         if (veldim != -1) {
+             // (dimreg is now the dimension region for the lowest velocity)
+             if (dimreg->VelocityTable) // custom defined zone ranges
+                 bits = dimreg->VelocityTable[DimValues[veldim]];
+             else // normal split type
+                 bits = uint8_t(DimValues[veldim] / pDimensionDefinitions[veldim].zone_size);
+             dimregidx |= bits << velbitpos;
+             dimreg = pDimensionRegions[dimregidx];
          }
-         return GetDimensionRegionByBit(bits);
+         return dimreg;
      }
      /**
-Line 1625 
 namespace {
+Line 2738 
 namespace {
      Sample* Region::GetSampleFromWavePool(unsigned int WavePoolTableIndex, progress_t* pProgress) {
          if ((int32_t)WavePoolTableIndex == -1) return NULL;
          File* file = (File*) GetParent()->GetParent();
+         if (!file->pWavePoolTable) return NULL;
          unsigned long soughtoffset = file->pWavePoolTable[WavePoolTableIndex];
          unsigned long soughtfileno = file->pWavePoolTableHi[WavePoolTableIndex];
          Sample* sample = file->GetFirstSample(pProgress);
          while (sample) {
              if (sample->ulWavePoolOffset == soughtoffset &&
-                 sample->FileNo == soughtfileno) return static_cast<gig::Sample*>(pSample = sample);
+                 sample->FileNo == soughtfileno) return static_cast<gig::Sample*>(sample);
              sample = file->GetNextSample();
          }
          return NULL;
-Line 1642 
 namespace {
+Line 2756 
 namespace {
  // *
      Instrument::Instrument(File* pFile, RIFF::List* insList, progress_t* pProgress) : DLS::Instrument((DLS::File*)pFile, insList) {
+         static const DLS::Info::FixedStringLength fixedStringLengths[] = {
+             { CHUNK_ID_INAM, 64 },
+             { CHUNK_ID_ISFT, 12 },
+             { 0, 0 }
+         };
+         pInfo->FixedStringLengths = fixedStringLengths;
          // Initialization
          for (int i = 0; i < 128; i++) RegionKeyTable[i] = NULL;
-         RegionIndex = -1;
+         EffectSend = 0;
+         Attenuation = 0;
+         FineTune = 0;
+         PitchbendRange = 0;
+         PianoReleaseMode = false;
+         DimensionKeyRange.low = 0;
+         DimensionKeyRange.high = 0;
          // Loading
          RIFF::List* lart = insList->GetSubList(LIST_TYPE_LART);
-Line 1660 
 namespace {
+Line 2787 
 namespace {
                  DimensionKeyRange.low  = dimkeystart >> 1;
                  DimensionKeyRange.high = _3ewg->ReadUint8();
              }
-             else throw gig::Exception("Mandatory <3ewg> chunk not found.");
          }
-         else throw gig::Exception("Mandatory <lart> list chunk not found.");
+         if (!pRegions) pRegions = new RegionList;
          RIFF::List* lrgn = insList->GetSubList(LIST_TYPE_LRGN);
-         if (!lrgn) throw gig::Exception("Mandatory chunks in <ins > chunk not found.");
+         if (lrgn) {
-         pRegions = new Region*[Regions];
+             RIFF::List* rgn = lrgn->GetFirstSubList();
-         for (uint i = 0; i < Regions; i++) pRegions[i] = NULL;
+             while (rgn) {
-         RIFF::List* rgn = lrgn->GetFirstSubList();
+                 if (rgn->GetListType() == LIST_TYPE_RGN) {
-         unsigned int iRegion = 0;
+                     __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);
-         while (rgn) {
+                     pRegions->push_back(new Region(this, rgn));
-             if (rgn->GetListType() == LIST_TYPE_RGN) {
+                 }
-                 __notify_progress(pProgress, (float) iRegion / (float) Regions);
+                 rgn = lrgn->GetNextSubList();
-                 pRegions[iRegion] = new Region(this, rgn);
-                 iRegion++;
-             }
-             rgn = lrgn->GetNextSubList();
-         }
-         // Creating Region Key Table for fast lookup
-         for (uint iReg = 0; iReg < Regions; iReg++) {
-             for (int iKey = pRegions[iReg]->KeyRange.low; iKey <= pRegions[iReg]->KeyRange.high; iKey++) {
-                 RegionKeyTable[iKey] = pRegions[iReg];
              }
+             // Creating Region Key Table for fast lookup
+             UpdateRegionKeyTable();
          }
          __notify_progress(pProgress, 1.0f); // notify done
      }
-     Instrument::~Instrument() {
+     void Instrument::UpdateRegionKeyTable() {
-         for (uint i = 0; i < Regions; i++) {
+         RegionList::iterator iter = pRegions->begin();
-             if (pRegions) {
+         RegionList::iterator end  = pRegions->end();
-                 if (pRegions[i]) delete (pRegions[i]);
+         for (; iter != end; ++iter) {
+             gig::Region* pRegion = static_cast<gig::Region*>(*iter);
+             for (int iKey = pRegion->KeyRange.low; iKey <= pRegion->KeyRange.high; iKey++) {
+                 RegionKeyTable[iKey] = pRegion;
              }
          }
-         if (pRegions) delete[] pRegions;
+     }
+     Instrument::~Instrument() {
+     }
+     /**
+      * Apply Instrument with all its Regions to the respective RIFF chunks.
+      * You have to call File::Save() to make changes persistent.
+      *
+      * Usually there is absolutely no need to call this method explicitly.
+      * It will be called automatically when File::Save() was called.
+      *
+      * @throws gig::Exception if samples cannot be dereferenced
+      */
+     void Instrument::UpdateChunks() {
+         // first update base classes' chunks
+         DLS::Instrument::UpdateChunks();
+         // update Regions' chunks
+         {
+             RegionList::iterator iter = pRegions->begin();
+             RegionList::iterator end  = pRegions->end();
+             for (; iter != end; ++iter)
+                 (*iter)->UpdateChunks();
+         }
+         // make sure 'lart' RIFF list chunk exists
+         RIFF::List* lart = pCkInstrument->GetSubList(LIST_TYPE_LART);
+         if (!lart)  lart = pCkInstrument->AddSubList(LIST_TYPE_LART);
+         // make sure '3ewg' RIFF chunk exists
+         RIFF::Chunk* _3ewg = lart->GetSubChunk(CHUNK_ID_3EWG);
+         if (!_3ewg)  {
+             File* pFile = (File*) GetParent();
+             // 3ewg is bigger in gig3, as it includes the iMIDI rules
+             int size = (pFile->pVersion && pFile->pVersion->major == 3) ? 16416 : 12;
+             _3ewg = lart->AddSubChunk(CHUNK_ID_3EWG, size);
+             memset(_3ewg->LoadChunkData(), 0, size);
+         }
+         // update '3ewg' RIFF chunk
+         uint8_t* pData = (uint8_t*) _3ewg->LoadChunkData();
+         store16(&pData[0], EffectSend);
+         store32(&pData[2], Attenuation);
+         store16(&pData[6], FineTune);
+         store16(&pData[8], PitchbendRange);
+         const uint8_t dimkeystart = (PianoReleaseMode ? 0x01 : 0x00) |
+                                     DimensionKeyRange.low << 1;
+         pData[10] = dimkeystart;
+         pData[11] = DimensionKeyRange.high;
      }
      /**
-Line 1706 
 namespace {
+Line 2875 
 namespace {
       *             there is no Region defined for the given \a Key
       */
      Region* Instrument::GetRegion(unsigned int Key) {
-         if (!pRegions || Key > 127) return NULL;
+         if (!pRegions || !pRegions->size() || Key > 127) return NULL;
          return RegionKeyTable[Key];
          /*for (int i = 0; i < Regions; i++) {
              if (Key <= pRegions[i]->KeyRange.high &&
                  Key >= pRegions[i]->KeyRange.low) return pRegions[i];
-Line 1723 
 namespace {
+Line 2893 
 namespace {
       * @see      GetNextRegion()
       */
      Region* Instrument::GetFirstRegion() {
-         if (!Regions) return NULL;
+         if (!pRegions) return NULL;
-         RegionIndex = 1;
+         RegionsIterator = pRegions->begin();
-         return pRegions[0];
+         return static_cast<gig::Region*>( (RegionsIterator != pRegions->end()) ? *RegionsIterator : NULL );
      }
      /**
-Line 1737 
 namespace {
+Line 2907 
 namespace {
       * @see      GetFirstRegion()
       */
      Region* Instrument::GetNextRegion() {
-         if (RegionIndex < 0 || uint32_t(RegionIndex) >= Regions) return NULL;
+         if (!pRegions) return NULL;
-         return pRegions[RegionIndex++];
+         RegionsIterator++;
+         return static_cast<gig::Region*>( (RegionsIterator != pRegions->end()) ? *RegionsIterator : NULL );
+     }
+     Region* Instrument::AddRegion() {
+         // create new Region object (and its RIFF chunks)
+         RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN);
+         if (!lrgn)  lrgn = pCkInstrument->AddSubList(LIST_TYPE_LRGN);
+         RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);
+         Region* pNewRegion = new Region(this, rgn);
+         pRegions->push_back(pNewRegion);
+         Regions = pRegions->size();
+         // update Region key table for fast lookup
+         UpdateRegionKeyTable();
+         // done
+         return pNewRegion;
+     }
+     void Instrument::DeleteRegion(Region* pRegion) {
+         if (!pRegions) return;
+         DLS::Instrument::DeleteRegion((DLS::Region*) pRegion);
+         // update Region key table for fast lookup
+         UpdateRegionKeyTable();
+     }
+ // *************** Group ***************
+ // *
+     /** @brief Constructor.
+      *
+      * @param file   - pointer to the gig::File object
+      * @param ck3gnm - pointer to 3gnm chunk associated with this group or
+      *                 NULL if this is a new Group
+      */
+     Group::Group(File* file, RIFF::Chunk* ck3gnm) {
+         pFile      = file;
+         pNameChunk = ck3gnm;
+         ::LoadString(pNameChunk, Name);
+     }
+     Group::~Group() {
+         // remove the chunk associated with this group (if any)
+         if (pNameChunk) pNameChunk->GetParent()->DeleteSubChunk(pNameChunk);
+     }
+     /** @brief Update chunks with current group settings.
+      *
+      * Apply current Group field values to the respective chunks. You have
+      * to call File::Save() to make changes persistent.
+      *
+      * Usually there is absolutely no need to call this method explicitly.
+      * It will be called automatically when File::Save() was called.
+      */
+     void Group::UpdateChunks() {
+         // make sure <3gri> and <3gnl> list chunks exist
+         RIFF::List* _3gri = pFile->pRIFF->GetSubList(LIST_TYPE_3GRI);
+         if (!_3gri) {
+             _3gri = pFile->pRIFF->AddSubList(LIST_TYPE_3GRI);
+             pFile->pRIFF->MoveSubChunk(_3gri, pFile->pRIFF->GetSubChunk(CHUNK_ID_PTBL));
+         }
+         RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);
+         if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);
+         if (!pNameChunk && pFile->pVersion && pFile->pVersion->major == 3) {
+             // v3 has a fixed list of 128 strings, find a free one
+             for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {
+                 if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {
+                     pNameChunk = ck;
+                     break;
+                 }
+             }
+         }
+         // now store the name of this group as <3gnm> chunk as subchunk of the <3gnl> list chunk
+         ::SaveString(CHUNK_ID_3GNM, pNameChunk, _3gnl, Name, String("Unnamed Group"), true, 64);
+     }
+     /**
+      * Returns the first Sample of this Group. You have to call this method
+      * once before you use GetNextSample().
+      *
+      * <b>Notice:</b> this method might block for a long time, in case the
+      * samples of this .gig file were not scanned yet
+      *
+      * @returns  pointer address to first Sample or NULL if there is none
+      *           applied to this Group
+      * @see      GetNextSample()
+      */
+     Sample* Group::GetFirstSample() {
+         // FIXME: lazy und unsafe implementation, should be an autonomous iterator
+         for (Sample* pSample = pFile->GetFirstSample(); pSample; pSample = pFile->GetNextSample()) {
+             if (pSample->GetGroup() == this) return pSample;
+         }
+         return NULL;
+     }
+     /**
+      * Returns the next Sample of the Group. You have to call
+      * GetFirstSample() once before you can use this method. By calling this
+      * method multiple times it iterates through the Samples assigned to
+      * this Group.
+      *
+      * @returns  pointer address to the next Sample of this Group or NULL if
+      *           end reached
+      * @see      GetFirstSample()
+      */
+     Sample* Group::GetNextSample() {
+         // FIXME: lazy und unsafe implementation, should be an autonomous iterator
+         for (Sample* pSample = pFile->GetNextSample(); pSample; pSample = pFile->GetNextSample()) {
+             if (pSample->GetGroup() == this) return pSample;
+         }
+         return NULL;
+     }
+     /**
+      * Move Sample given by \a pSample from another Group to this Group.
+      */
+     void Group::AddSample(Sample* pSample) {
+         pSample->pGroup = this;
+     }
+     /**
+      * Move all members of this group to another group (preferably the 1st
+      * one except this). This method is called explicitly by
+      * File::DeleteGroup() thus when a Group was deleted. This code was
+      * intentionally not placed in the destructor!
+      */
+     void Group::MoveAll() {
+         // get "that" other group first
+         Group* pOtherGroup = NULL;
+         for (pOtherGroup = pFile->GetFirstGroup(); pOtherGroup; pOtherGroup = pFile->GetNextGroup()) {
+             if (pOtherGroup != this) break;
+         }
+         if (!pOtherGroup) throw Exception(
+             "Could not move samples to another group, since there is no "
+             "other Group. This is a bug, report it!"
+         );
+         // now move all samples of this group to the other group
+         for (Sample* pSample = GetFirstSample(); pSample; pSample = GetNextSample()) {
+             pOtherGroup->AddSample(pSample);
+         }
      }
-Line 1746 
 namespace {
+Line 3058 
 namespace {
  // *************** File ***************
  // *
+     // File version 2.0, 1998-06-28
+     const DLS::version_t File::VERSION_2 = {
+, 2, 19980628 & 0xffff, 19980628 >> 16
+     };
+     // File version 3.0, 2003-03-31
+     const DLS::version_t File::VERSION_3 = {
+, 3, 20030331 & 0xffff, 20030331 >> 16
+     };
+     const DLS::Info::FixedStringLength File::FixedStringLengths[] = {
+         { CHUNK_ID_IARL, 256 },
+         { CHUNK_ID_IART, 128 },
+         { CHUNK_ID_ICMS, 128 },
+         { CHUNK_ID_ICMT, 1024 },
+         { CHUNK_ID_ICOP, 128 },
+         { CHUNK_ID_ICRD, 128 },
+         { CHUNK_ID_IENG, 128 },
+         { CHUNK_ID_IGNR, 128 },
+         { CHUNK_ID_IKEY, 128 },
+         { CHUNK_ID_IMED, 128 },
+         { CHUNK_ID_INAM, 128 },
+         { CHUNK_ID_IPRD, 128 },
+         { CHUNK_ID_ISBJ, 128 },
+         { CHUNK_ID_ISFT, 128 },
+         { CHUNK_ID_ISRC, 128 },
+         { CHUNK_ID_ISRF, 128 },
+         { CHUNK_ID_ITCH, 128 },
+         { 0, 0 }
+     };
+     File::File() : DLS::File() {
+         *pVersion = VERSION_3;
+         pGroups = NULL;
+         pInfo->FixedStringLengths = FixedStringLengths;
+         pInfo->ArchivalLocation = String(256, ' ');
+         // add some mandatory chunks to get the file chunks in right
+         // order (INFO chunk will be moved to first position later)
+         pRIFF->AddSubChunk(CHUNK_ID_VERS, 8);
+         pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);
+         pRIFF->AddSubChunk(CHUNK_ID_DLID, 16);
+         GenerateDLSID();
+     }
      File::File(RIFF::File* pRIFF) : DLS::File(pRIFF) {
-         pSamples     = NULL;
+         pGroups = NULL;
-         pInstruments = NULL;
+         pInfo->FixedStringLengths = FixedStringLengths;
      }
      File::~File() {
-         // free samples
+         if (pGroups) {
-         if (pSamples) {
+             std::list<Group*>::iterator iter = pGroups->begin();
-             SamplesIterator = pSamples->begin();
+             std::list<Group*>::iterator end  = pGroups->end();
-             while (SamplesIterator != pSamples->end() ) {
+             while (iter != end) {
-                 delete (*SamplesIterator);
+                 delete *iter;
-                 SamplesIterator++;
+                 ++iter;
              }
-             pSamples->clear();
+             delete pGroups;
-             delete pSamples;
+         }
-         }
-         // free instruments
-         if (pInstruments) {
-             InstrumentsIterator = pInstruments->begin();
-             while (InstrumentsIterator != pInstruments->end() ) {
-                 delete (*InstrumentsIterator);
-                 InstrumentsIterator++;
-             }
-             pInstruments->clear();
-             delete pInstruments;
-         }
-         // free extension files
-         for (std::list<RIFF::File*>::iterator i = ExtensionFiles.begin() ; i != ExtensionFiles.end() ; i++)
-             delete *i;
      }
      Sample* File::GetFirstSample(progress_t* pProgress) {
-Line 1791 
 namespace {
+Line 3134 
 namespace {
          return static_cast<gig::Sample*>( (SamplesIterator != pSamples->end()) ? *SamplesIterator : NULL );
      }
+     /** @brief Add a new sample.
+      *
+      * This will create a new Sample object for the gig file. You have to
+      * call Save() to make this persistent to the file.
+      *
+      * @returns pointer to new Sample object
+      */
+     Sample* File::AddSample() {
+        if (!pSamples) LoadSamples();
+        __ensureMandatoryChunksExist();
+        RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
+        // create new Sample object and its respective 'wave' list chunk
+        RIFF::List* wave = wvpl->AddSubList(LIST_TYPE_WAVE);
+        Sample* pSample = new Sample(this, wave, 0 /*arbitrary value, we update offsets when we save*/);
+        // add mandatory chunks to get the chunks in right order
+        wave->AddSubChunk(CHUNK_ID_FMT, 16);
+        wave->AddSubList(LIST_TYPE_INFO);
+        pSamples->push_back(pSample);
+        return pSample;
+     }
+     /** @brief Delete a sample.
+      *
+      * This will delete the given Sample object from the gig file. Any
+      * references to this sample from Regions and DimensionRegions will be
+      * removed. You have to call Save() to make this persistent to the file.
+      *
+      * @param pSample - sample to delete
+      * @throws gig::Exception if given sample could not be found
+      */
+     void File::DeleteSample(Sample* pSample) {
+         if (!pSamples || !pSamples->size()) throw gig::Exception("Could not delete sample as there are no samples");
+         SampleList::iterator iter = find(pSamples->begin(), pSamples->end(), (DLS::Sample*) pSample);
+         if (iter == pSamples->end()) throw gig::Exception("Could not delete sample, could not find given sample");
+         if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation
+         pSamples->erase(iter);
+         delete pSample;
+         // remove all references to the sample
+         for (Instrument* instrument = GetFirstInstrument() ; instrument ;
+              instrument = GetNextInstrument()) {
+             for (Region* region = instrument->GetFirstRegion() ; region ;
+                  region = instrument->GetNextRegion()) {
+                 if (region->GetSample() == pSample) region->SetSample(NULL);
+                 for (int i = 0 ; i < region->DimensionRegions ; i++) {
+                     gig::DimensionRegion *d = region->pDimensionRegions[i];
+                     if (d->pSample == pSample) d->pSample = NULL;
+                 }
+             }
+         }
+     }
+     void File::LoadSamples() {
+         LoadSamples(NULL);
+     }
      void File::LoadSamples(progress_t* pProgress) {
+         // Groups must be loaded before samples, because samples will try
+         // to resolve the group they belong to
+         if (!pGroups) LoadGroups();
+         if (!pSamples) pSamples = new SampleList;
          RIFF::File* file = pRIFF;
          // just for progress calculation
-Line 1803 
 namespace {
+Line 3212 
 namespace {
          for (int i = 0 ; i < WavePoolCount ; i++) {
              if (pWavePoolTableHi[i] > lastFileNo) lastFileNo = pWavePoolTableHi[i];
          }
-         String name(pRIFF->Filename);
+         String name(pRIFF->GetFileName());
-         int nameLen = pRIFF->Filename.length();
+         int nameLen = name.length();
          char suffix[6];
-         if (nameLen > 4 && pRIFF->Filename.substr(nameLen - 4) == ".gig") nameLen -= 4;
+         if (nameLen > 4 && name.substr(nameLen - 4) == ".gig") nameLen -= 4;
          for (int fileNo = 0 ; ; ) {
              RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);
-Line 1819 
 namespace {
+Line 3228 
 namespace {
                          const float subprogress = (float) iSampleIndex / (float) iTotalSamples;
                          __notify_progress(pProgress, subprogress);
-                         if (!pSamples) pSamples = new SampleList;
                          unsigned long waveFileOffset = wave->GetFilePos();
                          pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, fileNo));
-Line 1836 
 namespace {
+Line 3244 
 namespace {
                  name.replace(nameLen, 5, suffix);
                  file = new RIFF::File(name);
                  ExtensionFiles.push_back(file);
-             }
+             } else break;
-             else throw gig::Exception("Mandatory <wvpl> chunk not found.");
          }
          __notify_progress(pProgress, 1.0); // notify done
-Line 1847 
 namespace {
+Line 3254 
 namespace {
          if (!pInstruments) LoadInstruments();
          if (!pInstruments) return NULL;
          InstrumentsIterator = pInstruments->begin();
-         return (InstrumentsIterator != pInstruments->end()) ? *InstrumentsIterator : NULL;
+         return static_cast<gig::Instrument*>( (InstrumentsIterator != pInstruments->end()) ? *InstrumentsIterator : NULL );
      }
      Instrument* File::GetNextInstrument() {
          if (!pInstruments) return NULL;
          InstrumentsIterator++;
-         return (InstrumentsIterator != pInstruments->end()) ? *InstrumentsIterator : NULL;
+         return static_cast<gig::Instrument*>( (InstrumentsIterator != pInstruments->end()) ? *InstrumentsIterator : NULL );
      }
      /**
-Line 1886 
 namespace {
+Line 3293 
 namespace {
          if (!pInstruments) return NULL;
          InstrumentsIterator = pInstruments->begin();
          for (uint i = 0; InstrumentsIterator != pInstruments->end(); i++) {
-             if (i == index) return *InstrumentsIterator;
+             if (i == index) return static_cast<gig::Instrument*>( *InstrumentsIterator );
              InstrumentsIterator++;
          }
          return NULL;
      }
+     /** @brief Add a new instrument definition.
+      *
+      * This will create a new Instrument object for the gig file. You have
+      * to call Save() to make this persistent to the file.
+      *
+      * @returns pointer to new Instrument object
+      */
+     Instrument* File::AddInstrument() {
+        if (!pInstruments) LoadInstruments();
+        __ensureMandatoryChunksExist();
+        RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);
+        RIFF::List* lstInstr = lstInstruments->AddSubList(LIST_TYPE_INS);
+        // add mandatory chunks to get the chunks in right order
+        lstInstr->AddSubList(LIST_TYPE_INFO);
+        lstInstr->AddSubChunk(CHUNK_ID_DLID, 16);
+        Instrument* pInstrument = new Instrument(this, lstInstr);
+        pInstrument->GenerateDLSID();
+        lstInstr->AddSubChunk(CHUNK_ID_INSH, 12);
+        // this string is needed for the gig to be loadable in GSt:
+        pInstrument->pInfo->Software = "Endless Wave";
+        pInstruments->push_back(pInstrument);
+        return pInstrument;
+     }
+     /** @brief Delete an instrument.
+      *
+      * This will delete the given Instrument object from the gig file. You
+      * have to call Save() to make this persistent to the file.
+      *
+      * @param pInstrument - instrument to delete
+      * @throws gig::Exception if given instrument could not be found
+      */
+     void File::DeleteInstrument(Instrument* pInstrument) {
+         if (!pInstruments) throw gig::Exception("Could not delete instrument as there are no instruments");
+         InstrumentList::iterator iter = find(pInstruments->begin(), pInstruments->end(), (DLS::Instrument*) pInstrument);
+         if (iter == pInstruments->end()) throw gig::Exception("Could not delete instrument, could not find given instrument");
+         pInstruments->erase(iter);
+         delete pInstrument;
+     }
+     void File::LoadInstruments() {
+         LoadInstruments(NULL);
+     }
      void File::LoadInstruments(progress_t* pProgress) {
+         if (!pInstruments) pInstruments = new InstrumentList;
          RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);
          if (lstInstruments) {
              int iInstrumentIndex = 0;
-Line 1907 
 namespace {
+Line 3364 
 namespace {
                      progress_t subprogress;
                      __divide_progress(pProgress, &subprogress, Instruments, iInstrumentIndex);
-                     if (!pInstruments) pInstruments = new InstrumentList;
                      pInstruments->push_back(new Instrument(this, lstInstr, &subprogress));
                      iInstrumentIndex++;
-Line 1916 
 namespace {
+Line 3372 
 namespace {
              }
              __notify_progress(pProgress, 1.0); // notify done
          }
-         else throw gig::Exception("Mandatory <lins> list chunk not found.");
+     }
+     /// Updates the 3crc chunk with the checksum of a sample. The
+     /// update is done directly to disk, as this method is called
+     /// after File::Save()
+     void File::SetSampleChecksum(Sample* pSample, uint32_t crc) {
+         RIFF::Chunk* _3crc = pRIFF->GetSubChunk(CHUNK_ID_3CRC);
+         if (!_3crc) return;
+         // get the index of the sample
+         int iWaveIndex = -1;
+         File::SampleList::iterator iter = pSamples->begin();
+         File::SampleList::iterator end  = pSamples->end();
+         for (int index = 0; iter != end; ++iter, ++index) {
+             if (*iter == pSample) {
+                 iWaveIndex = index;
+                 break;
+             }
+         }
+         if (iWaveIndex < 0) throw gig::Exception("Could not update crc, could not find sample");
+         // write the CRC-32 checksum to disk
+         _3crc->SetPos(iWaveIndex * 8);
+         uint32_t tmp = 1;
+         _3crc->WriteUint32(&tmp); // unknown, always 1?
+         _3crc->WriteUint32(&crc);
+     }
+     Group* File::GetFirstGroup() {
+         if (!pGroups) LoadGroups();
+         // there must always be at least one group
+         GroupsIterator = pGroups->begin();
+         return *GroupsIterator;
+     }
+     Group* File::GetNextGroup() {
+         if (!pGroups) return NULL;
+         ++GroupsIterator;
+         return (GroupsIterator == pGroups->end()) ? NULL : *GroupsIterator;
+     }
+     /**
+      * Returns the group with the given index.
+      *
+      * @param index - number of the sought group (0..n)
+      * @returns sought group or NULL if there's no such group
+      */
+     Group* File::GetGroup(uint index) {
+         if (!pGroups) LoadGroups();
+         GroupsIterator = pGroups->begin();
+         for (uint i = 0; GroupsIterator != pGroups->end(); i++) {
+             if (i == index) return *GroupsIterator;
+             ++GroupsIterator;
+         }
+         return NULL;
+     }
+     Group* File::AddGroup() {
+         if (!pGroups) LoadGroups();
+         // there must always be at least one group
+         __ensureMandatoryChunksExist();
+         Group* pGroup = new Group(this, NULL);
+         pGroups->push_back(pGroup);
+         return pGroup;
+     }
+     /** @brief Delete a group and its samples.
+      *
+      * This will delete the given Group object and all the samples that
+      * belong to this group from the gig file. You have to call Save() to
+      * make this persistent to the file.
+      *
+      * @param pGroup - group to delete
+      * @throws gig::Exception if given group could not be found
+      */
+     void File::DeleteGroup(Group* pGroup) {
+         if (!pGroups) LoadGroups();
+         std::list<Group*>::iterator iter = find(pGroups->begin(), pGroups->end(), pGroup);
+         if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");
+         if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");
+         // delete all members of this group
+         for (Sample* pSample = pGroup->GetFirstSample(); pSample; pSample = pGroup->GetNextSample()) {
+             DeleteSample(pSample);
+         }
+         // now delete this group object
+         pGroups->erase(iter);
+         delete pGroup;
+     }
+     /** @brief Delete a group.
+      *
+      * This will delete the given Group object from the gig file. All the
+      * samples that belong to this group will not be deleted, but instead
+      * be moved to another group. You have to call Save() to make this
+      * persistent to the file.
+      *
+      * @param pGroup - group to delete
+      * @throws gig::Exception if given group could not be found
+      */
+     void File::DeleteGroupOnly(Group* pGroup) {
+         if (!pGroups) LoadGroups();
+         std::list<Group*>::iterator iter = find(pGroups->begin(), pGroups->end(), pGroup);
+         if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");
+         if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");
+         // move all members of this group to another group
+         pGroup->MoveAll();
+         pGroups->erase(iter);
+         delete pGroup;
+     }
+     void File::LoadGroups() {
+         if (!pGroups) pGroups = new std::list<Group*>;
+         // try to read defined groups from file
+         RIFF::List* lst3gri = pRIFF->GetSubList(LIST_TYPE_3GRI);
+         if (lst3gri) {
+             RIFF::List* lst3gnl = lst3gri->GetSubList(LIST_TYPE_3GNL);
+             if (lst3gnl) {
+                 RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();
+                 while (ck) {
+                     if (ck->GetChunkID() == CHUNK_ID_3GNM) {
+                         if (pVersion && pVersion->major == 3 &&
+                             strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;
+                         pGroups->push_back(new Group(this, ck));
+                     }
+                     ck = lst3gnl->GetNextSubChunk();
+                 }
+             }
+         }
+         // if there were no group(s), create at least the mandatory default group
+         if (!pGroups->size()) {
+             Group* pGroup = new Group(this, NULL);
+             pGroup->Name = "Default Group";
+             pGroups->push_back(pGroup);
+         }
+     }
+     /**
+      * Apply all the gig file's current instruments, samples, groups and settings
+      * to the respective RIFF chunks. You have to call Save() to make changes
+      * persistent.
+      *
+      * Usually there is absolutely no need to call this method explicitly.
+      * It will be called automatically when File::Save() was called.
+      *
+      * @throws Exception - on errors
+      */
+     void File::UpdateChunks() {
+         bool newFile = pRIFF->GetSubList(LIST_TYPE_INFO) == NULL;
+         b64BitWavePoolOffsets = pVersion && pVersion->major == 3;
+         // first update base class's chunks
+         DLS::File::UpdateChunks();
+         if (newFile) {
+             // INFO was added by Resource::UpdateChunks - make sure it
+             // is placed first in file
+             RIFF::Chunk* info = pRIFF->GetSubList(LIST_TYPE_INFO);
+             RIFF::Chunk* first = pRIFF->GetFirstSubChunk();
+             if (first != info) {
+                 pRIFF->MoveSubChunk(info, first);
+             }
+         }
+         // update group's chunks
+         if (pGroups) {
+             std::list<Group*>::iterator iter = pGroups->begin();
+             std::list<Group*>::iterator end  = pGroups->end();
+             for (; iter != end; ++iter) {
+                 (*iter)->UpdateChunks();
+             }
+             // v3: make sure the file has 128 3gnm chunks
+             if (pVersion && pVersion->major == 3) {
+                 RIFF::List* _3gnl = pRIFF->GetSubList(LIST_TYPE_3GRI)->GetSubList(LIST_TYPE_3GNL);
+                 RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();
+                 for (int i = 0 ; i < 128 ; i++) {
+                     if (i >= pGroups->size()) ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);
+                     if (_3gnm) _3gnm = _3gnl->GetNextSubChunk();
+                 }
+             }
+         }
+         // update einf chunk
+         // The einf chunk contains statistics about the gig file, such
+         // as the number of regions and samples used by each
+         // instrument. It is divided in equally sized parts, where the
+         // first part contains information about the whole gig file,
+         // and the rest of the parts map to each instrument in the
+         // file.
+         //
+         // At the end of each part there is a bit map of each sample
+         // in the file, where a set bit means that the sample is used
+         // by the file/instrument.
+         //
+         // Note that there are several fields with unknown use. These
+         // are set to zero.
+         int sublen = pSamples->size() / 8 + 49;
+         int einfSize = (Instruments + 1) * sublen;
+         RIFF::Chunk* einf = pRIFF->GetSubChunk(CHUNK_ID_EINF);
+         if (einf) {
+             if (einf->GetSize() != einfSize) {
+                 einf->Resize(einfSize);
+                 memset(einf->LoadChunkData(), 0, einfSize);
+             }
+         } else if (newFile) {
+             einf = pRIFF->AddSubChunk(CHUNK_ID_EINF, einfSize);
+         }
+         if (einf) {
+             uint8_t* pData = (uint8_t*) einf->LoadChunkData();
+             std::map<gig::Sample*,int> sampleMap;
+             int sampleIdx = 0;
+             for (Sample* pSample = GetFirstSample(); pSample; pSample = GetNextSample()) {
+                 sampleMap[pSample] = sampleIdx++;
+             }
+             int totnbusedsamples = 0;
+             int totnbusedchannels = 0;
+             int totnbregions = 0;
+             int totnbdimregions = 0;
+             int totnbloops = 0;
+             int instrumentIdx = 0;
+             memset(&pData[48], 0, sublen - 48);
+             for (Instrument* instrument = GetFirstInstrument() ; instrument ;
+                  instrument = GetNextInstrument()) {
+                 int nbusedsamples = 0;
+                 int nbusedchannels = 0;
+                 int nbdimregions = 0;
+                 int nbloops = 0;
+                 memset(&pData[(instrumentIdx + 1) * sublen + 48], 0, sublen - 48);
+                 for (Region* region = instrument->GetFirstRegion() ; region ;
+                      region = instrument->GetNextRegion()) {
+                     for (int i = 0 ; i < region->DimensionRegions ; i++) {
+                         gig::DimensionRegion *d = region->pDimensionRegions[i];
+                         if (d->pSample) {
+                             int sampleIdx = sampleMap[d->pSample];
+                             int byte = 48 + sampleIdx / 8;
+                             int bit = 1 << (sampleIdx & 7);
+                             if ((pData[(instrumentIdx + 1) * sublen + byte] & bit) == 0) {
+                                 pData[(instrumentIdx + 1) * sublen + byte] |= bit;
+                                 nbusedsamples++;
+                                 nbusedchannels += d->pSample->Channels;
+                                 if ((pData[byte] & bit) == 0) {
+                                     pData[byte] |= bit;
+                                     totnbusedsamples++;
+                                     totnbusedchannels += d->pSample->Channels;
+                                 }
+                             }
+                         }
+                         if (d->SampleLoops) nbloops++;
+                     }
+                     nbdimregions += region->DimensionRegions;
+                 }
+                 // first 4 bytes unknown - sometimes 0, sometimes length of einf part
+                 // store32(&pData[(instrumentIdx + 1) * sublen], sublen);
+                 store32(&pData[(instrumentIdx + 1) * sublen + 4], nbusedchannels);
+                 store32(&pData[(instrumentIdx + 1) * sublen + 8], nbusedsamples);
+                 store32(&pData[(instrumentIdx + 1) * sublen + 12], 1);
+                 store32(&pData[(instrumentIdx + 1) * sublen + 16], instrument->Regions);
+                 store32(&pData[(instrumentIdx + 1) * sublen + 20], nbdimregions);
+                 store32(&pData[(instrumentIdx + 1) * sublen + 24], nbloops);
+                 // next 8 bytes unknown
+                 store32(&pData[(instrumentIdx + 1) * sublen + 36], instrumentIdx);
+                 store32(&pData[(instrumentIdx + 1) * sublen + 40], pSamples->size());
+                 // next 4 bytes unknown
+                 totnbregions += instrument->Regions;
+                 totnbdimregions += nbdimregions;
+                 totnbloops += nbloops;
+                 instrumentIdx++;
+             }
+             // first 4 bytes unknown - sometimes 0, sometimes length of einf part
+             // store32(&pData[0], sublen);
+             store32(&pData[4], totnbusedchannels);
+             store32(&pData[8], totnbusedsamples);
+             store32(&pData[12], Instruments);
+             store32(&pData[16], totnbregions);
+             store32(&pData[20], totnbdimregions);
+             store32(&pData[24], totnbloops);
+             // next 8 bytes unknown
+             // next 4 bytes unknown, not always 0
+             store32(&pData[40], pSamples->size());
+             // next 4 bytes unknown
+         }
+         // update 3crc chunk
+         // The 3crc chunk contains CRC-32 checksums for the
+         // samples. The actual checksum values will be filled in
+         // later, by Sample::Write.
+         RIFF::Chunk* _3crc = pRIFF->GetSubChunk(CHUNK_ID_3CRC);
+         if (_3crc) {
+             _3crc->Resize(pSamples->size() * 8);
+         } else if (newFile) {
+             _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);
+             _3crc->LoadChunkData();
+             // the order of einf and 3crc is not the same in v2 and v3
+             if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);
+         }
      }

 Legend:



Removed from v.728
 


changed lines


 
Added in v.1317
 Legend:



Removed from v.728
 


changed lines


 
Added in v.1317
-Removed from v.728
+Added in v.1317

	ViewVC Help
Powered by ViewVC