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

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

Parent Directory | Revision Log | View Patch Patch

-revision 36 by schoenebeck,
Wed Mar 10 21:34:28 2004 UTC
+revision 2682 by schoenebeck,
Mon Dec 29 16:25:51 2014 UTC
 Line 1
  /***************************************************************************
   *                                                                         *
-  *   libgig - C++ cross-platform Gigasampler format file loader library    *
+  *   libgig - C++ cross-platform Gigasampler format file access library    *
   *                                                                         *
-  *   Copyright (C) 2003 by Christian Schoenebeck                           *
+  *   Copyright (C) 2003-2014 by Christian Schoenebeck                      *
-  *                         <cuse@users.sourceforge.net>                    *
+  *                              <cuse@users.sourceforge.net>               *
   *                                                                         *
   *   This library is free software; you can redistribute it and/or modify  *
   *   it under the terms of the GNU General Public License as published by  *
 Line 23
  #include "gig.h"
+ #include "helper.h"
+ #include <algorithm>
+ #include <math.h>
+ #include <iostream>
+ #include <assert.h>
+ /// 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 {
+ // *************** Internal functions for sample decompression ***************
+ // *
+ namespace {
+     inline int get12lo(const unsigned char* pSrc)
+     {
+         const int x = pSrc[0] | (pSrc[1] & 0x0f) << 8;
+         return x & 0x800 ? x - 0x1000 : x;
+     }
+     inline int get12hi(const unsigned char* pSrc)
+     {
+         const int x = pSrc[1] >> 4 | pSrc[2] << 4;
+         return x & 0x800 ? x - 0x1000 : x;
+     }
+     inline int16_t get16(const unsigned char* pSrc)
+     {
+         return int16_t(pSrc[0] | pSrc[1] << 8);
+     }
+     inline int get24(const unsigned char* pSrc)
+     {
+         const int x = pSrc[0] | pSrc[1] << 8 | pSrc[2] << 16;
+         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,
+                       unsigned long currentframeoffset,
+                       unsigned long copysamples)
+     {
+         switch (compressionmode) {
+             case 0: // 16 bit uncompressed
+                 pSrc += currentframeoffset * srcStep;
+                 while (copysamples) {
+                     *pDst = get16(pSrc);
+                     pDst += dstStep;
+                     pSrc += srcStep;
+                     copysamples--;
+                 }
+                 break;
+             case 1: // 16 bit compressed to 8 bit
+                 int y  = get16(params);
+                 int dy = get16(params + 2);
+                 while (currentframeoffset) {
+                     dy -= int8_t(*pSrc);
+                     y  -= dy;
+                     pSrc += srcStep;
+                     currentframeoffset--;
+                 }
+                 while (copysamples) {
+                     dy -= int8_t(*pSrc);
+                     y  -= dy;
+                     *pDst = y;
+                     pDst += dstStep;
+                     pSrc += srcStep;
+                     copysamples--;
+                 }
+                 break;
+         }
+     }
+     void Decompress24(int compressionmode, const unsigned char* params,
+                       int dstStep, const unsigned char* pSrc, uint8_t* pDst,
+                       unsigned long currentframeoffset,
+                       unsigned long copysamples, int truncatedBits)
+     {
+         int y, dy, ddy, dddy;
+ #define GET_PARAMS(params)                      \
+         y    = get24(params);                   \
+         dy   = y - get24((params) + 3);         \
+         ddy  = get24((params) + 6);             \
+         dddy = get24((params) + 9)
+ #define SKIP_ONE(x)                             \
+         dddy -= (x);                            \
+         ddy  -= dddy;                           \
+         dy   =  -dy - ddy;                      \
+         y    += dy
+ #define COPY_ONE(x)                             \
+         SKIP_ONE(x);                            \
+         store24(pDst, y << truncatedBits);      \
+         pDst += dstStep
+         switch (compressionmode) {
+             case 2: // 24 bit uncompressed
+                 pSrc += currentframeoffset * 3;
+                 while (copysamples) {
+                     store24(pDst, get24(pSrc) << truncatedBits);
+                     pDst += dstStep;
+                     pSrc += 3;
+                     copysamples--;
+                 }
+                 break;
+             case 3: // 24 bit compressed to 16 bit
+                 GET_PARAMS(params);
+                 while (currentframeoffset) {
+                     SKIP_ONE(get16(pSrc));
+                     pSrc += 2;
+                     currentframeoffset--;
+                 }
+                 while (copysamples) {
+                     COPY_ONE(get16(pSrc));
+                     pSrc += 2;
+                     copysamples--;
+                 }
+                 break;
+             case 4: // 24 bit compressed to 12 bit
+                 GET_PARAMS(params);
+                 while (currentframeoffset > 1) {
+                     SKIP_ONE(get12lo(pSrc));
+                     SKIP_ONE(get12hi(pSrc));
+                     pSrc += 3;
+                     currentframeoffset -= 2;
+                 }
+                 if (currentframeoffset) {
+                     SKIP_ONE(get12lo(pSrc));
+                     currentframeoffset--;
+                     if (copysamples) {
+                         COPY_ONE(get12hi(pSrc));
+                         pSrc += 3;
+                         copysamples--;
+                     }
+                 }
+                 while (copysamples > 1) {
+                     COPY_ONE(get12lo(pSrc));
+                     COPY_ONE(get12hi(pSrc));
+                     pSrc += 3;
+                     copysamples -= 2;
+                 }
+                 if (copysamples) {
+                     COPY_ONE(get12lo(pSrc));
+                 }
+                 break;
+             case 5: // 24 bit compressed to 8 bit
+                 GET_PARAMS(params);
+                 while (currentframeoffset) {
+                     SKIP_ONE(int8_t(*pSrc++));
+                     currentframeoffset--;
+                 }
+                 while (copysamples) {
+                     COPY_ONE(int8_t(*pSrc++));
+                     copysamples--;
+                 }
+                 break;
+         }
+     }
+     const int bytesPerFrame[] =      { 4096, 2052, 768, 524, 396, 268 };
+     const int bytesPerFrameNoHdr[] = { 4096, 2048, 768, 512, 384, 256 };
+     const int headerSize[] =         { 0, 4, 0, 12, 12, 12 };
+     const int bitsPerSample[] =      { 16, 8, 24, 16, 12, 8 };
+ }
+ // *************** Internal CRC-32 (Cyclic Redundancy Check) functions  ***************
+ // *
+     static uint32_t* __initCRCTable() {
+         static uint32_t res[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;
+     }
+     static const uint32_t* __CRCTable = __initCRCTable();
+     /**
+      * Initialize a CRC variable.
+      *
+      * @param crc - variable to be initialized
+      */
+     inline static void __resetCRC(uint32_t& crc) {
+         crc = 0xffffffff;
+     }
+     /**
+      * Used to calculate checksums of the sample data in a gig file. The
+      * checksums are stored in the 3crc chunk of the gig file and
+      * automatically updated when a sample is written with Sample::Write().
+      *
+      * One should call __resetCRC() to initialize the CRC variable to be
+      * used before calling this function the first time.
+      *
+      * After initializing the CRC variable one can call this function
+      * arbitrary times, i.e. to split the overall CRC calculation into
+      * steps.
+      *
+      * Once the whole data was processed by __calculateCRC(), one should
+      * call __encodeCRC() to get the final CRC result.
+      *
+      * @param buf     - pointer to data the CRC shall be calculated of
+      * @param bufSize - size of the data to be processed
+      * @param crc     - variable the CRC sum shall be stored to
+      */
+     static void __calculateCRC(unsigned char* buf, int bufSize, uint32_t& crc) {
+         for (int i = 0 ; i < bufSize ; i++) {
+             crc = __CRCTable[(crc ^ buf[i]) & 0xff] ^ (crc >> 8);
+         }
+     }
+     /**
+      * Returns the final CRC result.
+      *
+      * @param crc - variable previously passed to __calculateCRC()
+      */
+     inline static uint32_t __encodeCRC(const uint32_t& crc) {
+         return crc ^ 0xffffffff;
+     }
+ // *************** 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;
+     }
  // *************** Sample ***************
  // *
-     unsigned int  Sample::Instances               = 0;
+     unsigned int Sample::Instances = 0;
-     void*         Sample::pDecompressionBuffer    = NULL;
+     buffer_t     Sample::InternalDecompressionBuffer;
-     unsigned long Sample::DecompressionBufferSize = 0;
-     Sample::Sample(File* pFile, RIFF::List* waveList, unsigned long WavePoolOffset) : DLS::Sample((DLS::File*) pFile, waveList, WavePoolOffset) {
+     /** @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::string_length_t fixedStringLengths[] = {
+             { CHUNK_ID_INAM, 64 },
+             { 0, 0 }
+         };
+         pInfo->SetFixedStringLengths(fixedStringLengths);
          Instances++;
+         FileNo = fileNo;
+         __resetCRC(crc);
-         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();
-         uint32_t manufByt = smpl->ReadInt32();
+             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 63 
 namespace gig {
+Line 396 
 namespace gig {
          RAMCache.pStart            = NULL;
          RAMCache.NullExtensionSize = 0;
-         Compressed = (waveList->GetSubChunk(CHUNK_ID_EWAV));
+         if (BitDepth > 24) throw gig::Exception("Only samples up to 24 bit supported");
+         RIFF::Chunk* ewav = waveList->GetSubChunk(CHUNK_ID_EWAV);
+         Compressed        = ewav;
+         Dithered          = false;
+         TruncatedBits     = 0;
          if (Compressed) {
-             ScanCompressedSample();
+             uint32_t version = ewav->ReadInt32();
-             if (!pDecompressionBuffer) {
+             if (version == 3 && BitDepth == 24) {
-                 pDecompressionBuffer    = new int8_t[INITIAL_SAMPLE_BUFFER_SIZE];
+                 Dithered = ewav->ReadInt32();
-                 DecompressionBufferSize = INITIAL_SAMPLE_BUFFER_SIZE;
+                 ewav->SetPos(Channels == 2 ? 84 : 64);
+                 TruncatedBits = ewav->ReadInt32();
              }
+             ScanCompressedSample();
+         }
+         // we use a buffer for decompression and for truncating 24 bit samples to 16 bit
+         if ((Compressed || BitDepth == 24) && !InternalDecompressionBuffer.Size) {
+             InternalDecompressionBuffer.pStart = new unsigned char[INITIAL_SAMPLE_BUFFER_SIZE];
+             InternalDecompressionBuffer.Size   = INITIAL_SAMPLE_BUFFER_SIZE;
          }
          FrameOffset = 0; // just for streaming compressed samples
-         LoopSize = LoopEnd - LoopStart;
+         LoopSize = LoopEnd - LoopStart + 1;
+     }
+     /**
+      * Make a (semi) deep copy of the Sample object given by @a orig (without
+      * the actual waveform data) and assign it to this object.
+      *
+      * Discussion: copying .gig samples is a bit tricky. It requires three
+      * steps:
+      * 1. Copy sample's meta informations (done by CopyAssignMeta()) including
+      *    its new sample waveform data size.
+      * 2. Saving the file (done by File::Save()) so that it gains correct size
+      *    and layout for writing the actual wave form data directly to disc
+      *    in next step.
+      * 3. Copy the waveform data with disk streaming (done by CopyAssignWave()).
+      *
+      * @param orig - original Sample object to be copied from
+      */
+     void Sample::CopyAssignMeta(const Sample* orig) {
+         // handle base classes
+         DLS::Sample::CopyAssignCore(orig);
+         // handle actual own attributes of this class
+         Manufacturer = orig->Manufacturer;
+         Product = orig->Product;
+         SamplePeriod = orig->SamplePeriod;
+         MIDIUnityNote = orig->MIDIUnityNote;
+         FineTune = orig->FineTune;
+         SMPTEFormat = orig->SMPTEFormat;
+         SMPTEOffset = orig->SMPTEOffset;
+         Loops = orig->Loops;
+         LoopID = orig->LoopID;
+         LoopType = orig->LoopType;
+         LoopStart = orig->LoopStart;
+         LoopEnd = orig->LoopEnd;
+         LoopSize = orig->LoopSize;
+         LoopFraction = orig->LoopFraction;
+         LoopPlayCount = orig->LoopPlayCount;
+         // schedule resizing this sample to the given sample's size
+         Resize(orig->GetSize());
+     }
+     /**
+      * Should be called after CopyAssignMeta() and File::Save() sequence.
+      * Read more about it in the discussion of CopyAssignMeta(). This method
+      * copies the actual waveform data by disk streaming.
+      *
+      * @e CAUTION: this method is currently not thread safe! During this
+      * operation the sample must not be used for other purposes by other
+      * threads!
+      *
+      * @param orig - original Sample object to be copied from
+      */
+     void Sample::CopyAssignWave(const Sample* orig) {
+         const int iReadAtOnce = 32*1024;
+         char* buf = new char[iReadAtOnce * orig->FrameSize];
+         Sample* pOrig = (Sample*) orig; //HACK: remove constness for now
+         unsigned long restorePos = pOrig->GetPos();
+         pOrig->SetPos(0);
+         SetPos(0);
+         for (unsigned long n = pOrig->Read(buf, iReadAtOnce); n;
+                            n = pOrig->Read(buf, iReadAtOnce))
+         {
+             Write(buf, n);
+         }
+         pOrig->SetPos(restorePos);
+         delete [] buf;
+     }
+     /**
+      * 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.
+      *
+      * @param pProgress - callback function for progress notification
+      * @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(progress_t* pProgress) {
+         // first update base class's chunks
+         DLS::Sample::UpdateChunks(pProgress);
+         // 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);
+         // if the library user toggled the "Compressed" attribute from true to
+         // false, then the EWAV chunk associated with compressed samples needs
+         // to be deleted
+         RIFF::Chunk* ewav = pWaveList->GetSubChunk(CHUNK_ID_EWAV);
+         if (ewav && !Compressed) {
+             pWaveList->DeleteSubChunk(ewav);
+         }
      }
      /// Scans compressed samples for mandatory informations (e.g. actual number of total sample points).
-Line 82 
 namespace gig {
+Line 567 
 namespace gig {
          this->SamplesTotal = 0;
          std::list<unsigned long> frameOffsets;
+         SamplesPerFrame = BitDepth == 24 ? 256 : 2048;
+         WorstCaseFrameSize = SamplesPerFrame * FrameSize + Channels; // +Channels for compression flag
          // Scanning
          pCkData->SetPos(0);
-         while (pCkData->GetState() == RIFF::stream_ready) {
+         if (Channels == 2) { // Stereo
-             frameOffsets.push_back(pCkData->GetPos());
+             for (int i = 0 ; ; i++) {
-             int16_t compressionmode = pCkData->ReadInt16();
+                 // for 24 bit samples every 8:th frame offset is
-             this->SamplesTotal += 2048;
+                 // stored, to save some memory
-             switch (compressionmode) {
+                 if (BitDepth != 24 || (i & 7) == 0) frameOffsets.push_back(pCkData->GetPos());
-                 case 1:   // left channel compressed
-                 case 256: // right channel compressed
+                 const int mode_l = pCkData->ReadUint8();
-                     pCkData->SetPos(6148, RIFF::stream_curpos);
+                 const int mode_r = pCkData->ReadUint8();
+                 if (mode_l > 5 || mode_r > 5) throw gig::Exception("Unknown compression mode");
+                 const unsigned long frameSize = bytesPerFrame[mode_l] + bytesPerFrame[mode_r];
+                 if (pCkData->RemainingBytes() <= frameSize) {
+                     SamplesInLastFrame =
+                         ((pCkData->RemainingBytes() - headerSize[mode_l] - headerSize[mode_r]) << 3) /
+                         (bitsPerSample[mode_l] + bitsPerSample[mode_r]);
+                     SamplesTotal += SamplesInLastFrame;
                      break;
-                 case 257: // both channels compressed
+                 }
-                     pCkData->SetPos(4104, RIFF::stream_curpos);
+                 SamplesTotal += SamplesPerFrame;
+                 pCkData->SetPos(frameSize, RIFF::stream_curpos);
+             }
+         }
+         else { // Mono
+             for (int i = 0 ; ; i++) {
+                 if (BitDepth != 24 || (i & 7) == 0) frameOffsets.push_back(pCkData->GetPos());
+                 const int mode = pCkData->ReadUint8();
+                 if (mode > 5) throw gig::Exception("Unknown compression mode");
+                 const unsigned long frameSize = bytesPerFrame[mode];
+                 if (pCkData->RemainingBytes() <= frameSize) {
+                     SamplesInLastFrame =
+                         ((pCkData->RemainingBytes() - headerSize[mode]) << 3) / bitsPerSample[mode];
+                     SamplesTotal += SamplesInLastFrame;
                      break;
-                 default: // both channels uncompressed
+                 }
-                     pCkData->SetPos(8192, RIFF::stream_curpos);
+                 SamplesTotal += SamplesPerFrame;
+                 pCkData->SetPos(frameSize, RIFF::stream_curpos);
              }
          }
          pCkData->SetPos(0);
-         //FIXME: only seen compressed samples with 16 bit stereo so far
-         this->FrameSize = 4;
-         this->BitDepth  = 16;
          // Build the frames table (which is used for fast resolving of a frame's chunk offset)
          if (FrameTable) delete[] FrameTable;
          FrameTable = new unsigned long[frameOffsets.size()];
-Line 141 
 namespace gig {
+Line 649 
 namespace gig {
       * that will be returned to determine the actual cached samples, but note
       * that the size is given in bytes! You get the number of actually cached
       * samples by dividing it by the frame size of the sample:
-      *
+      * @code
       *  buffer_t buf       = pSample->LoadSampleData(acquired_samples);
       *  long cachedsamples = buf.Size / pSample->FrameSize;
+      * @endcode
       *
       * @param SampleCount - number of sample points to load into RAM
       * @returns             buffer_t structure with start address and size of
-Line 189 
 namespace gig {
+Line 698 
 namespace gig {
       * that will be returned to determine the actual cached samples, but note
       * that the size is given in bytes! You get the number of actually cached
       * samples by dividing it by the frame size of the sample:
-      *
+      * @code
       *  buffer_t buf       = pSample->LoadSampleDataWithNullSamplesExtension(acquired_samples, null_samples);
       *  long cachedsamples = buf.Size / pSample->FrameSize;
-      *
+      * @endcode
       * The method will add \a NullSamplesCount silence samples past the
       * official buffer end (this won't affect the 'Size' member of the
       * buffer_t structure, that means 'Size' always reflects the size of the
-Line 213 
 namespace gig {
+Line 722 
 namespace gig {
          if (SampleCount > this->SamplesTotal) SampleCount = this->SamplesTotal;
          if (RAMCache.pStart) delete[] (int8_t*) RAMCache.pStart;
          unsigned long allocationsize = (SampleCount + NullSamplesCount) * this->FrameSize;
+         SetPos(0); // reset read position to begin of sample
          RAMCache.pStart            = new int8_t[allocationsize];
          RAMCache.Size              = Read(RAMCache.pStart, SampleCount) * this->FrameSize;
          RAMCache.NullExtensionSize = allocationsize - RAMCache.Size;
-Line 250 
 namespace gig {
+Line 760 
 namespace gig {
          if (RAMCache.pStart) delete[] (int8_t*) RAMCache.pStart;
          RAMCache.pStart = NULL;
          RAMCache.Size   = 0;
+         RAMCache.NullExtensionSize = 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);
      }
      /**
-Line 307 
 namespace gig {
+Line 853 
 namespace gig {
      /**
       * Returns the current position in the sample (in sample points).
       */
-     unsigned long Sample::GetPos() {
+     unsigned long Sample::GetPos() const {
          if (Compressed) return SamplePos;
          else            return pCkData->GetPos() / FrameSize;
      }
-Line 323 
 namespace gig {
+Line 869 
 namespace gig {
       * for the next time you call this method is stored in \a pPlaybackState.
       * You have to allocate and initialize the playback_state_t structure by
       * yourself before you use it to stream a sample:
-      *
+      * @code
-      * <i>
+      * gig::playback_state_t playbackstate;
-      * gig::playback_state_t playbackstate;                           <br>
+      * playbackstate.position         = 0;
-      * playbackstate.position         = 0;                            <br>
+      * playbackstate.reverse          = false;
-      * playbackstate.reverse          = false;                        <br>
+      * playbackstate.loop_cycles_left = pSample->LoopPlayCount;
-      * playbackstate.loop_cycles_left = pSample->LoopPlayCount;       <br>
+      * @endcode
-      * </i>
-      *
       * You don't have to take care of things like if there is actually a loop
       * defined or if the current read position is located within a loop area.
       * The method already handles such cases by itself.
       *
+      * <b>Caution:</b> If you are using more than one streaming thread, you
+      * have to use an external decompression buffer for <b>EACH</b>
+      * streaming thread to avoid race conditions and crashes!
+      *
       * @param pBuffer          destination buffer
       * @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) {
+     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));
-                                 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);
+                                 } 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--;
+                                 if (totalreadsamples > swapareastart) //FIXME: this if() is just a crash workaround for now (#102), but totalreadsamples <= swapareastart should never be the case, so there's probably still a bug above!
-                                 pPlaybackState->reverse = false;
+                                     SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
                              }
+                         } 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));
+                         } 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));
+                             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));
+                             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;
+                     }
                  }
              }
          }
          // read on without looping
          if (samplestoread) do {
-             readsamples = Read(&pDst[totalreadsamples * this->FrameSize], samplestoread);
+             readsamples = Read(&pDst[totalreadsamples * this->FrameSize], samplestoread, pExternalDecompressionBuffer);
              samplestoread    -= readsamples;
              totalreadsamples += readsamples;
          } while (readsamples && samplestoread);
-Line 495 
 namespace gig {
+Line 1053 
 namespace gig {
       * and <i>SetPos()</i> if you don't want to load the sample into RAM,
       * thus for disk streaming.
       *
+      * <b>Caution:</b> If you are using more than one streaming thread, you
+      * 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
       * @returns            number of successfully read sample points
-      * @see                SetPos()
+      * @see                SetPos(), CreateDecompressionBuffer()
       */
-     unsigned long Sample::Read(void* pBuffer, unsigned long SampleCount) {
+     unsigned long Sample::Read(void* pBuffer, unsigned long SampleCount, buffer_t* pExternalDecompressionBuffer) {
          if (SampleCount == 0) return 0;
-         if (!Compressed) return pCkData->Read(pBuffer, SampleCount, FrameSize); //FIXME: channel inversion due to endian correction?
+         if (!Compressed) {
-         else { //FIXME: no support for mono compressed samples yet, are there any?
+             if (BitDepth == 24) {
+                 return pCkData->Read(pBuffer, SampleCount * FrameSize, 1) / FrameSize;
+             }
+             else { // 16 bit
+                 // (pCkData->Read does endian correction)
+                 return Channels == 2 ? pCkData->Read(pBuffer, SampleCount << 1, 2) >> 1
+                                      : pCkData->Read(pBuffer, SampleCount, 2);
+             }
+         }
+         else {
              if (this->SamplePos >= this->SamplesTotal) return 0;
-             //TODO: efficiency: we simply assume here that all frames are compressed, maybe we should test for an average compression rate
+             //TODO: efficiency: maybe we should test for an average compression rate
-             // best case needed buffer size (all frames compressed)
+             unsigned long assumedsize      = GuessSize(SampleCount),
-             unsigned long assumedsize      = (SampleCount << 1)  + // *2 (16 Bit, stereo, but assume all frames compressed)
-                                              (SampleCount >> 10) + // 10 bytes header per 2048 sample points
-,                 // at least one worst case sample frame
                            remainingbytes   = 0,           // remaining bytes in the local buffer
                            remainingsamples = SampleCount,
-                           copysamples;
+                           copysamples, skipsamples,
-             int currentframeoffset = this->FrameOffset;   // offset in current sample frame since last Read()
+                           currentframeoffset = this->FrameOffset;  // offset in current sample frame since last Read()
              this->FrameOffset = 0;
-             if (assumedsize > this->DecompressionBufferSize) {
+             buffer_t* pDecompressionBuffer = (pExternalDecompressionBuffer) ? pExternalDecompressionBuffer : &InternalDecompressionBuffer;
-                 // local buffer reallocation - hope this won't happen
-                 if (this->pDecompressionBuffer) delete[] (int8_t*) this->pDecompressionBuffer;
+             // if decompression buffer too small, then reduce amount of samples to read
-                 this->pDecompressionBuffer    = new int8_t[assumedsize << 1]; // double of current needed size
+             if (pDecompressionBuffer->Size < assumedsize) {
-                 this->DecompressionBufferSize = assumedsize;
+                 std::cerr << "gig::Read(): WARNING - decompression buffer size too small!" << std::endl;
+                 SampleCount      = WorstCaseMaxSamples(pDecompressionBuffer);
+                 remainingsamples = SampleCount;
+                 assumedsize      = GuessSize(SampleCount);
              }
-             int16_t  compressionmode, left, dleft, right, dright;
+             unsigned char* pSrc = (unsigned char*) pDecompressionBuffer->pStart;
-             int8_t*  pSrc = (int8_t*)  this->pDecompressionBuffer;
+             int16_t* pDst = static_cast<int16_t*>(pBuffer);
-             int16_t* pDst = (int16_t*) pBuffer;
+             uint8_t* pDst24 = static_cast<uint8_t*>(pBuffer);
              remainingbytes = pCkData->Read(pSrc, assumedsize, 1);
-             while (remainingsamples) {
+             while (remainingsamples && remainingbytes) {
+                 unsigned long framesamples = SamplesPerFrame;
-                 // reload from disk to local buffer if needed
+                 unsigned long framebytes, rightChannelOffset = 0, nextFrameOffset;
-                 if (remainingbytes < 8194) {
-                     if (pCkData->GetState() != RIFF::stream_ready) {
+                 int mode_l = *pSrc++, mode_r = 0;
-                         this->SamplePos = this->SamplesTotal;
-                         return (SampleCount - remainingsamples);
+                 if (Channels == 2) {
-                     }
+                     mode_r = *pSrc++;
-                     assumedsize    = remainingsamples;
+                     framebytes = bytesPerFrame[mode_l] + bytesPerFrame[mode_r] + 2;
-                     assumedsize    = (assumedsize << 1)  + // *2 (16 Bit, stereo, but assume all frames compressed)
+                     rightChannelOffset = bytesPerFrameNoHdr[mode_l];
-                                      (assumedsize >> 10) + // 10 bytes header per 2048 sample points
+                     nextFrameOffset = rightChannelOffset + bytesPerFrameNoHdr[mode_r];
-;                 // at least one worst case sample frame
+                     if (remainingbytes < framebytes) { // last frame in sample
-                     pCkData->SetPos(remainingbytes, RIFF::stream_backward);
+                         framesamples = SamplesInLastFrame;
-                     if (pCkData->RemainingBytes() < assumedsize) assumedsize = pCkData->RemainingBytes();
+                         if (mode_l == 4 && (framesamples & 1)) {
-                     remainingbytes = pCkData->Read(this->pDecompressionBuffer, assumedsize, 1);
+                             rightChannelOffset = ((framesamples + 1) * bitsPerSample[mode_l]) >> 3;
-                     pSrc = (int8_t*) this->pDecompressionBuffer;
+                         }
+                         else {
+                             rightChannelOffset = (framesamples * bitsPerSample[mode_l]) >> 3;
+                         }
+                     }
+                 }
+                 else {
+                     framebytes = bytesPerFrame[mode_l] + 1;
+                     nextFrameOffset = bytesPerFrameNoHdr[mode_l];
+                     if (remainingbytes < framebytes) {
+                         framesamples = SamplesInLastFrame;
+                     }
                  }
                  // determine how many samples in this frame to skip and read
-                 if (remainingsamples >= 2048) {
+                 if (currentframeoffset + remainingsamples >= framesamples) {
-                     copysamples       = 2048 - currentframeoffset;
+                     if (currentframeoffset <= framesamples) {
-                     remainingsamples -= copysamples;
+                         copysamples = framesamples - currentframeoffset;
+                         skipsamples = currentframeoffset;
+                     }
+                     else {
+                         copysamples = 0;
+                         skipsamples = framesamples;
+                     }
                  }
                  else {
+                     // This frame has enough data for pBuffer, but not
+                     // all of the frame is needed. Set file position
+                     // to start of this frame for next call to Read.
                      copysamples = remainingsamples;
-                     if (currentframeoffset + copysamples > 2048) {
+                     skipsamples = currentframeoffset;
-                         copysamples = 2048 - currentframeoffset;
+                     pCkData->SetPos(remainingbytes, RIFF::stream_backward);
-                         remainingsamples -= copysamples;
+                     this->FrameOffset = currentframeoffset + copysamples;
-                     }
+                 }
-                     else {
+                 remainingsamples -= copysamples;
+                 if (remainingbytes > framebytes) {
+                     remainingbytes -= framebytes;
+                     if (remainingsamples == 0 &&
+                         currentframeoffset + copysamples == framesamples) {
+                         // This frame has enough data for pBuffer, and
+                         // all of the frame is needed. Set file
+                         // position to start of next frame for next
+                         // call to Read. FrameOffset is 0.
                          pCkData->SetPos(remainingbytes, RIFF::stream_backward);
-                         remainingsamples = 0;
-                         this->FrameOffset = currentframeoffset + copysamples;
                      }
                  }
+                 else remainingbytes = 0;
-                 // decompress and copy current frame from local buffer to destination buffer
+                 currentframeoffset -= skipsamples;
-                 compressionmode = *(int16_t*)pSrc; pSrc+=2;
-                 switch (compressionmode) {
+                 if (copysamples == 0) {
-                     case 1: // left channel compressed
+                     // skip this frame
-                         remainingbytes -= 6150; // (left 8 bit, right 16 bit, +6 byte header)
+                     pSrc += framebytes - Channels;
-                         if (!remainingsamples && copysamples == 2048)
+                 }
-                             pCkData->SetPos(remainingbytes, RIFF::stream_backward);
+                 else {
+                     const unsigned char* const param_l = pSrc;
-                         left  = *(int16_t*)pSrc; pSrc+=2;
+                     if (BitDepth == 24) {
-                         dleft = *(int16_t*)pSrc; pSrc+=2;
+                         if (mode_l != 2) pSrc += 12;
-                         while (currentframeoffset) {
-                             dleft -= *pSrc;
+                         if (Channels == 2) { // Stereo
-                             left  -= dleft;
+                             const unsigned char* const param_r = pSrc;
-                             pSrc+=3; // 8 bit left channel, skip uncompressed right channel (16 bit)
+                             if (mode_r != 2) pSrc += 12;
-                             currentframeoffset--;
-                         }
+                             Decompress24(mode_l, param_l, 6, pSrc, pDst24,
-                         while (copysamples) {
+                                          skipsamples, copysamples, TruncatedBits);
-                             dleft -= *pSrc; pSrc++;
+                             Decompress24(mode_r, param_r, 6, pSrc + rightChannelOffset, pDst24 + 3,
-                             left  -= dleft;
+                                          skipsamples, copysamples, TruncatedBits);
-                             *pDst = left; pDst++;
+                             pDst24 += copysamples * 6;
-                             *pDst = *(int16_t*)pSrc; pDst++; pSrc+=2;
-                             copysamples--;
-                         }
-                         break;
-                     case 256: // right channel compressed
-                         remainingbytes -= 6150; // (left 16 bit, right 8 bit, +6 byte header)
-                         if (!remainingsamples && copysamples == 2048)
-                             pCkData->SetPos(remainingbytes, RIFF::stream_backward);
-                         right  = *(int16_t*)pSrc; pSrc+=2;
-                         dright = *(int16_t*)pSrc; pSrc+=2;
-                         if (currentframeoffset) {
-                             pSrc+=2; // skip uncompressed left channel, now we can increment by 3
-                             while (currentframeoffset) {
-                                 dright -= *pSrc;
-                                 right  -= dright;
-                                 pSrc+=3; // 8 bit right channel, skip uncompressed left channel (16 bit)
-                                 currentframeoffset--;
-                             }
-                             pSrc-=2; // back aligned to left channel
                          }
-                         while (copysamples) {
+                         else { // Mono
-                             *pDst = *(int16_t*)pSrc; pDst++; pSrc+=2;
+                             Decompress24(mode_l, param_l, 3, pSrc, pDst24,
-                             dright -= *pSrc; pSrc++;
+                                          skipsamples, copysamples, TruncatedBits);
-                             right  -= dright;
+                             pDst24 += copysamples * 3;
-                             *pDst = right; pDst++;
-                             copysamples--;
                          }
-                         break;
+                     }
-                     case 257: // both channels compressed
+                     else { // 16 bit
-                         remainingbytes -= 4106; // (left 8 bit, right 8 bit, +10 byte header)
+                         if (mode_l) pSrc += 4;
-                         if (!remainingsamples && copysamples == 2048)
-                             pCkData->SetPos(remainingbytes, RIFF::stream_backward);
+                         int step;
+                         if (Channels == 2) { // Stereo
-                         left   = *(int16_t*)pSrc; pSrc+=2;
+                             const unsigned char* const param_r = pSrc;
-                         dleft  = *(int16_t*)pSrc; pSrc+=2;
+                             if (mode_r) pSrc += 4;
-                         right  = *(int16_t*)pSrc; pSrc+=2;
-                         dright = *(int16_t*)pSrc; pSrc+=2;
+                             step = (2 - mode_l) + (2 - mode_r);
-                         while (currentframeoffset) {
+                             Decompress16(mode_l, param_l, step, 2, pSrc, pDst, skipsamples, copysamples);
-                             dleft  -= *pSrc; pSrc++;
+                             Decompress16(mode_r, param_r, step, 2, pSrc + (2 - mode_l), pDst + 1,
-                             left   -= dleft;
+                                          skipsamples, copysamples);
-                             dright -= *pSrc; pSrc++;
+                             pDst += copysamples << 1;
-                             right  -= dright;
-                             currentframeoffset--;
                          }
-                         while (copysamples) {
+                         else { // Mono
-                             dleft  -= *pSrc; pSrc++;
+                             step = 2 - mode_l;
-                             left   -= dleft;
+                             Decompress16(mode_l, param_l, step, 1, pSrc, pDst, skipsamples, copysamples);
-                             dright -= *pSrc; pSrc++;
+                             pDst += copysamples;
-                             right  -= dright;
-                             *pDst = left;  pDst++;
-                             *pDst = right; pDst++;
-                             copysamples--;
                          }
-                         break;
+                     }
-                     default: // both channels uncompressed
+                     pSrc += nextFrameOffset;
-                         remainingbytes -= 8194; // (left 16 bit, right 16 bit, +2 byte header)
-                         if (!remainingsamples && copysamples == 2048)
-                             pCkData->SetPos(remainingbytes, RIFF::stream_backward);
-                         pSrc += currentframeoffset << 2;
-                         currentframeoffset = 0;
-                         memcpy(pDst, pSrc, copysamples << 2);
-                         pDst += copysamples << 1;
-                         pSrc += copysamples << 2;
-                         break;
                  }
-             }
+                 // reload from disk to local buffer if needed
+                 if (remainingsamples && remainingbytes < WorstCaseFrameSize && pCkData->GetState() == RIFF::stream_ready) {
+                     assumedsize    = GuessSize(remainingsamples);
+                     pCkData->SetPos(remainingbytes, RIFF::stream_backward);
+                     if (pCkData->RemainingBytes() < assumedsize) assumedsize = pCkData->RemainingBytes();
+                     remainingbytes = pCkData->Read(pDecompressionBuffer->pStart, assumedsize, 1);
+                     pSrc = (unsigned char*) pDecompressionBuffer->pStart;
+                 }
+             } // while
              this->SamplePos += (SampleCount - remainingsamples);
              if (this->SamplePos > this->SamplesTotal) this->SamplePos = this->SamplesTotal;
              return (SampleCount - remainingsamples);
          }
      }
+     /** @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) {
+             __resetCRC(crc);
+         }
+         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);
+         }
+         __calculateCRC((unsigned char *)pBuffer, SampleCount * FrameSize, crc);
+         // 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, __encodeCRC(crc));
+         }
+         return res;
+     }
+     /**
+      * Allocates a decompression buffer for streaming (compressed) samples
+      * with Sample::Read(). If you are using more than one streaming thread
+      * in your application you <b>HAVE</b> to create a decompression buffer
+      * for <b>EACH</b> of your streaming threads and provide it with the
+      * Sample::Read() call in order to avoid race conditions and crashes.
+      *
+      * You should free the memory occupied by the allocated buffer(s) once
+      * you don't need one of your streaming threads anymore by calling
+      * DestroyDecompressionBuffer().
+      *
+      * @param MaxReadSize - the maximum size (in sample points) you ever
+      *                      expect to read with one Read() call
+      * @returns allocated decompression buffer
+      * @see DestroyDecompressionBuffer()
+      */
+     buffer_t Sample::CreateDecompressionBuffer(unsigned long MaxReadSize) {
+         buffer_t result;
+         const double worstCaseHeaderOverhead =
+                 (256.0 /*frame size*/ + 12.0 /*header*/ + 2.0 /*compression type flag (stereo)*/) / 256.0;
+         result.Size              = (unsigned long) (double(MaxReadSize) * 3.0 /*(24 Bit)*/ * 2.0 /*stereo*/ * worstCaseHeaderOverhead);
+         result.pStart            = new int8_t[result.Size];
+         result.NullExtensionSize = 0;
+         return result;
+     }
+     /**
+      * Free decompression buffer, previously created with
+      * CreateDecompressionBuffer().
+      *
+      * @param DecompressionBuffer - previously allocated decompression
+      *                              buffer to free
+      */
+     void Sample::DestroyDecompressionBuffer(buffer_t& DecompressionBuffer) {
+         if (DecompressionBuffer.Size && DecompressionBuffer.pStart) {
+             delete[] (int8_t*) DecompressionBuffer.pStart;
+             DecompressionBuffer.pStart = NULL;
+             DecompressionBuffer.Size   = 0;
+             DecompressionBuffer.NullExtensionSize = 0;
+         }
+     }
+     /**
+      * 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 && pDecompressionBuffer) delete[] (int8_t*) pDecompressionBuffer;
+         if (!Instances && InternalDecompressionBuffer.Size) {
+             delete[] (unsigned char*) InternalDecompressionBuffer.pStart;
+             InternalDecompressionBuffer.pStart = NULL;
+             InternalDecompressionBuffer.Size   = 0;
+         }
          if (FrameTable) delete[] FrameTable;
          if (RAMCache.pStart) delete[] (int8_t*) RAMCache.pStart;
      }
-Line 673 
 namespace gig {
+Line 1356 
 namespace gig {
      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, allways 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;
+                 VelocityResponseDepth = 0;
+             }
+             uint8_t releasevelocityresponse = _3ewa->ReadUint8();
+             if (releasevelocityresponse < 5) {
+                 ReleaseVelocityResponseCurve = curve_type_nonlinear;
+                 ReleaseVelocityResponseDepth = releasevelocityresponse;
+             } else if (releasevelocityresponse < 10) {
+                 ReleaseVelocityResponseCurve = curve_type_linear;
+                 ReleaseVelocityResponseDepth = releasevelocityresponse - 5;
+             } else if (releasevelocityresponse < 15) {
+                 ReleaseVelocityResponseCurve = curve_type_special;
+                 ReleaseVelocityResponseDepth = releasevelocityresponse - 10;
+             } else {
+                 ReleaseVelocityResponseCurve = curve_type_unknown;
+                 ReleaseVelocityResponseDepth = 0;
+             }
+             VelocityResponseCurveScaling = _3ewa->ReadUint8();
+             AttenuationControllerThreshold = _3ewa->ReadInt8();
+             _3ewa->ReadInt32(); // unknown
+             SampleStartOffset = (uint16_t) _3ewa->ReadInt16();
+             _3ewa->ReadInt16(); // unknown
+             uint8_t pitchTrackDimensionBypass = _3ewa->ReadInt8();
+             PitchTrack = GIG_PITCH_TRACK_EXTRACT(pitchTrackDimensionBypass);
+             if      (pitchTrackDimensionBypass & 0x10) DimensionBypass = dim_bypass_ctrl_94;
+             else if (pitchTrackDimensionBypass & 0x20) DimensionBypass = dim_bypass_ctrl_95;
+             else                                       DimensionBypass = dim_bypass_ctrl_none;
+             uint8_t pan = _3ewa->ReadUint8();
+             Pan         = (pan < 64) ? pan : -((int)pan - 63); // signed 7 bit -> signed 8 bit
+             SelfMask = _3ewa->ReadInt8() & 0x01;
+             _3ewa->ReadInt8(); // unknown
+             uint8_t lfo3ctrl = _3ewa->ReadUint8();
+             LFO3Controller           = static_cast<lfo3_ctrl_t>(lfo3ctrl & 0x07); // lower 3 bits
+             LFO3Sync                 = lfo3ctrl & 0x20; // bit 5
+             InvertAttenuationController = lfo3ctrl & 0x80; // bit 7
+             AttenuationController  = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
+             uint8_t lfo2ctrl       = _3ewa->ReadUint8();
+             LFO2Controller         = static_cast<lfo2_ctrl_t>(lfo2ctrl & 0x07); // lower 3 bits
+             LFO2FlipPhase          = lfo2ctrl & 0x80; // bit 7
+             LFO2Sync               = lfo2ctrl & 0x20; // bit 5
+             bool extResonanceCtrl  = lfo2ctrl & 0x40; // bit 6
+             uint8_t lfo1ctrl       = _3ewa->ReadUint8();
+             LFO1Controller         = static_cast<lfo1_ctrl_t>(lfo1ctrl & 0x07); // lower 3 bits
+             LFO1FlipPhase          = lfo1ctrl & 0x80; // bit 7
+             LFO1Sync               = lfo1ctrl & 0x40; // bit 6
+             VCFResonanceController = (extResonanceCtrl) ? static_cast<vcf_res_ctrl_t>(GIG_VCF_RESONANCE_CTRL_EXTRACT(lfo1ctrl))
+                                                         : vcf_res_ctrl_none;
+             uint16_t eg3depth = _3ewa->ReadUint16();
+             EG3Depth = (eg3depth <= 1200) ? eg3depth /* positives */
+                                         : (-1) * (int16_t) ((eg3depth ^ 0xfff) + 1); /* binary complementary for negatives */
+             _3ewa->ReadInt16(); // unknown
+             ChannelOffset = _3ewa->ReadUint8() / 4;
+             uint8_t regoptions = _3ewa->ReadUint8();
+             MSDecode           = regoptions & 0x01; // bit 0
+             SustainDefeat      = regoptions & 0x02; // bit 1
+             _3ewa->ReadInt16(); // unknown
+             VelocityUpperLimit = _3ewa->ReadInt8();
+             _3ewa->ReadInt8(); // unknown
+             _3ewa->ReadInt16(); // unknown
+             ReleaseTriggerDecay = _3ewa->ReadUint8(); // release trigger decay
+             _3ewa->ReadInt8(); // unknown
+             _3ewa->ReadInt8(); // unknown
+             EG1Hold = _3ewa->ReadUint8() & 0x80; // bit 7
+             uint8_t vcfcutoff = _3ewa->ReadUint8();
+             VCFEnabled = vcfcutoff & 0x80; // bit 7
+             VCFCutoff  = vcfcutoff & 0x7f; // lower 7 bits
+             VCFCutoffController = static_cast<vcf_cutoff_ctrl_t>(_3ewa->ReadUint8());
+             uint8_t vcfvelscale = _3ewa->ReadUint8();
+             VCFCutoffControllerInvert = vcfvelscale & 0x80; // bit 7
+             VCFVelocityScale = vcfvelscale & 0x7f; // lower 7 bits
+             _3ewa->ReadInt8(); // unknown
+             uint8_t vcfresonance = _3ewa->ReadUint8();
+             VCFResonance = vcfresonance & 0x7f; // lower 7 bits
+             VCFResonanceDynamic = !(vcfresonance & 0x80); // bit 7
+             uint8_t vcfbreakpoint         = _3ewa->ReadUint8();
+             VCFKeyboardTracking           = vcfbreakpoint & 0x80; // bit 7
+             VCFKeyboardTrackingBreakpoint = vcfbreakpoint & 0x7f; // lower 7 bits
+             uint8_t vcfvelocity = _3ewa->ReadUint8();
+             VCFVelocityDynamicRange = vcfvelocity % 5;
+             VCFVelocityCurve        = static_cast<curve_type_t>(vcfvelocity / 5);
+             VCFType = static_cast<vcf_type_t>(_3ewa->ReadUint8());
+             if (VCFType == vcf_type_lowpass) {
+                 if (lfo3ctrl & 0x40) // bit 6
+                     VCFType = vcf_type_lowpassturbo;
+             }
+             if (_3ewa->RemainingBytes() >= 8) {
+                 _3ewa->Read(DimensionUpperLimits, 1, 8);
+             } else {
+                 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);
          }
-         else {
-             VelocityResponseCurve = curve_type_unknown;
+         pVelocityAttenuationTable = GetVelocityTable(VelocityResponseCurve,
-             VelocityResponseDepth = 0;
+                                                      VelocityResponseDepth,
+                                                      VelocityResponseCurveScaling);
+         pVelocityReleaseTable = GetReleaseVelocityTable(
+                                     ReleaseVelocityResponseCurve,
+                                     ReleaseVelocityResponseDepth
+                                 );
+         pVelocityCutoffTable = GetCutoffVelocityTable(VCFVelocityCurve,
+                                                       VCFVelocityDynamicRange,
+                                                       VCFVelocityScale,
+                                                       VCFCutoffController);
+         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++;
+         //NOTE: I think we cannot call CopyAssign() here (in a constructor) as long as its a virtual method
+         *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];
          }
-         uint8_t releasevelocityresponse = _3ewa->ReadUint8();
+         if (src.pSampleLoops) {
-         if (releasevelocityresponse < 5) {
+             pSampleLoops = new DLS::sample_loop_t[src.SampleLoops];
-             ReleaseVelocityResponseCurve = curve_type_nonlinear;
+             for (int k = 0 ; k < src.SampleLoops ; k++)
-             ReleaseVelocityResponseDepth = releasevelocityresponse;
+                 pSampleLoops[k] = src.pSampleLoops[k];
-         }
-         else if (releasevelocityresponse < 10) {
-             ReleaseVelocityResponseCurve = curve_type_linear;
-             ReleaseVelocityResponseDepth = releasevelocityresponse - 5;
-         }
-         else if (releasevelocityresponse < 15) {
-             ReleaseVelocityResponseCurve = curve_type_special;
-             ReleaseVelocityResponseDepth = releasevelocityresponse - 10;
          }
-         else {
+     }
-             ReleaseVelocityResponseCurve = curve_type_unknown;
-             ReleaseVelocityResponseDepth = 0;
+     /**
+      * Make a (semi) deep copy of the DimensionRegion object given by @a orig
+      * and assign it to this object.
+      *
+      * Note that all sample pointers referenced by @a orig are simply copied as
+      * memory address. Thus the respective samples are shared, not duplicated!
+      *
+      * @param orig - original DimensionRegion object to be copied from
+      */
+     void DimensionRegion::CopyAssign(const DimensionRegion* orig) {
+         CopyAssign(orig, NULL);
+     }
+     /**
+      * Make a (semi) deep copy of the DimensionRegion object given by @a orig
+      * and assign it to this object.
+      *
+      * @param orig - original DimensionRegion object to be copied from
+      * @param mSamples - crosslink map between the foreign file's samples and
+      *                   this file's samples
+      */
+     void DimensionRegion::CopyAssign(const DimensionRegion* orig, const std::map<Sample*,Sample*>* mSamples) {
+         // delete all allocated data first
+         if (VelocityTable) delete [] VelocityTable;
+         if (pSampleLoops) delete [] pSampleLoops;
+         // backup parent list pointer
+         RIFF::List* p = pParentList;
+         gig::Sample* pOriginalSample = pSample;
+         gig::Region* pOriginalRegion = pRegion;
+         //NOTE: copy code copied from assignment constructor above, see comment there as well
+         *this = *orig; // default memberwise shallow copy of all parameters
+         // restore members that shall not be altered
+         pParentList = p; // restore the chunk pointer
+         pRegion = pOriginalRegion;
+         // only take the raw sample reference reference if the
+         // two DimensionRegion objects are part of the same file
+         if (pOriginalRegion->GetParent()->GetParent() != orig->pRegion->GetParent()->GetParent()) {
+             pSample = pOriginalSample;
+         }
+         if (mSamples && mSamples->count(orig->pSample)) {
+             pSample = mSamples->find(orig->pSample)->second;
          }
-         VelocityResponseCurveScaling = _3ewa->ReadUint8();
-         AttenuationControllerThreshold = _3ewa->ReadInt8();
-         _3ewa->ReadInt32(); // unknown
-         SampleStartOffset = (uint16_t) _3ewa->ReadInt16();
-         _3ewa->ReadInt16(); // unknown
-         uint8_t pitchTrackDimensionBypass = _3ewa->ReadInt8();
-         PitchTrack = GIG_PITCH_TRACK_EXTRACT(pitchTrackDimensionBypass);
-         if      (pitchTrackDimensionBypass & 0x10) DimensionBypass = dim_bypass_ctrl_94;
-         else if (pitchTrackDimensionBypass & 0x20) DimensionBypass = dim_bypass_ctrl_95;
-         else                                       DimensionBypass = dim_bypass_ctrl_none;
-         uint8_t pan = _3ewa->ReadUint8();
-         Pan         = (pan < 64) ? pan : (-1) * (int8_t)pan - 63;
-         SelfMask = _3ewa->ReadInt8() & 0x01;
-         _3ewa->ReadInt8(); // unknown
-         uint8_t lfo3ctrl = _3ewa->ReadUint8();
-         LFO3Controller           = static_cast<lfo3_ctrl_t>(lfo3ctrl & 0x07); // lower 3 bits
-         LFO3Sync                 = lfo3ctrl & 0x20; // bit 5
-         InvertAttenuationController = lfo3ctrl & 0x80; // bit 7
-         if (VCFType == vcf_type_lowpass) {
-             if (lfo3ctrl & 0x40) // bit 6
-                 VCFType = vcf_type_lowpassturbo;
-         }
-         AttenuationController  = DecodeLeverageController(static_cast<_lev_ctrl_t>(_3ewa->ReadUint8()));
-         uint8_t lfo2ctrl       = _3ewa->ReadUint8();
-         LFO2Controller         = static_cast<lfo2_ctrl_t>(lfo2ctrl & 0x07); // lower 3 bits
-         LFO2FlipPhase          = lfo2ctrl & 0x80; // bit 7
-         LFO2Sync               = lfo2ctrl & 0x20; // bit 5
-         bool extResonanceCtrl  = lfo2ctrl & 0x40; // bit 6
-         uint8_t lfo1ctrl       = _3ewa->ReadUint8();
-         LFO1Controller         = static_cast<lfo1_ctrl_t>(lfo1ctrl & 0x07); // lower 3 bits
-         LFO1FlipPhase          = lfo1ctrl & 0x80; // bit 7
-         LFO1Sync               = lfo1ctrl & 0x40; // bit 6
-         VCFResonanceController = (extResonanceCtrl) ? static_cast<vcf_res_ctrl_t>(GIG_VCF_RESONANCE_CTRL_EXTRACT(lfo1ctrl))
-                                                     : vcf_res_ctrl_none;
-         uint16_t eg3depth = _3ewa->ReadUint16();
-         EG3Depth = (eg3depth <= 1200) ? eg3depth /* positives */
-                                       : (-1) * (int16_t) ((eg3depth ^ 0xffff) + 1); /* binary complementary for negatives */
-         _3ewa->ReadInt16(); // unknown
-         ChannelOffset = _3ewa->ReadUint8() / 4;
-         uint8_t regoptions = _3ewa->ReadUint8();
-         MSDecode           = regoptions & 0x01; // bit 0
-         SustainDefeat      = regoptions & 0x02; // bit 1
-         _3ewa->ReadInt16(); // unknown
-         VelocityUpperLimit = _3ewa->ReadInt8();
-         _3ewa->ReadInt8(); // unknown
-         _3ewa->ReadInt16(); // unknown
-         ReleaseTriggerDecay = _3ewa->ReadUint8(); // release trigger decay
-         _3ewa->ReadInt8(); // unknown
-         _3ewa->ReadInt8(); // unknown
-         EG1Hold = _3ewa->ReadUint8() & 0x80; // bit 7
-         uint8_t vcfcutoff = _3ewa->ReadUint8();
-         VCFEnabled = vcfcutoff & 0x80; // bit 7
-         VCFCutoff  = vcfcutoff & 0x7f; // lower 7 bits
-         VCFCutoffController = static_cast<vcf_cutoff_ctrl_t>(_3ewa->ReadUint8());
-         VCFVelocityScale = _3ewa->ReadUint8();
-         _3ewa->ReadInt8(); // unknown
-         uint8_t vcfresonance = _3ewa->ReadUint8();
-         VCFResonance = vcfresonance & 0x7f; // lower 7 bits
-         VCFResonanceDynamic = !(vcfresonance & 0x80); // bit 7
-         uint8_t vcfbreakpoint         = _3ewa->ReadUint8();
-         VCFKeyboardTracking           = vcfbreakpoint & 0x80; // bit 7
-         VCFKeyboardTrackingBreakpoint = vcfbreakpoint & 0x7f; // lower 7 bits
-         uint8_t vcfvelocity = _3ewa->ReadUint8();
-         VCFVelocityDynamicRange = vcfvelocity % 5;
-         VCFVelocityCurve        = static_cast<curve_type_t>(vcfvelocity / 5);
-         VCFType = static_cast<vcf_type_t>(_3ewa->ReadUint8());
-         // get the corresponding velocity->volume table from the table map or create & calculate that table if it doesn't exist yet
+         // deep copy of owned structures
-         uint32_t tableKey = (VelocityResponseCurve<<16) | (VelocityResponseDepth<<8) | VelocityResponseCurveScaling;
+         if (orig->VelocityTable) {
-         if (pVelocityTables->count(tableKey)) { // if key exists
+             VelocityTable = new uint8_t[128];
-             pVelocityAttenuationTable = (*pVelocityTables)[tableKey];
+             for (int k = 0 ; k < 128 ; k++)
+                 VelocityTable[k] = orig->VelocityTable[k];
          }
-         else {
+         if (orig->pSampleLoops) {
-             pVelocityAttenuationTable = new double[128];
+             pSampleLoops = new DLS::sample_loop_t[orig->SampleLoops];
-             switch (VelocityResponseCurve) { // calculate the new table
+             for (int k = 0 ; k < orig->SampleLoops ; k++)
+                 pSampleLoops[k] = orig->pSampleLoops[k];
+         }
+     }
+     /**
+      * Updates the respective member variable and updates @c SampleAttenuation
+      * which depends on this value.
+      */
+     void DimensionRegion::SetGain(int32_t gain) {
+         DLS::Sampler::SetGain(gain);
+         SampleAttenuation = pow(10.0, -Gain / (20.0 * 655360));
+     }
+     /**
+      * 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.
+      *
+      * @param pProgress - callback function for progress notification
+      */
+     void DimensionRegion::UpdateChunks(progress_t* pProgress) {
+         // first update base class's chunk
+         DLS::Sampler::UpdateChunks(pProgress);
+         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:
-                     for (int velocity = 0; velocity < 128; velocity++) {
+                     break;
-                         pVelocityAttenuationTable[velocity] =
-                             GIG_VELOCITY_TRANSFORM_NONLINEAR((double)(velocity+1),(double)(VelocityResponseDepth+1),(double)VelocityResponseCurveScaling);
-                         if      (pVelocityAttenuationTable[velocity] > 1.0) pVelocityAttenuationTable[velocity] = 1.0;
-                         else if (pVelocityAttenuationTable[velocity] < 0.0) pVelocityAttenuationTable[velocity] = 0.0;
-                      }
-                      break;
                  case curve_type_linear:
-                     for (int velocity = 0; velocity < 128; velocity++) {
+                     velocityresponse += 5;
-                         pVelocityAttenuationTable[velocity] =
-                             GIG_VELOCITY_TRANSFORM_LINEAR((double)velocity,(double)(VelocityResponseDepth+1),(double)VelocityResponseCurveScaling);
-                         if      (pVelocityAttenuationTable[velocity] > 1.0) pVelocityAttenuationTable[velocity] = 1.0;
-                         else if (pVelocityAttenuationTable[velocity] < 0.0) pVelocityAttenuationTable[velocity] = 0.0;
-                     }
                      break;
                  case curve_type_special:
-                     for (int velocity = 0; velocity < 128; velocity++) {
+                     velocityresponse += 10;
-                         pVelocityAttenuationTable[velocity] =
-                             GIG_VELOCITY_TRANSFORM_SPECIAL((double)(velocity+1),(double)(VelocityResponseDepth+1),(double)VelocityResponseCurveScaling);
-                         if      (pVelocityAttenuationTable[velocity] > 1.0) pVelocityAttenuationTable[velocity] = 1.0;
-                         else if (pVelocityAttenuationTable[velocity] < 0.0) pVelocityAttenuationTable[velocity] = 0.0;
-                     }
                      break;
                  case curve_type_unknown:
                  default:
-                     throw gig::Exception("Unknown transform curve type.");
+                     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");
              }
-             (*pVelocityTables)[tableKey] = pVelocityAttenuationTable; // put the new table into the tables map
+             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) ^ 0xfff); /* binary complementary for negatives */
+         store16(&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);
          }
      }
+     double* DimensionRegion::GetReleaseVelocityTable(curve_type_t releaseVelocityResponseCurve, uint8_t releaseVelocityResponseDepth) {
+         curve_type_t curveType = releaseVelocityResponseCurve;
+         uint8_t depth = releaseVelocityResponseDepth;
+         // this models a strange behaviour or bug in GSt: two of the
+         // velocity response curves for release time are not used even
+         // if specified, instead another curve is chosen.
+         if ((curveType == curve_type_nonlinear && depth == 0) ||
+             (curveType == curve_type_special   && depth == 4)) {
+             curveType = curve_type_nonlinear;
+             depth = 3;
+         }
+         return GetVelocityTable(curveType, depth, 0);
+     }
+     double* DimensionRegion::GetCutoffVelocityTable(curve_type_t vcfVelocityCurve,
+                                                     uint8_t vcfVelocityDynamicRange,
+                                                     uint8_t vcfVelocityScale,
+                                                     vcf_cutoff_ctrl_t vcfCutoffController)
+     {
+         curve_type_t curveType = vcfVelocityCurve;
+         uint8_t depth = vcfVelocityDynamicRange;
+         // even stranger GSt: two of the velocity response curves for
+         // filter cutoff are not used, instead another special curve
+         // is chosen. This curve is not used anywhere else.
+         if ((curveType == curve_type_nonlinear && depth == 0) ||
+             (curveType == curve_type_special   && depth == 4)) {
+             curveType = curve_type_special;
+             depth = 5;
+         }
+         return GetVelocityTable(curveType, depth,
+                                 (vcfCutoffController <= vcf_cutoff_ctrl_none2)
+                                     ? vcfVelocityScale : 0);
+     }
+     // get the corresponding velocity table from the table map or create & calculate that table if it doesn't exist yet
+     double* DimensionRegion::GetVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling)
+     {
+         double* table;
+         uint32_t tableKey = (curveType<<16) | (depth<<8) | scaling;
+         if (pVelocityTables->count(tableKey)) { // if key exists
+             table = (*pVelocityTables)[tableKey];
+         }
+         else {
+             table = CreateVelocityTable(curveType, depth, scaling);
+             (*pVelocityTables)[tableKey] = table; // put the new table into the tables map
+         }
+         return table;
+     }
+     Region* DimensionRegion::GetParent() const {
+         return pRegion;
+     }
+ // show error if some _lev_ctrl_* enum entry is not listed in the following function
+ // (commented out for now, because "diagnostic push" not supported prior GCC 4.6)
+ // TODO: uncomment and add a GCC version check (see also commented "#pragma GCC diagnostic pop" below)
+ //#pragma GCC diagnostic push
+ //#pragma GCC diagnostic error "-Wswitch"
      leverage_ctrl_t DimensionRegion::DecodeLeverageController(_lev_ctrl_t EncodedController) {
          leverage_ctrl_t decodedcontroller;
          switch (EncodedController) {
-Line 886 
 namespace gig {
+Line 2083 
 namespace gig {
                  decodedcontroller.type = leverage_ctrl_t::type_channelaftertouch;
                  decodedcontroller.controller_number = 0;
                  break;
              // ordinary MIDI control change controller
              case _lev_ctrl_modwheel:
                  decodedcontroller.type = leverage_ctrl_t::type_controlchange;
-Line 980 
 namespace gig {
+Line 2177 
 namespace gig {
                  decodedcontroller.type = leverage_ctrl_t::type_controlchange;
                  decodedcontroller.controller_number = 95;
                  break;
+             // format extension (these controllers are so far only supported by
+             // LinuxSampler & gigedit) they will *NOT* work with
+             // Gigasampler/GigaStudio !
+             case _lev_ctrl_CC3_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 3;
+                 break;
+             case _lev_ctrl_CC6_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 6;
+                 break;
+             case _lev_ctrl_CC7_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 7;
+                 break;
+             case _lev_ctrl_CC8_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 8;
+                 break;
+             case _lev_ctrl_CC9_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 9;
+                 break;
+             case _lev_ctrl_CC10_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 10;
+                 break;
+             case _lev_ctrl_CC11_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 11;
+                 break;
+             case _lev_ctrl_CC14_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 14;
+                 break;
+             case _lev_ctrl_CC15_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 15;
+                 break;
+             case _lev_ctrl_CC20_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 20;
+                 break;
+             case _lev_ctrl_CC21_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 21;
+                 break;
+             case _lev_ctrl_CC22_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 22;
+                 break;
+             case _lev_ctrl_CC23_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 23;
+                 break;
+             case _lev_ctrl_CC24_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 24;
+                 break;
+             case _lev_ctrl_CC25_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 25;
+                 break;
+             case _lev_ctrl_CC26_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 26;
+                 break;
+             case _lev_ctrl_CC27_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 27;
+                 break;
+             case _lev_ctrl_CC28_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 28;
+                 break;
+             case _lev_ctrl_CC29_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 29;
+                 break;
+             case _lev_ctrl_CC30_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 30;
+                 break;
+             case _lev_ctrl_CC31_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 31;
+                 break;
+             case _lev_ctrl_CC68_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 68;
+                 break;
+             case _lev_ctrl_CC69_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 69;
+                 break;
+             case _lev_ctrl_CC70_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 70;
+                 break;
+             case _lev_ctrl_CC71_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 71;
+                 break;
+             case _lev_ctrl_CC72_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 72;
+                 break;
+             case _lev_ctrl_CC73_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 73;
+                 break;
+             case _lev_ctrl_CC74_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 74;
+                 break;
+             case _lev_ctrl_CC75_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 75;
+                 break;
+             case _lev_ctrl_CC76_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 76;
+                 break;
+             case _lev_ctrl_CC77_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 77;
+                 break;
+             case _lev_ctrl_CC78_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 78;
+                 break;
+             case _lev_ctrl_CC79_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 79;
+                 break;
+             case _lev_ctrl_CC84_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 84;
+                 break;
+             case _lev_ctrl_CC85_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 85;
+                 break;
+             case _lev_ctrl_CC86_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 86;
+                 break;
+             case _lev_ctrl_CC87_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 87;
+                 break;
+             case _lev_ctrl_CC89_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 89;
+                 break;
+             case _lev_ctrl_CC90_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 90;
+                 break;
+             case _lev_ctrl_CC96_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 96;
+                 break;
+             case _lev_ctrl_CC97_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 97;
+                 break;
+             case _lev_ctrl_CC102_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 102;
+                 break;
+             case _lev_ctrl_CC103_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 103;
+                 break;
+             case _lev_ctrl_CC104_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 104;
+                 break;
+             case _lev_ctrl_CC105_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 105;
+                 break;
+             case _lev_ctrl_CC106_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 106;
+                 break;
+             case _lev_ctrl_CC107_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 107;
+                 break;
+             case _lev_ctrl_CC108_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 108;
+                 break;
+             case _lev_ctrl_CC109_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 109;
+                 break;
+             case _lev_ctrl_CC110_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 110;
+                 break;
+             case _lev_ctrl_CC111_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 111;
+                 break;
+             case _lev_ctrl_CC112_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 112;
+                 break;
+             case _lev_ctrl_CC113_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 113;
+                 break;
+             case _lev_ctrl_CC114_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 114;
+                 break;
+             case _lev_ctrl_CC115_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 115;
+                 break;
+             case _lev_ctrl_CC116_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 116;
+                 break;
+             case _lev_ctrl_CC117_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 117;
+                 break;
+             case _lev_ctrl_CC118_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 118;
+                 break;
+             case _lev_ctrl_CC119_EXT:
+                 decodedcontroller.type = leverage_ctrl_t::type_controlchange;
+                 decodedcontroller.controller_number = 119;
+                 break;
              // unknown controller type
              default:
                  throw gig::Exception("Unknown leverage controller type.");
          }
          return decodedcontroller;
      }
+ // see above (diagnostic push not supported prior GCC 4.6)
+ //#pragma GCC diagnostic pop
+     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;
+                     // format extension (these controllers are so far only
+                     // supported by LinuxSampler & gigedit) they will *NOT*
+                     // work with Gigasampler/GigaStudio !
+                     case 3:
+                         encodedcontroller = _lev_ctrl_CC3_EXT;
+                         break;
+                     case 6:
+                         encodedcontroller = _lev_ctrl_CC6_EXT;
+                         break;
+                     case 7:
+                         encodedcontroller = _lev_ctrl_CC7_EXT;
+                         break;
+                     case 8:
+                         encodedcontroller = _lev_ctrl_CC8_EXT;
+                         break;
+                     case 9:
+                         encodedcontroller = _lev_ctrl_CC9_EXT;
+                         break;
+                     case 10:
+                         encodedcontroller = _lev_ctrl_CC10_EXT;
+                         break;
+                     case 11:
+                         encodedcontroller = _lev_ctrl_CC11_EXT;
+                         break;
+                     case 14:
+                         encodedcontroller = _lev_ctrl_CC14_EXT;
+                         break;
+                     case 15:
+                         encodedcontroller = _lev_ctrl_CC15_EXT;
+                         break;
+                     case 20:
+                         encodedcontroller = _lev_ctrl_CC20_EXT;
+                         break;
+                     case 21:
+                         encodedcontroller = _lev_ctrl_CC21_EXT;
+                         break;
+                     case 22:
+                         encodedcontroller = _lev_ctrl_CC22_EXT;
+                         break;
+                     case 23:
+                         encodedcontroller = _lev_ctrl_CC23_EXT;
+                         break;
+                     case 24:
+                         encodedcontroller = _lev_ctrl_CC24_EXT;
+                         break;
+                     case 25:
+                         encodedcontroller = _lev_ctrl_CC25_EXT;
+                         break;
+                     case 26:
+                         encodedcontroller = _lev_ctrl_CC26_EXT;
+                         break;
+                     case 27:
+                         encodedcontroller = _lev_ctrl_CC27_EXT;
+                         break;
+                     case 28:
+                         encodedcontroller = _lev_ctrl_CC28_EXT;
+                         break;
+                     case 29:
+                         encodedcontroller = _lev_ctrl_CC29_EXT;
+                         break;
+                     case 30:
+                         encodedcontroller = _lev_ctrl_CC30_EXT;
+                         break;
+                     case 31:
+                         encodedcontroller = _lev_ctrl_CC31_EXT;
+                         break;
+                     case 68:
+                         encodedcontroller = _lev_ctrl_CC68_EXT;
+                         break;
+                     case 69:
+                         encodedcontroller = _lev_ctrl_CC69_EXT;
+                         break;
+                     case 70:
+                         encodedcontroller = _lev_ctrl_CC70_EXT;
+                         break;
+                     case 71:
+                         encodedcontroller = _lev_ctrl_CC71_EXT;
+                         break;
+                     case 72:
+                         encodedcontroller = _lev_ctrl_CC72_EXT;
+                         break;
+                     case 73:
+                         encodedcontroller = _lev_ctrl_CC73_EXT;
+                         break;
+                     case 74:
+                         encodedcontroller = _lev_ctrl_CC74_EXT;
+                         break;
+                     case 75:
+                         encodedcontroller = _lev_ctrl_CC75_EXT;
+                         break;
+                     case 76:
+                         encodedcontroller = _lev_ctrl_CC76_EXT;
+                         break;
+                     case 77:
+                         encodedcontroller = _lev_ctrl_CC77_EXT;
+                         break;
+                     case 78:
+                         encodedcontroller = _lev_ctrl_CC78_EXT;
+                         break;
+                     case 79:
+                         encodedcontroller = _lev_ctrl_CC79_EXT;
+                         break;
+                     case 84:
+                         encodedcontroller = _lev_ctrl_CC84_EXT;
+                         break;
+                     case 85:
+                         encodedcontroller = _lev_ctrl_CC85_EXT;
+                         break;
+                     case 86:
+                         encodedcontroller = _lev_ctrl_CC86_EXT;
+                         break;
+                     case 87:
+                         encodedcontroller = _lev_ctrl_CC87_EXT;
+                         break;
+                     case 89:
+                         encodedcontroller = _lev_ctrl_CC89_EXT;
+                         break;
+                     case 90:
+                         encodedcontroller = _lev_ctrl_CC90_EXT;
+                         break;
+                     case 96:
+                         encodedcontroller = _lev_ctrl_CC96_EXT;
+                         break;
+                     case 97:
+                         encodedcontroller = _lev_ctrl_CC97_EXT;
+                         break;
+                     case 102:
+                         encodedcontroller = _lev_ctrl_CC102_EXT;
+                         break;
+                     case 103:
+                         encodedcontroller = _lev_ctrl_CC103_EXT;
+                         break;
+                     case 104:
+                         encodedcontroller = _lev_ctrl_CC104_EXT;
+                         break;
+                     case 105:
+                         encodedcontroller = _lev_ctrl_CC105_EXT;
+                         break;
+                     case 106:
+                         encodedcontroller = _lev_ctrl_CC106_EXT;
+                         break;
+                     case 107:
+                         encodedcontroller = _lev_ctrl_CC107_EXT;
+                         break;
+                     case 108:
+                         encodedcontroller = _lev_ctrl_CC108_EXT;
+                         break;
+                     case 109:
+                         encodedcontroller = _lev_ctrl_CC109_EXT;
+                         break;
+                     case 110:
+                         encodedcontroller = _lev_ctrl_CC110_EXT;
+                         break;
+                     case 111:
+                         encodedcontroller = _lev_ctrl_CC111_EXT;
+                         break;
+                     case 112:
+                         encodedcontroller = _lev_ctrl_CC112_EXT;
+                         break;
+                     case 113:
+                         encodedcontroller = _lev_ctrl_CC113_EXT;
+                         break;
+                     case 114:
+                         encodedcontroller = _lev_ctrl_CC114_EXT;
+                         break;
+                     case 115:
+                         encodedcontroller = _lev_ctrl_CC115_EXT;
+                         break;
+                     case 116:
+                         encodedcontroller = _lev_ctrl_CC116_EXT;
+                         break;
+                     case 117:
+                         encodedcontroller = _lev_ctrl_CC117_EXT;
+                         break;
+                     case 118:
+                         encodedcontroller = _lev_ctrl_CC118_EXT;
+                         break;
+                     case 119:
+                         encodedcontroller = _lev_ctrl_CC119_EXT;
+                         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--;
-Line 1001 
 namespace gig {
+Line 2719 
 namespace gig {
              delete pVelocityTables;
              pVelocityTables = NULL;
          }
+         if (VelocityTable) delete[] VelocityTable;
      }
      /**
-Line 1018 
 namespace gig {
+Line 2737 
 namespace gig {
          return pVelocityAttenuationTable[MIDIKeyVelocity];
      }
+     double DimensionRegion::GetVelocityRelease(uint8_t MIDIKeyVelocity) {
+         return pVelocityReleaseTable[MIDIKeyVelocity];
+     }
+     double DimensionRegion::GetVelocityCutoff(uint8_t MIDIKeyVelocity) {
+         return pVelocityCutoffTable[MIDIKeyVelocity];
+     }
+     /**
+      * Updates the respective member variable and the lookup table / cache
+      * that depends on this value.
+      */
+     void DimensionRegion::SetVelocityResponseCurve(curve_type_t curve) {
+         pVelocityAttenuationTable =
+             GetVelocityTable(
+                 curve, VelocityResponseDepth, VelocityResponseCurveScaling
+             );
+         VelocityResponseCurve = curve;
+     }
+     /**
+      * Updates the respective member variable and the lookup table / cache
+      * that depends on this value.
+      */
+     void DimensionRegion::SetVelocityResponseDepth(uint8_t depth) {
+         pVelocityAttenuationTable =
+             GetVelocityTable(
+                 VelocityResponseCurve, depth, VelocityResponseCurveScaling
+             );
+         VelocityResponseDepth = depth;
+     }
+     /**
+      * Updates the respective member variable and the lookup table / cache
+      * that depends on this value.
+      */
+     void DimensionRegion::SetVelocityResponseCurveScaling(uint8_t scaling) {
+         pVelocityAttenuationTable =
+             GetVelocityTable(
+                 VelocityResponseCurve, VelocityResponseDepth, scaling
+             );
+         VelocityResponseCurveScaling = scaling;
+     }
+     /**
+      * Updates the respective member variable and the lookup table / cache
+      * that depends on this value.
+      */
+     void DimensionRegion::SetReleaseVelocityResponseCurve(curve_type_t curve) {
+         pVelocityReleaseTable = GetReleaseVelocityTable(curve, ReleaseVelocityResponseDepth);
+         ReleaseVelocityResponseCurve = curve;
+     }
+     /**
+      * Updates the respective member variable and the lookup table / cache
+      * that depends on this value.
+      */
+     void DimensionRegion::SetReleaseVelocityResponseDepth(uint8_t depth) {
+         pVelocityReleaseTable = GetReleaseVelocityTable(ReleaseVelocityResponseCurve, depth);
+         ReleaseVelocityResponseDepth = depth;
+     }
+     /**
+      * Updates the respective member variable and the lookup table / cache
+      * that depends on this value.
+      */
+     void DimensionRegion::SetVCFCutoffController(vcf_cutoff_ctrl_t controller) {
+         pVelocityCutoffTable = GetCutoffVelocityTable(VCFVelocityCurve, VCFVelocityDynamicRange, VCFVelocityScale, controller);
+         VCFCutoffController = controller;
+     }
+     /**
+      * Updates the respective member variable and the lookup table / cache
+      * that depends on this value.
+      */
+     void DimensionRegion::SetVCFVelocityCurve(curve_type_t curve) {
+         pVelocityCutoffTable = GetCutoffVelocityTable(curve, VCFVelocityDynamicRange, VCFVelocityScale, VCFCutoffController);
+         VCFVelocityCurve = curve;
+     }
+     /**
+      * Updates the respective member variable and the lookup table / cache
+      * that depends on this value.
+      */
+     void DimensionRegion::SetVCFVelocityDynamicRange(uint8_t range) {
+         pVelocityCutoffTable = GetCutoffVelocityTable(VCFVelocityCurve, range, VCFVelocityScale, VCFCutoffController);
+         VCFVelocityDynamicRange = range;
+     }
+     /**
+      * Updates the respective member variable and the lookup table / cache
+      * that depends on this value.
+      */
+     void DimensionRegion::SetVCFVelocityScale(uint8_t scaling) {
+         pVelocityCutoffTable = GetCutoffVelocityTable(VCFVelocityCurve, VCFVelocityDynamicRange, scaling, VCFCutoffController);
+         VCFVelocityScale = scaling;
+     }
+     double* DimensionRegion::CreateVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling) {
+         // line-segment approximations of the 15 velocity curves
+         // linear
+         const int lin0[] = { 1, 1, 127, 127 };
+         const int lin1[] = { 1, 21, 127, 127 };
+         const int lin2[] = { 1, 45, 127, 127 };
+         const int lin3[] = { 1, 74, 127, 127 };
+         const int lin4[] = { 1, 127, 127, 127 };
+         // non-linear
+         const int non0[] = { 1, 4, 24, 5, 57, 17, 92, 57, 122, 127, 127, 127 };
+         const int non1[] = { 1, 4, 46, 9, 93, 56, 118, 106, 123, 127,
+, 127 };
+         const int non2[] = { 1, 4, 46, 9, 57, 20, 102, 107, 107, 127,
+, 127 };
+         const int non3[] = { 1, 15, 10, 19, 67, 73, 80, 80, 90, 98, 98, 127,
+, 127 };
+         const int non4[] = { 1, 25, 33, 57, 82, 81, 92, 127, 127, 127 };
+         // special
+         const int spe0[] = { 1, 2, 76, 10, 90, 15, 95, 20, 99, 28, 103, 44,
+, 127, 127, 127 };
+         const int spe1[] = { 1, 2, 27, 5, 67, 18, 89, 29, 95, 35, 107, 67,
+, 127, 127, 127 };
+         const int spe2[] = { 1, 1, 33, 1, 53, 5, 61, 13, 69, 32, 79, 74,
+, 90, 91, 127, 127, 127 };
+         const int spe3[] = { 1, 32, 28, 35, 66, 48, 89, 59, 95, 65, 99, 73,
+, 127, 127, 127 };
+         const int spe4[] = { 1, 4, 23, 5, 49, 13, 57, 17, 92, 57, 122, 127,
+, 127 };
+         // this is only used by the VCF velocity curve
+         const int spe5[] = { 1, 2, 30, 5, 60, 19, 77, 70, 83, 85, 88, 106,
+, 127, 127, 127 };
+         const int* const curves[] = { non0, non1, non2, non3, non4,
+                                       lin0, lin1, lin2, lin3, lin4,
+                                       spe0, spe1, spe2, spe3, spe4, spe5 };
+         double* const table = new double[128];
+         const int* curve = curves[curveType * 5 + depth];
+         const int s = scaling == 0 ? 20 : scaling; // 0 or 20 means no scaling
+         table[0] = 0;
+         for (int x = 1 ; x < 128 ; x++) {
+             if (x > curve[2]) curve += 2;
+             double y = curve[1] + (x - curve[0]) *
+                 (double(curve[3] - curve[1]) / (curve[2] - curve[0]));
+             y = y / 127;
+             // Scale up for s > 20, down for s < 20. When
+             // down-scaling, the curve still ends at 1.0.
+             if (s < 20 && y >= 0.5)
+                 y = y / ((2 - 40.0 / s) * y + 40.0 / s - 1);
+             else
+                 y = y * (s / 20.0);
+             if (y > 1) y = 1;
+             table[x] = y;
+         }
+         return table;
+     }
  // *************** Region ***************
-Line 1026 
 namespace gig {
+Line 2909 
 namespace gig {
      Region::Region(Instrument* pInstrument, RIFF::List* rgnList) : DLS::Region((DLS::Instrument*) pInstrument, rgnList) {
          // Initialization
          Dimensions = 0;
-         for (int i = 0; i < 32; i++) {
+         for (int i = 0; i < 256; i++) {
              pDimensionRegions[i] = NULL;
          }
+         Layers = 1;
+         File* file = (File*) GetParent()->GetParent();
+         int dimensionBits = (file->pVersion && file->pVersion->major == 3) ? 8 : 5;
          // Actual Loading
+         if (!file->GetAutoLoad()) return;
          LoadDimensionRegions(rgnList);
          RIFF::Chunk* _3lnk = rgnList->GetSubChunk(CHUNK_ID_3LNK);
          if (_3lnk) {
              DimensionRegions = _3lnk->ReadUint32();
-             for (int i = 0; i < 5; i++) {
+             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) ? split_type_bit
+                     pDimensionDefinitions[i].zone_size  = __resolveZoneSize(pDimensionDefinitions[i]);
-                                                                                                  : 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) {
+             // jump to start of the wave pool indices (if not already there)
-                         // no custom defined ranges
+             if (file->pVersion && file->pVersion->major == 3)
-                         pDimDef->split_type = split_type_normal;
+                 _3lnk->SetPos(68); // version 3 has a different 3lnk structure
-                         pDimDef->ranges     = NULL;
+             else
-                     }
+                 _3lnk->SetPos(44);
-                     else { // custom defined ranges
-                         pDimDef->split_type = split_type_customvelocity;
+             // load sample references (if auto loading is enabled)
-                         pDimDef->ranges     = new range_t[pDimDef->zones];
+             if (file->GetAutoLoad()) {
-                         unsigned int bits[5] = {0,0,0,0,0};
+                 for (uint i = 0; i < DimensionRegions; i++) {
-                         int previousUpperLimit = -1;
+                     uint32_t wavepoolindex = _3lnk->ReadUint32();
-                         for (int velocityZone = 0; velocityZone < pDimDef->zones; velocityZone++) {
+                     if (file->pWavePoolTable) pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
-                             bits[i] = velocityZone;
-                             DimensionRegion* pDimRegion = GetDimensionRegionByBit(bits[4],bits[3],bits[2],bits[1],bits[0]);
-                             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;
-                             }
-                         }
-                     }
                  }
+                 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.
+      *
+      * @param pProgress - callback function for progress notification
+      * @throws gig::Exception if samples cannot be dereferenced
+      */
+     void Region::UpdateChunks(progress_t* pProgress) {
+         // 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(pProgress);
+         // update dimension region's chunks
+         for (int i = 0; i < DimensionRegions; i++) {
+             pDimensionRegions[i]->UpdateChunks(pProgress);
+         }
+         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), (RIFF::Chunk*)NULL);
+         }
-             // load sample references
+         // update dimension definitions in '3lnk' chunk
-             _3lnk->SetPos(44); // jump to start of the wave pool indices (if not already there)
+         uint8_t* pData = (uint8_t*) _3lnk->LoadChunkData();
-             for (uint i = 0; i < DimensionRegions; i++) {
+         store32(&pData[0], DimensionRegions);
-                 uint32_t wavepoolindex = _3lnk->ReadUint32();
+         int shift = 0;
-                 pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
+         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 1111 
 namespace gig {
+Line 3072 
 namespace gig {
              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 1120 
 namespace gig {
+Line 3081 
 namespace gig {
          }
      }
-     Region::~Region() {
+     void Region::SetKeyRange(uint16_t Low, uint16_t High) {
-         for (uint i = 0; i < Dimensions; i++) {
+         // update KeyRange struct and make sure regions are in correct order
-             if (pDimensionDefinitions[i].ranges) delete[] pDimensionDefinitions[i].ranges;
+         DLS::Region::SetKeyRange(Low, High);
+         // update Region key table for fast lookup
+         ((gig::Instrument*)GetParent())->UpdateRegionKeyTable();
+     }
+     void Region::UpdateVelocityTable() {
+         // get velocity dimension's index
+         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) {
+         // some initial sanity checks of the given dimension definition
+         if (pDimDef->zones < 2)
+             throw gig::Exception("Could not add new dimension, amount of requested zones must always be at least two");
+         if (pDimDef->bits < 1)
+             throw gig::Exception("Could not add new dimension, amount of requested requested zone bits must always be at least one");
+         if (pDimDef->dimension == dimension_samplechannel) {
+             if (pDimDef->zones != 2)
+                 throw gig::Exception("Could not add new 'sample channel' dimensions, the requested amount of zones must always be 2 for this dimension type");
+             if (pDimDef->bits != 1)
+                 throw gig::Exception("Could not add new 'sample channel' dimensions, the requested amount of zone bits must always be 1 for this dimension type");
+         }
+         // 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;
+     }
+     /** @brief Delete one split zone of a dimension (decrement zone amount).
+      *
+      * Instead of deleting an entire dimensions, this method will only delete
+      * one particular split zone given by @a zone of the Region's dimension
+      * given by @a type. So this method will simply decrement the amount of
+      * zones by one of the dimension in question. To be able to do that, the
+      * respective dimension must exist on this Region and it must have at least
+      * 3 zones. All DimensionRegion objects associated with the zone will be
+      * deleted.
+      *
+      * @param type - identifies the dimension where a zone shall be deleted
+      * @param zone - index of the dimension split zone that shall be deleted
+      * @throws gig::Exception if requested zone could not be deleted
+      */
+     void Region::DeleteDimensionZone(dimension_t type, int zone) {
+         dimension_def_t* oldDef = GetDimensionDefinition(type);
+         if (!oldDef)
+             throw gig::Exception("Could not delete dimension zone, no such dimension of given type");
+         if (oldDef->zones <= 2)
+             throw gig::Exception("Could not delete dimension zone, because it would end up with only one zone.");
+         if (zone < 0 || zone >= oldDef->zones)
+             throw gig::Exception("Could not delete dimension zone, requested zone index out of bounds.");
+         const int newZoneSize = oldDef->zones - 1;
+         // create a temporary Region which just acts as a temporary copy
+         // container and will be deleted at the end of this function and will
+         // also not be visible through the API during this process
+         gig::Region* tempRgn = NULL;
+         {
+             // adding these temporary chunks is probably not even necessary
+             Instrument* instr = static_cast<Instrument*>(GetParent());
+             RIFF::List* pCkInstrument = instr->pCkInstrument;
+             RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN);
+             if (!lrgn)  lrgn = pCkInstrument->AddSubList(LIST_TYPE_LRGN);
+             RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);
+             tempRgn = new Region(instr, rgn);
+         }
+         // copy this region's dimensions (with already the dimension split size
+         // requested by the arguments of this method call) to the temporary
+         // region, and don't use Region::CopyAssign() here for this task, since
+         // it would also alter fast lookup helper variables here and there
+         dimension_def_t newDef;
+         for (int i = 0; i < Dimensions; ++i) {
+             dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference
+             // is this the dimension requested by the method arguments? ...
+             if (def.dimension == type) { // ... if yes, decrement zone amount by one
+                 def.zones = newZoneSize;
+                 if ((1 << (def.bits - 1)) == def.zones) def.bits--;
+                 newDef = def;
+             }
+             tempRgn->AddDimension(&def);
+         }
+         // find the dimension index in the tempRegion which is the dimension
+         // type passed to this method (paranoidly expecting different order)
+         int tempReducedDimensionIndex = -1;
+         for (int d = 0; d < tempRgn->Dimensions; ++d) {
+             if (tempRgn->pDimensionDefinitions[d].dimension == type) {
+                 tempReducedDimensionIndex = d;
+                 break;
+             }
          }
-         for (int i = 0; i < 32; i++) {
+         // copy dimension regions from this region to the temporary region
+         for (int iDst = 0; iDst < 256; ++iDst) {
+             DimensionRegion* dstDimRgn = tempRgn->pDimensionRegions[iDst];
+             if (!dstDimRgn) continue;
+             std::map<dimension_t,int> dimCase;
+             bool isValidZone = true;
+             for (int d = 0, baseBits = 0; d < tempRgn->Dimensions; ++d) {
+                 const int dstBits = tempRgn->pDimensionDefinitions[d].bits;
+                 dimCase[tempRgn->pDimensionDefinitions[d].dimension] =
+                     (iDst >> baseBits) & ((1 << dstBits) - 1);
+                 baseBits += dstBits;
+                 // there are also DimensionRegion objects of unused zones, skip them
+                 if (dimCase[tempRgn->pDimensionDefinitions[d].dimension] >= tempRgn->pDimensionDefinitions[d].zones) {
+                     isValidZone = false;
+                     break;
+                 }
+             }
+             if (!isValidZone) continue;
+             // a bit paranoid: cope with the chance that the dimensions would
+             // have different order in source and destination regions
+             const bool isLastZone = (dimCase[type] == newZoneSize - 1);
+             if (dimCase[type] >= zone) dimCase[type]++;
+             DimensionRegion* srcDimRgn = GetDimensionRegionByBit(dimCase);
+             dstDimRgn->CopyAssign(srcDimRgn);
+             // if this is the upper most zone of the dimension passed to this
+             // method, then correct (raise) its upper limit to 127
+             if (newDef.split_type == split_type_normal && isLastZone)
+                 dstDimRgn->DimensionUpperLimits[tempReducedDimensionIndex] = 127;
+         }
+         // now tempRegion's dimensions and DimensionRegions basically reflect
+         // what we wanted to get for this actual Region here, so we now just
+         // delete and recreate the dimension in question with the new amount
+         // zones and then copy back from tempRegion
+         DeleteDimension(oldDef);
+         AddDimension(&newDef);
+         for (int iSrc = 0; iSrc < 256; ++iSrc) {
+             DimensionRegion* srcDimRgn = tempRgn->pDimensionRegions[iSrc];
+             if (!srcDimRgn) continue;
+             std::map<dimension_t,int> dimCase;
+             for (int d = 0, baseBits = 0; d < tempRgn->Dimensions; ++d) {
+                 const int srcBits = tempRgn->pDimensionDefinitions[d].bits;
+                 dimCase[tempRgn->pDimensionDefinitions[d].dimension] =
+                     (iSrc >> baseBits) & ((1 << srcBits) - 1);
+                 baseBits += srcBits;
+             }
+             // a bit paranoid: cope with the chance that the dimensions would
+             // have different order in source and destination regions
+             DimensionRegion* dstDimRgn = GetDimensionRegionByBit(dimCase);
+             if (!dstDimRgn) continue;
+             dstDimRgn->CopyAssign(srcDimRgn);
+         }
+         // delete temporary region
+         delete tempRgn;
+         UpdateVelocityTable();
+     }
+     /** @brief Divide split zone of a dimension in two (increment zone amount).
+      *
+      * This will increment the amount of zones for the dimension (given by
+      * @a type) by one. It will do so by dividing the zone (given by @a zone)
+      * in the middle of its zone range in two. So the two zones resulting from
+      * the zone being splitted, will be an equivalent copy regarding all their
+      * articulation informations and sample reference. The two zones will only
+      * differ in their zone's upper limit
+      * (DimensionRegion::DimensionUpperLimits).
+      *
+      * @param type - identifies the dimension where a zone shall be splitted
+      * @param zone - index of the dimension split zone that shall be splitted
+      * @throws gig::Exception if requested zone could not be splitted
+      */
+     void Region::SplitDimensionZone(dimension_t type, int zone) {
+         dimension_def_t* oldDef = GetDimensionDefinition(type);
+         if (!oldDef)
+             throw gig::Exception("Could not split dimension zone, no such dimension of given type");
+         if (zone < 0 || zone >= oldDef->zones)
+             throw gig::Exception("Could not split dimension zone, requested zone index out of bounds.");
+         const int newZoneSize = oldDef->zones + 1;
+         // create a temporary Region which just acts as a temporary copy
+         // container and will be deleted at the end of this function and will
+         // also not be visible through the API during this process
+         gig::Region* tempRgn = NULL;
+         {
+             // adding these temporary chunks is probably not even necessary
+             Instrument* instr = static_cast<Instrument*>(GetParent());
+             RIFF::List* pCkInstrument = instr->pCkInstrument;
+             RIFF::List* lrgn = pCkInstrument->GetSubList(LIST_TYPE_LRGN);
+             if (!lrgn)  lrgn = pCkInstrument->AddSubList(LIST_TYPE_LRGN);
+             RIFF::List* rgn = lrgn->AddSubList(LIST_TYPE_RGN);
+             tempRgn = new Region(instr, rgn);
+         }
+         // copy this region's dimensions (with already the dimension split size
+         // requested by the arguments of this method call) to the temporary
+         // region, and don't use Region::CopyAssign() here for this task, since
+         // it would also alter fast lookup helper variables here and there
+         dimension_def_t newDef;
+         for (int i = 0; i < Dimensions; ++i) {
+             dimension_def_t def = pDimensionDefinitions[i]; // copy, don't reference
+             // is this the dimension requested by the method arguments? ...
+             if (def.dimension == type) { // ... if yes, increment zone amount by one
+                 def.zones = newZoneSize;
+                 if ((1 << oldDef->bits) < newZoneSize) def.bits++;
+                 newDef = def;
+             }
+             tempRgn->AddDimension(&def);
+         }
+         // find the dimension index in the tempRegion which is the dimension
+         // type passed to this method (paranoidly expecting different order)
+         int tempIncreasedDimensionIndex = -1;
+         for (int d = 0; d < tempRgn->Dimensions; ++d) {
+             if (tempRgn->pDimensionDefinitions[d].dimension == type) {
+                 tempIncreasedDimensionIndex = d;
+                 break;
+             }
+         }
+         // copy dimension regions from this region to the temporary region
+         for (int iSrc = 0; iSrc < 256; ++iSrc) {
+             DimensionRegion* srcDimRgn = pDimensionRegions[iSrc];
+             if (!srcDimRgn) continue;
+             std::map<dimension_t,int> dimCase;
+             bool isValidZone = true;
+             for (int d = 0, baseBits = 0; d < Dimensions; ++d) {
+                 const int srcBits = pDimensionDefinitions[d].bits;
+                 dimCase[pDimensionDefinitions[d].dimension] =
+                     (iSrc >> baseBits) & ((1 << srcBits) - 1);
+                 // there are also DimensionRegion objects for unused zones, skip them
+                 if (dimCase[pDimensionDefinitions[d].dimension] >= pDimensionDefinitions[d].zones) {
+                     isValidZone = false;
+                     break;
+                 }
+                 baseBits += srcBits;
+             }
+             if (!isValidZone) continue;
+             // a bit paranoid: cope with the chance that the dimensions would
+             // have different order in source and destination regions
+             if (dimCase[type] > zone) dimCase[type]++;
+             DimensionRegion* dstDimRgn = tempRgn->GetDimensionRegionByBit(dimCase);
+             dstDimRgn->CopyAssign(srcDimRgn);
+             // if this is the requested zone to be splitted, then also copy
+             // the source DimensionRegion to the newly created target zone
+             // and set the old zones upper limit lower
+             if (dimCase[type] == zone) {
+                 // lower old zones upper limit
+                 if (newDef.split_type == split_type_normal) {
+                     const int high =
+                         dstDimRgn->DimensionUpperLimits[tempIncreasedDimensionIndex];
+                     int low = 0;
+                     if (zone > 0) {
+                         std::map<dimension_t,int> lowerCase = dimCase;
+                         lowerCase[type]--;
+                         DimensionRegion* dstDimRgnLow = tempRgn->GetDimensionRegionByBit(lowerCase);
+                         low = dstDimRgnLow->DimensionUpperLimits[tempIncreasedDimensionIndex];
+                     }
+                     dstDimRgn->DimensionUpperLimits[tempIncreasedDimensionIndex] = low + (high - low) / 2;
+                 }
+                 // fill the newly created zone of the divided zone as well
+                 dimCase[type]++;
+                 dstDimRgn = tempRgn->GetDimensionRegionByBit(dimCase);
+                 dstDimRgn->CopyAssign(srcDimRgn);
+             }
+         }
+         // now tempRegion's dimensions and DimensionRegions basically reflect
+         // what we wanted to get for this actual Region here, so we now just
+         // delete and recreate the dimension in question with the new amount
+         // zones and then copy back from tempRegion
+         DeleteDimension(oldDef);
+         AddDimension(&newDef);
+         for (int iSrc = 0; iSrc < 256; ++iSrc) {
+             DimensionRegion* srcDimRgn = tempRgn->pDimensionRegions[iSrc];
+             if (!srcDimRgn) continue;
+             std::map<dimension_t,int> dimCase;
+             for (int d = 0, baseBits = 0; d < tempRgn->Dimensions; ++d) {
+                 const int srcBits = tempRgn->pDimensionDefinitions[d].bits;
+                 dimCase[tempRgn->pDimensionDefinitions[d].dimension] =
+                     (iSrc >> baseBits) & ((1 << srcBits) - 1);
+                 baseBits += srcBits;
+             }
+             // a bit paranoid: cope with the chance that the dimensions would
+             // have different order in source and destination regions
+             DimensionRegion* dstDimRgn = GetDimensionRegionByBit(dimCase);
+             if (!dstDimRgn) continue;
+             dstDimRgn->CopyAssign(srcDimRgn);
+         }
+         // delete temporary region
+         delete tempRgn;
+         UpdateVelocityTable();
+     }
+     /** @brief Change type of an existing dimension.
+      *
+      * Alters the dimension type of a dimension already existing on this
+      * region. If there is currently no dimension on this Region with type
+      * @a oldType, then this call with throw an Exception. Likewise there are
+      * cases where the requested dimension type cannot be performed. For example
+      * if the new dimension type shall be gig::dimension_samplechannel, and the
+      * current dimension has more than 2 zones. In such cases an Exception is
+      * thrown as well.
+      *
+      * @param oldType - identifies the existing dimension to be changed
+      * @param newType - to which dimension type it should be changed to
+      * @throws gig::Exception if requested change cannot be performed
+      */
+     void Region::SetDimensionType(dimension_t oldType, dimension_t newType) {
+         if (oldType == newType) return;
+         dimension_def_t* def = GetDimensionDefinition(oldType);
+         if (!def)
+             throw gig::Exception("No dimension with provided old dimension type exists on this region");
+         if (newType == dimension_samplechannel && def->zones != 2)
+             throw gig::Exception("Cannot change to dimension type 'sample channel', because existing dimension does not have 2 zones");
+         if (GetDimensionDefinition(newType))
+             throw gig::Exception("There is already a dimension with requested new dimension type on this region");
+         def->dimension  = newType;
+         def->split_type = __resolveSplitType(newType);
+     }
+     DimensionRegion* Region::GetDimensionRegionByBit(const std::map<dimension_t,int>& DimCase) {
+         uint8_t bits[8] = {};
+         for (std::map<dimension_t,int>::const_iterator it = DimCase.begin();
+              it != DimCase.end(); ++it)
+         {
+             for (int d = 0; d < Dimensions; ++d) {
+                 if (pDimensionDefinitions[d].dimension == it->first) {
+                     bits[d] = it->second;
+                     goto nextDimCaseSlice;
+                 }
+             }
+             assert(false); // do crash ... too harsh maybe ? ignore it instead ?
+             nextDimCaseSlice:
+             ; // noop
+         }
+         return GetDimensionRegionByBit(bits);
+     }
+     /**
+      * Searches in the current Region for a dimension of the given dimension
+      * type and returns the precise configuration of that dimension in this
+      * Region.
+      *
+      * @param type - dimension type of the sought dimension
+      * @returns dimension definition or NULL if there is no dimension with
+      *          sought type in this Region.
+      */
+     dimension_def_t* Region::GetDimensionDefinition(dimension_t type) {
+         for (int i = 0; i < Dimensions; ++i)
+             if (pDimensionDefinitions[i].dimension == type)
+                 return &pDimensionDefinitions[i];
+         return NULL;
+     }
+     Region::~Region() {
+         for (int i = 0; i < 256; i++) {
              if (pDimensionRegions[i]) delete pDimensionRegions[i];
          }
      }
-Line 1142 
 namespace gig {
+Line 3704 
 namespace gig {
       * left channel, 1 for right channel or 0 for layer 0, 1 for layer 1,
       * etc.).
       *
-      * @param  Dim4Val  MIDI controller value (0-127) for dimension 4
+      * @param  DimValues  MIDI controller values (0-127) for dimension 0 to 7
-      * @param  Dim3Val  MIDI controller value (0-127) for dimension 3
-      * @param  Dim2Val  MIDI controller value (0-127) for dimension 2
-      * @param  Dim1Val  MIDI controller value (0-127) for dimension 1
-      * @param  Dim0Val  MIDI controller value (0-127) for dimension 0
       * @returns         adress to the DimensionRegion for the given situation
       * @see             pDimensionDefinitions
       * @see             Dimensions
       */
-     DimensionRegion* Region::GetDimensionRegionByValue(uint Dim4Val, uint Dim3Val, uint Dim2Val, uint Dim1Val, uint Dim0Val) {
+     DimensionRegion* Region::GetDimensionRegionByValue(const uint DimValues[8]) {
-         unsigned int bits[5] = {Dim0Val,Dim1Val,Dim2Val,Dim3Val,Dim4Val};
+         uint8_t bits;
+         int veldim = -1;
+         int velbitpos;
+         int bitpos = 0;
+         int dimregidx = 0;
          for (uint i = 0; i < Dimensions; i++) {
-             switch (pDimensionDefinitions[i].split_type) {
+             if (pDimensionDefinitions[i].dimension == dimension_velocity) {
-                 case split_type_normal:
+                 // the velocity dimension must be handled after the other dimensions
-                     bits[i] /= pDimensionDefinitions[i].zone_size;
+                 veldim = i;
-                     break;
+                 velbitpos = bitpos;
-                 case split_type_customvelocity:
+             } else {
-                     bits[i] = VelocityTable[bits[i]];
+                 switch (pDimensionDefinitions[i].split_type) {
-                     break;
+                     case split_type_normal:
-                 // else the value is already the sought dimension bit number
+                         if (pDimensionRegions[0]->DimensionUpperLimits[i]) {
+                             // gig3: all normal dimensions (not just the velocity dimension) have custom zone ranges
+                             for (bits = 0 ; bits < pDimensionDefinitions[i].zones ; bits++) {
+                                 if (DimValues[i] <= pDimensionRegions[bits << bitpos]->DimensionUpperLimits[i]) 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 & 255];
+         if (!dimreg) return NULL;
+         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] & 127];
+             else // normal split type
+                 bits = uint8_t((DimValues[veldim] & 127) / pDimensionDefinitions[veldim].zone_size);
+             const uint8_t limiter_mask = (1 << pDimensionDefinitions[veldim].bits) - 1;
+             dimregidx |= (bits & limiter_mask) << velbitpos;
+             dimreg = pDimensionRegions[dimregidx & 255];
+         }
+         return dimreg;
+     }
+     int Region::GetDimensionRegionIndexByValue(const uint DimValues[8]) {
+         uint8_t bits;
+         int veldim = -1;
+         int velbitpos;
+         int bitpos = 0;
+         int dimregidx = 0;
+         for (uint i = 0; i < Dimensions; i++) {
+             if (pDimensionDefinitions[i].dimension == dimension_velocity) {
+                 // the velocity dimension must be handled after the other dimensions
+                 veldim = i;
+                 velbitpos = bitpos;
+             } else {
+                 switch (pDimensionDefinitions[i].split_type) {
+                     case split_type_normal:
+                         if (pDimensionRegions[0]->DimensionUpperLimits[i]) {
+                             // gig3: all normal dimensions (not just the velocity dimension) have custom zone ranges
+                             for (bits = 0 ; bits < pDimensionDefinitions[i].zones ; bits++) {
+                                 if (DimValues[i] <= pDimensionRegions[bits << bitpos]->DimensionUpperLimits[i]) 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;
          }
-         return GetDimensionRegionByBit(bits[4],bits[3],bits[2],bits[1],bits[0]);
+         dimregidx &= 255;
+         DimensionRegion* dimreg = pDimensionRegions[dimregidx];
+         if (!dimreg) return -1;
+         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] & 127];
+             else // normal split type
+                 bits = uint8_t((DimValues[veldim] & 127) / pDimensionDefinitions[veldim].zone_size);
+             const uint8_t limiter_mask = (1 << pDimensionDefinitions[veldim].bits) - 1;
+             dimregidx |= (bits & limiter_mask) << velbitpos;
+             dimregidx &= 255;
+         }
+         return dimregidx;
      }
      /**
-Line 1172 
 namespace gig {
+Line 3813 
 namespace gig {
       * numbers (zone index). You usually use <i>GetDimensionRegionByValue</i>
       * instead of calling this method directly!
       *
-      * @param Dim4Bit  Bit number for dimension 4
+      * @param DimBits  Bit numbers for dimension 0 to 7
-      * @param Dim3Bit  Bit number for dimension 3
-      * @param Dim2Bit  Bit number for dimension 2
-      * @param Dim1Bit  Bit number for dimension 1
-      * @param Dim0Bit  Bit number for dimension 0
       * @returns        adress to the DimensionRegion for the given dimension
       *                 bit numbers
       * @see            GetDimensionRegionByValue()
       */
-     DimensionRegion* Region::GetDimensionRegionByBit(uint8_t Dim4Bit, uint8_t Dim3Bit, uint8_t Dim2Bit, uint8_t Dim1Bit, uint8_t Dim0Bit) {
+     DimensionRegion* Region::GetDimensionRegionByBit(const uint8_t DimBits[8]) {
-         return *(pDimensionRegions + ((((((((Dim4Bit << pDimensionDefinitions[3].bits) | Dim3Bit)
+         return pDimensionRegions[((((((DimBits[7] << pDimensionDefinitions[6].bits | DimBits[6])
-                                                      << pDimensionDefinitions[2].bits) | Dim2Bit)
+                                                   << pDimensionDefinitions[5].bits | DimBits[5])
-                                                      << pDimensionDefinitions[1].bits) | Dim1Bit)
+                                                   << pDimensionDefinitions[4].bits | DimBits[4])
-                                                      << pDimensionDefinitions[0].bits) | Dim0Bit) );
+                                                   << pDimensionDefinitions[3].bits | DimBits[3])
+                                                   << pDimensionDefinitions[2].bits | DimBits[2])
+                                                   << pDimensionDefinitions[1].bits | DimBits[1])
+                                                   << pDimensionDefinitions[0].bits | DimBits[0]];
      }
      /**
-Line 1202 
 namespace gig {
+Line 3842 
 namespace gig {
          else         return static_cast<gig::Sample*>(pSample = GetSampleFromWavePool(WavePoolTableIndex));
      }
-     Sample* Region::GetSampleFromWavePool(unsigned int WavePoolTableIndex) {
+     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];
-         Sample* sample = file->GetFirstSample();
+         unsigned long soughtfileno = file->pWavePoolTableHi[WavePoolTableIndex];
+         Sample* sample = file->GetFirstSample(pProgress);
          while (sample) {
-             if (sample->ulWavePoolOffset == soughtoffset) return static_cast<gig::Sample*>(pSample = sample);
+             if (sample->ulWavePoolOffset == soughtoffset &&
+                 sample->FileNo == soughtfileno) return static_cast<gig::Sample*>(sample);
              sample = file->GetNextSample();
          }
          return NULL;
      }
+     /**
+      * Make a (semi) deep copy of the Region object given by @a orig
+      * and assign it to this object.
+      *
+      * Note that all sample pointers referenced by @a orig are simply copied as
+      * memory address. Thus the respective samples are shared, not duplicated!
+      *
+      * @param orig - original Region object to be copied from
+      */
+     void Region::CopyAssign(const Region* orig) {
+         CopyAssign(orig, NULL);
+     }
+     /**
+      * Make a (semi) deep copy of the Region object given by @a orig and
+      * assign it to this object
+      *
+      * @param mSamples - crosslink map between the foreign file's samples and
+      *                   this file's samples
+      */
+     void Region::CopyAssign(const Region* orig, const std::map<Sample*,Sample*>* mSamples) {
+         // handle base classes
+         DLS::Region::CopyAssign(orig);
+         if (mSamples && mSamples->count((gig::Sample*)orig->pSample)) {
+             pSample = mSamples->find((gig::Sample*)orig->pSample)->second;
+         }
+         // handle own member variables
+         for (int i = Dimensions - 1; i >= 0; --i) {
+             DeleteDimension(&pDimensionDefinitions[i]);
+         }
+         Layers = 0; // just to be sure
+         for (int i = 0; i < orig->Dimensions; i++) {
+             // we need to copy the dim definition here, to avoid the compiler
+             // complaining about const-ness issue
+             dimension_def_t def = orig->pDimensionDefinitions[i];
+             AddDimension(&def);
+         }
+         for (int i = 0; i < 256; i++) {
+             if (pDimensionRegions[i] && orig->pDimensionRegions[i]) {
+                 pDimensionRegions[i]->CopyAssign(
+                     orig->pDimensionRegions[i],
+                     mSamples
+                 );
+             }
+         }
+         Layers = orig->Layers;
+     }
+ // *************** MidiRule ***************
+ // *
+     MidiRuleCtrlTrigger::MidiRuleCtrlTrigger(RIFF::Chunk* _3ewg) {
+         _3ewg->SetPos(36);
+         Triggers = _3ewg->ReadUint8();
+         _3ewg->SetPos(40);
+         ControllerNumber = _3ewg->ReadUint8();
+         _3ewg->SetPos(46);
+         for (int i = 0 ; i < Triggers ; i++) {
+             pTriggers[i].TriggerPoint = _3ewg->ReadUint8();
+             pTriggers[i].Descending = _3ewg->ReadUint8();
+             pTriggers[i].VelSensitivity = _3ewg->ReadUint8();
+             pTriggers[i].Key = _3ewg->ReadUint8();
+             pTriggers[i].NoteOff = _3ewg->ReadUint8();
+             pTriggers[i].Velocity = _3ewg->ReadUint8();
+             pTriggers[i].OverridePedal = _3ewg->ReadUint8();
+             _3ewg->ReadUint8();
+         }
+     }
+     MidiRuleCtrlTrigger::MidiRuleCtrlTrigger() :
+         ControllerNumber(0),
+         Triggers(0) {
+     }
+     void MidiRuleCtrlTrigger::UpdateChunks(uint8_t* pData) const {
+         pData[32] = 4;
+         pData[33] = 16;
+         pData[36] = Triggers;
+         pData[40] = ControllerNumber;
+         for (int i = 0 ; i < Triggers ; i++) {
+             pData[46 + i * 8] = pTriggers[i].TriggerPoint;
+             pData[47 + i * 8] = pTriggers[i].Descending;
+             pData[48 + i * 8] = pTriggers[i].VelSensitivity;
+             pData[49 + i * 8] = pTriggers[i].Key;
+             pData[50 + i * 8] = pTriggers[i].NoteOff;
+             pData[51 + i * 8] = pTriggers[i].Velocity;
+             pData[52 + i * 8] = pTriggers[i].OverridePedal;
+         }
+     }
+     MidiRuleLegato::MidiRuleLegato(RIFF::Chunk* _3ewg) {
+         _3ewg->SetPos(36);
+         LegatoSamples = _3ewg->ReadUint8(); // always 12
+         _3ewg->SetPos(40);
+         BypassUseController = _3ewg->ReadUint8();
+         BypassKey = _3ewg->ReadUint8();
+         BypassController = _3ewg->ReadUint8();
+         ThresholdTime = _3ewg->ReadUint16();
+         _3ewg->ReadInt16();
+         ReleaseTime = _3ewg->ReadUint16();
+         _3ewg->ReadInt16();
+         KeyRange.low = _3ewg->ReadUint8();
+         KeyRange.high = _3ewg->ReadUint8();
+         _3ewg->SetPos(64);
+         ReleaseTriggerKey = _3ewg->ReadUint8();
+         AltSustain1Key = _3ewg->ReadUint8();
+         AltSustain2Key = _3ewg->ReadUint8();
+     }
+     MidiRuleLegato::MidiRuleLegato() :
+         LegatoSamples(12),
+         BypassUseController(false),
+         BypassKey(0),
+         BypassController(1),
+         ThresholdTime(20),
+         ReleaseTime(20),
+         ReleaseTriggerKey(0),
+         AltSustain1Key(0),
+         AltSustain2Key(0)
+     {
+         KeyRange.low = KeyRange.high = 0;
+     }
+     void MidiRuleLegato::UpdateChunks(uint8_t* pData) const {
+         pData[32] = 0;
+         pData[33] = 16;
+         pData[36] = LegatoSamples;
+         pData[40] = BypassUseController;
+         pData[41] = BypassKey;
+         pData[42] = BypassController;
+         store16(&pData[43], ThresholdTime);
+         store16(&pData[47], ReleaseTime);
+         pData[51] = KeyRange.low;
+         pData[52] = KeyRange.high;
+         pData[64] = ReleaseTriggerKey;
+         pData[65] = AltSustain1Key;
+         pData[66] = AltSustain2Key;
+     }
+     MidiRuleAlternator::MidiRuleAlternator(RIFF::Chunk* _3ewg) {
+         _3ewg->SetPos(36);
+         Articulations = _3ewg->ReadUint8();
+         int flags = _3ewg->ReadUint8();
+         Polyphonic = flags & 8;
+         Chained = flags & 4;
+         Selector = (flags & 2) ? selector_controller :
+             (flags & 1) ? selector_key_switch : selector_none;
+         Patterns = _3ewg->ReadUint8();
+         _3ewg->ReadUint8(); // chosen row
+         _3ewg->ReadUint8(); // unknown
+         _3ewg->ReadUint8(); // unknown
+         _3ewg->ReadUint8(); // unknown
+         KeySwitchRange.low = _3ewg->ReadUint8();
+         KeySwitchRange.high = _3ewg->ReadUint8();
+         Controller = _3ewg->ReadUint8();
+         PlayRange.low = _3ewg->ReadUint8();
+         PlayRange.high = _3ewg->ReadUint8();
+         int n = std::min(int(Articulations), 32);
+         for (int i = 0 ; i < n ; i++) {
+             _3ewg->ReadString(pArticulations[i], 32);
+         }
+         _3ewg->SetPos(1072);
+         n = std::min(int(Patterns), 32);
+         for (int i = 0 ; i < n ; i++) {
+             _3ewg->ReadString(pPatterns[i].Name, 16);
+             pPatterns[i].Size = _3ewg->ReadUint8();
+             _3ewg->Read(&pPatterns[i][0], 1, 32);
+         }
+     }
+     MidiRuleAlternator::MidiRuleAlternator() :
+         Articulations(0),
+         Patterns(0),
+         Selector(selector_none),
+         Controller(0),
+         Polyphonic(false),
+         Chained(false)
+     {
+         PlayRange.low = PlayRange.high = 0;
+         KeySwitchRange.low = KeySwitchRange.high = 0;
+     }
+     void MidiRuleAlternator::UpdateChunks(uint8_t* pData) const {
+         pData[32] = 3;
+         pData[33] = 16;
+         pData[36] = Articulations;
+         pData[37] = (Polyphonic ? 8 : 0) | (Chained ? 4 : 0) |
+             (Selector == selector_controller ? 2 :
+              (Selector == selector_key_switch ? 1 : 0));
+         pData[38] = Patterns;
+         pData[43] = KeySwitchRange.low;
+         pData[44] = KeySwitchRange.high;
+         pData[45] = Controller;
+         pData[46] = PlayRange.low;
+         pData[47] = PlayRange.high;
+         char* str = reinterpret_cast<char*>(pData);
+         int pos = 48;
+         int n = std::min(int(Articulations), 32);
+         for (int i = 0 ; i < n ; i++, pos += 32) {
+             strncpy(&str[pos], pArticulations[i].c_str(), 32);
+         }
+         pos = 1072;
+         n = std::min(int(Patterns), 32);
+         for (int i = 0 ; i < n ; i++, pos += 49) {
+             strncpy(&str[pos], pPatterns[i].Name.c_str(), 16);
+             pData[pos + 16] = pPatterns[i].Size;
+             memcpy(&pData[pos + 16], &(pPatterns[i][0]), 32);
+         }
+     }
+ // *************** Script ***************
+ // *
+     Script::Script(ScriptGroup* group, RIFF::Chunk* ckScri) {
+         pGroup = group;
+         pChunk = ckScri;
+         if (ckScri) { // object is loaded from file ...
+             // read header
+             uint32_t headerSize = ckScri->ReadUint32();
+             Compression = (Compression_t) ckScri->ReadUint32();
+             Encoding    = (Encoding_t) ckScri->ReadUint32();
+             Language    = (Language_t) ckScri->ReadUint32();
+             Bypass      = (Language_t) ckScri->ReadUint32() & 1;
+             crc         = ckScri->ReadUint32();
+             uint32_t nameSize = ckScri->ReadUint32();
+             Name.resize(nameSize, ' ');
+             for (int i = 0; i < nameSize; ++i)
+                 Name[i] = ckScri->ReadUint8();
+             // to handle potential future extensions of the header
+             ckScri->SetPos(sizeof(int32_t) + headerSize);
+             // read actual script data
+             uint32_t scriptSize = ckScri->GetSize() - ckScri->GetPos();
+             data.resize(scriptSize);
+             for (int i = 0; i < scriptSize; ++i)
+                 data[i] = ckScri->ReadUint8();
+         } else { // this is a new script object, so just initialize it as such ...
+             Compression = COMPRESSION_NONE;
+             Encoding = ENCODING_ASCII;
+             Language = LANGUAGE_NKSP;
+             Bypass   = false;
+             crc      = 0;
+             Name     = "Unnamed Script";
+         }
+     }
+     Script::~Script() {
+     }
+     /**
+      * Returns the current script (i.e. as source code) in text format.
+      */
+     String Script::GetScriptAsText() {
+         String s;
+         s.resize(data.size(), ' ');
+         memcpy(&s[0], &data[0], data.size());
+         return s;
+     }
+     /**
+      * Replaces the current script with the new script source code text given
+      * by @a text.
+      *
+      * @param text - new script source code
+      */
+     void Script::SetScriptAsText(const String& text) {
+         data.resize(text.size());
+         memcpy(&data[0], &text[0], text.size());
+     }
+     /**
+      * Apply this script 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.
+      *
+      * @param pProgress - callback function for progress notification
+      */
+     void Script::UpdateChunks(progress_t* pProgress) {
+         // recalculate CRC32 check sum
+         __resetCRC(crc);
+         __calculateCRC(&data[0], data.size(), crc);
+         __encodeCRC(crc);
+         // make sure chunk exists and has the required size
+         const int chunkSize = 7*sizeof(int32_t) + Name.size() + data.size();
+         if (!pChunk) pChunk = pGroup->pList->AddSubChunk(CHUNK_ID_SCRI, chunkSize);
+         else pChunk->Resize(chunkSize);
+         // fill the chunk data to be written to disk
+         uint8_t* pData = (uint8_t*) pChunk->LoadChunkData();
+         int pos = 0;
+         store32(&pData[pos], 6*sizeof(int32_t) + Name.size()); // total header size
+         pos += sizeof(int32_t);
+         store32(&pData[pos], Compression);
+         pos += sizeof(int32_t);
+         store32(&pData[pos], Encoding);
+         pos += sizeof(int32_t);
+         store32(&pData[pos], Language);
+         pos += sizeof(int32_t);
+         store32(&pData[pos], Bypass ? 1 : 0);
+         pos += sizeof(int32_t);
+         store32(&pData[pos], crc);
+         pos += sizeof(int32_t);
+         store32(&pData[pos], Name.size());
+         pos += sizeof(int32_t);
+         for (int i = 0; i < Name.size(); ++i, ++pos)
+             pData[pos] = Name[i];
+         for (int i = 0; i < data.size(); ++i, ++pos)
+             pData[pos] = data[i];
+     }
+     /**
+      * Move this script from its current ScriptGroup to another ScriptGroup
+      * given by @a pGroup.
+      *
+      * @param pGroup - script's new group
+      */
+     void Script::SetGroup(ScriptGroup* pGroup) {
+         if (this->pGroup = pGroup) return;
+         if (pChunk)
+             pChunk->GetParent()->MoveSubChunk(pChunk, pGroup->pList);
+         this->pGroup = pGroup;
+     }
+     /**
+      * Returns the script group this script currently belongs to. Each script
+      * is a member of exactly one ScriptGroup.
+      *
+      * @returns current script group
+      */
+     ScriptGroup* Script::GetGroup() const {
+         return pGroup;
+     }
+     void Script::RemoveAllScriptReferences() {
+         File* pFile = pGroup->pFile;
+         for (int i = 0; pFile->GetInstrument(i); ++i) {
+             Instrument* instr = pFile->GetInstrument(i);
+             instr->RemoveScript(this);
+         }
+     }
+ // *************** ScriptGroup ***************
+ // *
+     ScriptGroup::ScriptGroup(File* file, RIFF::List* lstRTIS) {
+         pFile = file;
+         pList = lstRTIS;
+         pScripts = NULL;
+         if (lstRTIS) {
+             RIFF::Chunk* ckName = lstRTIS->GetSubChunk(CHUNK_ID_LSNM);
+             ::LoadString(ckName, Name);
+         } else {
+             Name = "Default Group";
+         }
+     }
+     ScriptGroup::~ScriptGroup() {
+         if (pScripts) {
+             std::list<Script*>::iterator iter = pScripts->begin();
+             std::list<Script*>::iterator end  = pScripts->end();
+             while (iter != end) {
+                 delete *iter;
+                 ++iter;
+             }
+             delete pScripts;
+         }
+     }
+     /**
+      * Apply this script group 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.
+      *
+      * @param pProgress - callback function for progress notification
+      */
+     void ScriptGroup::UpdateChunks(progress_t* pProgress) {
+         if (pScripts) {
+             if (!pList)
+                 pList = pFile->pRIFF->GetSubList(LIST_TYPE_3LS)->AddSubList(LIST_TYPE_RTIS);
+             // now store the name of this group as <LSNM> chunk as subchunk of the <RTIS> list chunk
+             ::SaveString(CHUNK_ID_LSNM, NULL, pList, Name, String("Unnamed Group"), true, 64);
+             for (std::list<Script*>::iterator it = pScripts->begin();
+                  it != pScripts->end(); ++it)
+             {
+                 (*it)->UpdateChunks(pProgress);
+             }
+         }
+     }
+     /** @brief Get instrument script.
+      *
+      * Returns the real-time instrument script with the given index.
+      *
+      * @param index - number of the sought script (0..n)
+      * @returns sought script or NULL if there's no such script
+      */
+     Script* ScriptGroup::GetScript(uint index) {
+         if (!pScripts) LoadScripts();
+         std::list<Script*>::iterator it = pScripts->begin();
+         for (uint i = 0; it != pScripts->end(); ++i, ++it)
+             if (i == index) return *it;
+         return NULL;
+     }
+     /** @brief Add new instrument script.
+      *
+      * Adds a new real-time instrument script to the file. The script is not
+      * actually used / executed unless it is referenced by an instrument to be
+      * used. This is similar to samples, which you can add to a file, without
+      * an instrument necessarily actually using it.
+      *
+      * You have to call Save() to make this persistent to the file.
+      *
+      * @return new empty script object
+      */
+     Script* ScriptGroup::AddScript() {
+         if (!pScripts) LoadScripts();
+         Script* pScript = new Script(this, NULL);
+         pScripts->push_back(pScript);
+         return pScript;
+     }
+     /** @brief Delete an instrument script.
+      *
+      * This will delete the given real-time instrument script. References of
+      * instruments that are using that script will be removed accordingly.
+      *
+      * You have to call Save() to make this persistent to the file.
+      *
+      * @param pScript - script to delete
+      * @throws gig::Exception if given script could not be found
+      */
+     void ScriptGroup::DeleteScript(Script* pScript) {
+         if (!pScripts) LoadScripts();
+         std::list<Script*>::iterator iter =
+             find(pScripts->begin(), pScripts->end(), pScript);
+         if (iter == pScripts->end())
+             throw gig::Exception("Could not delete script, could not find given script");
+         pScripts->erase(iter);
+         pScript->RemoveAllScriptReferences();
+         if (pScript->pChunk)
+             pScript->pChunk->GetParent()->DeleteSubChunk(pScript->pChunk);
+         delete pScript;
+     }
+     void ScriptGroup::LoadScripts() {
+         if (pScripts) return;
+         pScripts = new std::list<Script*>;
+         if (!pList) return;
+         for (RIFF::Chunk* ck = pList->GetFirstSubChunk(); ck;
+              ck = pList->GetNextSubChunk())
+         {
+             if (ck->GetChunkID() == CHUNK_ID_SCRI) {
+                 pScripts->push_back(new Script(this, ck));
+             }
+         }
+     }
  // *************** Instrument ***************
  // *
-     Instrument::Instrument(File* pFile, RIFF::List* insList) : DLS::Instrument((DLS::File*)pFile, insList) {
+     Instrument::Instrument(File* pFile, RIFF::List* insList, progress_t* pProgress) : DLS::Instrument((DLS::File*)pFile, insList) {
+         static const DLS::Info::string_length_t fixedStringLengths[] = {
+             { CHUNK_ID_INAM, 64 },
+             { CHUNK_ID_ISFT, 12 },
+             { 0, 0 }
+         };
+         pInfo->SetFixedStringLengths(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;
+         pMidiRules = new MidiRule*[3];
+         pMidiRules[0] = NULL;
+         pScriptRefs = NULL;
          // Loading
          RIFF::List* lart = insList->GetSubList(LIST_TYPE_LART);
-Line 1236 
 namespace gig {
+Line 4364 
 namespace gig {
                  PianoReleaseMode       = dimkeystart & 0x01;
                  DimensionKeyRange.low  = dimkeystart >> 1;
                  DimensionKeyRange.high = _3ewg->ReadUint8();
+                 if (_3ewg->GetSize() > 32) {
+                     // read MIDI rules
+                     int i = 0;
+                     _3ewg->SetPos(32);
+                     uint8_t id1 = _3ewg->ReadUint8();
+                     uint8_t id2 = _3ewg->ReadUint8();
+                     if (id2 == 16) {
+                         if (id1 == 4) {
+                             pMidiRules[i++] = new MidiRuleCtrlTrigger(_3ewg);
+                         } else if (id1 == 0) {
+                             pMidiRules[i++] = new MidiRuleLegato(_3ewg);
+                         } else if (id1 == 3) {
+                             pMidiRules[i++] = new MidiRuleAlternator(_3ewg);
+                         } else {
+                             pMidiRules[i++] = new MidiRuleUnknown;
+                         }
+                     }
+                     else if (id1 != 0 || id2 != 0) {
+                         pMidiRules[i++] = new MidiRuleUnknown;
+                     }
+                     //TODO: all the other types of rules
+                     pMidiRules[i] = NULL;
+                 }
              }
-             else throw gig::Exception("Mandatory <3ewg> chunk not found.");
          }
-         else throw gig::Exception("Mandatory <lart> list chunk not found.");
-         RIFF::List* lrgn = insList->GetSubList(LIST_TYPE_LRGN);
+         if (pFile->GetAutoLoad()) {
-         if (!lrgn) throw gig::Exception("Mandatory chunks in <ins > chunk not found.");
+             if (!pRegions) pRegions = new RegionList;
-         pRegions = new Region*[Regions];
+             RIFF::List* lrgn = insList->GetSubList(LIST_TYPE_LRGN);
-         RIFF::List* rgn = lrgn->GetFirstSubList();
+             if (lrgn) {
-         unsigned int iRegion = 0;
+                 RIFF::List* rgn = lrgn->GetFirstSubList();
-         while (rgn) {
+                 while (rgn) {
-             if (rgn->GetListType() == LIST_TYPE_RGN) {
+                     if (rgn->GetListType() == LIST_TYPE_RGN) {
-                 pRegions[iRegion] = new Region(this, rgn);
+                         __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);
-                 iRegion++;
+                         pRegions->push_back(new Region(this, rgn));
-             }
+                     }
-             rgn = lrgn->GetNextSubList();
+                     rgn = lrgn->GetNextSubList();
-         }
+                 }
+                 // Creating Region Key Table for fast lookup
-         // Creating Region Key Table for fast lookup
+                 UpdateRegionKeyTable();
-         for (uint iReg = 0; iReg < Regions; iReg++) {
+             }
-             for (int iKey = pRegions[iReg]->KeyRange.low; iKey <= pRegions[iReg]->KeyRange.high; iKey++) {
+         }
-                 RegionKeyTable[iKey] = pRegions[iReg];
+         // own gig format extensions
+         RIFF::List* lst3LS = insList->GetSubList(LIST_TYPE_3LS);
+         if (lst3LS) {
+             RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);
+             if (ckSCSL) {
+                 int headerSize = ckSCSL->ReadUint32();
+                 int slotCount  = ckSCSL->ReadUint32();
+                 if (slotCount) {
+                     int slotSize  = ckSCSL->ReadUint32();
+                     ckSCSL->SetPos(headerSize); // in case of future header extensions
+                     int unknownSpace = slotSize - 2*sizeof(uint32_t); // in case of future slot extensions
+                     for (int i = 0; i < slotCount; ++i) {
+                         _ScriptPooolEntry e;
+                         e.fileOffset = ckSCSL->ReadUint32();
+                         e.bypass     = ckSCSL->ReadUint32() & 1;
+                         if (unknownSpace) ckSCSL->SetPos(unknownSpace, RIFF::stream_curpos); // in case of future extensions
+                         scriptPoolFileOffsets.push_back(e);
+                     }
+                 }
+             }
+         }
+         __notify_progress(pProgress, 1.0f); // notify done
+     }
+     void Instrument::UpdateRegionKeyTable() {
+         for (int i = 0; i < 128; i++) RegionKeyTable[i] = NULL;
+         RegionList::iterator iter = pRegions->begin();
+         RegionList::iterator end  = pRegions->end();
+         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;
              }
          }
      }
      Instrument::~Instrument() {
-         for (uint i = 0; i < Regions; i++) {
+         for (int i = 0 ; pMidiRules[i] ; i++) {
-             if (pRegions) {
+             delete pMidiRules[i];
-                 if (pRegions[i]) delete (pRegions[i]);
+         }
+         delete[] pMidiRules;
+         if (pScriptRefs) delete pScriptRefs;
+     }
+     /**
+      * 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.
+      *
+      * @param pProgress - callback function for progress notification
+      * @throws gig::Exception if samples cannot be dereferenced
+      */
+     void Instrument::UpdateChunks(progress_t* pProgress) {
+         // first update base classes' chunks
+         DLS::Instrument::UpdateChunks(pProgress);
+         // update Regions' chunks
+         {
+             RegionList::iterator iter = pRegions->begin();
+             RegionList::iterator end  = pRegions->end();
+             for (; iter != end; ++iter)
+                 (*iter)->UpdateChunks(pProgress);
+         }
+         // 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;
+         if (pMidiRules[0] == 0 && _3ewg->GetSize() >= 34) {
+             pData[32] = 0;
+             pData[33] = 0;
+         } else {
+             for (int i = 0 ; pMidiRules[i] ; i++) {
+                 pMidiRules[i]->UpdateChunks(pData);
              }
-             delete[] pRegions;
          }
+         // own gig format extensions
+        if (ScriptSlotCount()) {
+            // make sure we have converted the original loaded script file
+            // offsets into valid Script object pointers
+            LoadScripts();
+            RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);
+            if (!lst3LS) lst3LS = pCkInstrument->AddSubList(LIST_TYPE_3LS);
+            const int slotCount = pScriptRefs->size();
+            const int headerSize = 3 * sizeof(uint32_t);
+            const int slotSize  = 2 * sizeof(uint32_t);
+            const int totalChunkSize = headerSize + slotCount * slotSize;
+            RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);
+            if (!ckSCSL) ckSCSL = lst3LS->AddSubChunk(CHUNK_ID_SCSL, totalChunkSize);
+            else ckSCSL->Resize(totalChunkSize);
+            uint8_t* pData = (uint8_t*) ckSCSL->LoadChunkData();
+            int pos = 0;
+            store32(&pData[pos], headerSize);
+            pos += sizeof(uint32_t);
+            store32(&pData[pos], slotCount);
+            pos += sizeof(uint32_t);
+            store32(&pData[pos], slotSize);
+            pos += sizeof(uint32_t);
+            for (int i = 0; i < slotCount; ++i) {
+                // arbitrary value, the actual file offset will be updated in
+                // UpdateScriptFileOffsets() after the file has been resized
+                int bogusFileOffset = 0;
+                store32(&pData[pos], bogusFileOffset);
+                pos += sizeof(uint32_t);
+                store32(&pData[pos], (*pScriptRefs)[i].bypass ? 1 : 0);
+                pos += sizeof(uint32_t);
+            }
+        } else {
+            // no script slots, so get rid of any LS custom RIFF chunks (if any)
+            RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);
+            if (lst3LS) pCkInstrument->DeleteSubChunk(lst3LS);
+        }
+     }
+     void Instrument::UpdateScriptFileOffsets() {
+        // own gig format extensions
+        if (pScriptRefs && pScriptRefs->size() > 0) {
+            RIFF::List* lst3LS = pCkInstrument->GetSubList(LIST_TYPE_3LS);
+            RIFF::Chunk* ckSCSL = lst3LS->GetSubChunk(CHUNK_ID_SCSL);
+            const int slotCount = pScriptRefs->size();
+            const int headerSize = 3 * sizeof(uint32_t);
+            ckSCSL->SetPos(headerSize);
+            for (int i = 0; i < slotCount; ++i) {
+                uint32_t fileOffset =
+                     (*pScriptRefs)[i].script->pChunk->GetFilePos() -
+                     (*pScriptRefs)[i].script->pChunk->GetPos() -
+                     CHUNK_HEADER_SIZE;
+                ckSCSL->WriteUint32(&fileOffset);
+                // jump over flags entry (containing the bypass flag)
+                ckSCSL->SetPos(sizeof(uint32_t), RIFF::stream_curpos);
+            }
+        }
      }
      /**
-Line 1279 
 namespace gig {
+Line 4577 
 namespace gig {
       *             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->empty() || 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 1296 
 namespace gig {
+Line 4595 
 namespace gig {
       * @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 1310 
 namespace gig {
+Line 4609 
 namespace gig {
       * @see      GetFirstRegion()
       */
      Region* Instrument::GetNextRegion() {
-         if (RegionIndex < 0 || 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();
+     }
+     /**
+      * Returns a MIDI rule of the instrument.
+      *
+      * The list of MIDI rules, at least in gig v3, always contains at
+      * most two rules. The second rule can only be the DEF filter
+      * (which currently isn't supported by libgig).
+      *
+      * @param i - MIDI rule number
+      * @returns   pointer address to MIDI rule number i or NULL if there is none
+      */
+     MidiRule* Instrument::GetMidiRule(int i) {
+         return pMidiRules[i];
+     }
+     /**
+      * Adds the "controller trigger" MIDI rule to the instrument.
+      *
+      * @returns the new MIDI rule
+      */
+     MidiRuleCtrlTrigger* Instrument::AddMidiRuleCtrlTrigger() {
+         delete pMidiRules[0];
+         MidiRuleCtrlTrigger* r = new MidiRuleCtrlTrigger;
+         pMidiRules[0] = r;
+         pMidiRules[1] = 0;
+         return r;
+     }
+     /**
+      * Adds the legato MIDI rule to the instrument.
+      *
+      * @returns the new MIDI rule
+      */
+     MidiRuleLegato* Instrument::AddMidiRuleLegato() {
+         delete pMidiRules[0];
+         MidiRuleLegato* r = new MidiRuleLegato;
+         pMidiRules[0] = r;
+         pMidiRules[1] = 0;
+         return r;
+     }
+     /**
+      * Adds the alternator MIDI rule to the instrument.
+      *
+      * @returns the new MIDI rule
+      */
+     MidiRuleAlternator* Instrument::AddMidiRuleAlternator() {
+         delete pMidiRules[0];
+         MidiRuleAlternator* r = new MidiRuleAlternator;
+         pMidiRules[0] = r;
+         pMidiRules[1] = 0;
+         return r;
+     }
+     /**
+      * Deletes a MIDI rule from the instrument.
+      *
+      * @param i - MIDI rule number
+      */
+     void Instrument::DeleteMidiRule(int i) {
+         delete pMidiRules[i];
+         pMidiRules[i] = 0;
+     }
+     void Instrument::LoadScripts() {
+         if (pScriptRefs) return;
+         pScriptRefs = new std::vector<_ScriptPooolRef>;
+         if (scriptPoolFileOffsets.empty()) return;
+         File* pFile = (File*) GetParent();
+         for (uint k = 0; k < scriptPoolFileOffsets.size(); ++k) {
+             uint32_t soughtOffset = scriptPoolFileOffsets[k].fileOffset;
+             for (uint i = 0; pFile->GetScriptGroup(i); ++i) {
+                 ScriptGroup* group = pFile->GetScriptGroup(i);
+                 for (uint s = 0; group->GetScript(s); ++s) {
+                     Script* script = group->GetScript(s);
+                     if (script->pChunk) {
+                         uint32_t offset = script->pChunk->GetFilePos() -
+                                           script->pChunk->GetPos() -
+                                           CHUNK_HEADER_SIZE;
+                         if (offset == soughtOffset)
+                         {
+                             _ScriptPooolRef ref;
+                             ref.script = script;
+                             ref.bypass = scriptPoolFileOffsets[k].bypass;
+                             pScriptRefs->push_back(ref);
+                             break;
+                         }
+                     }
+                 }
+             }
+         }
+         // we don't need that anymore
+         scriptPoolFileOffsets.clear();
+     }
+     /** @brief Get instrument script (gig format extension).
+      *
+      * Returns the real-time instrument script of instrument script slot
+      * @a index.
+      *
+      * @note This is an own format extension which did not exist i.e. in the
+      * GigaStudio 4 software. It will currently only work with LinuxSampler and
+      * gigedit.
+      *
+      * @param index - instrument script slot index
+      * @returns script or NULL if index is out of bounds
+      */
+     Script* Instrument::GetScriptOfSlot(uint index) {
+         LoadScripts();
+         if (index >= pScriptRefs->size()) return NULL;
+         return pScriptRefs->at(index).script;
+     }
+     /** @brief Add new instrument script slot (gig format extension).
+      *
+      * Add the given real-time instrument script reference to this instrument,
+      * which shall be executed by the sampler for for this instrument. The
+      * script will be added to the end of the script list of this instrument.
+      * The positions of the scripts in the Instrument's Script list are
+      * relevant, because they define in which order they shall be executed by
+      * the sampler. For this reason it is also legal to add the same script
+      * twice to an instrument, for example you might have a script called
+      * "MyFilter" which performs an event filter task, and you might have
+      * another script called "MyNoteTrigger" which triggers new notes, then you
+      * might for example have the following list of scripts on the instrument:
+      *
+      * 1. Script "MyFilter"
+      * 2. Script "MyNoteTrigger"
+      * 3. Script "MyFilter"
+      *
+      * Which would make sense, because the 2nd script launched new events, which
+      * you might need to filter as well.
+      *
+      * There are two ways to disable / "bypass" scripts. You can either disable
+      * a script locally for the respective script slot on an instrument (i.e. by
+      * passing @c false to the 2nd argument of this method, or by calling
+      * SetScriptBypassed()). Or you can disable a script globally for all slots
+      * and all instruments by setting Script::Bypass.
+      *
+      * @note This is an own format extension which did not exist i.e. in the
+      * GigaStudio 4 software. It will currently only work with LinuxSampler and
+      * gigedit.
+      *
+      * @param pScript - script that shall be executed for this instrument
+      * @param bypass  - if enabled, the sampler shall skip executing this
+      *                  script (in the respective list position)
+      * @see SetScriptBypassed()
+      */
+     void Instrument::AddScriptSlot(Script* pScript, bool bypass) {
+         LoadScripts();
+         _ScriptPooolRef ref = { pScript, bypass };
+         pScriptRefs->push_back(ref);
+     }
+     /** @brief Flip two script slots with each other (gig format extension).
+      *
+      * Swaps the position of the two given scripts in the Instrument's Script
+      * list. The positions of the scripts in the Instrument's Script list are
+      * relevant, because they define in which order they shall be executed by
+      * the sampler.
+      *
+      * @note This is an own format extension which did not exist i.e. in the
+      * GigaStudio 4 software. It will currently only work with LinuxSampler and
+      * gigedit.
+      *
+      * @param index1 - index of the first script slot to swap
+      * @param index2 - index of the second script slot to swap
+      */
+     void Instrument::SwapScriptSlots(uint index1, uint index2) {
+         LoadScripts();
+         if (index1 >= pScriptRefs->size() || index2 >= pScriptRefs->size())
+             return;
+         _ScriptPooolRef tmp = (*pScriptRefs)[index1];
+         (*pScriptRefs)[index1] = (*pScriptRefs)[index2];
+         (*pScriptRefs)[index2] = tmp;
+     }
+     /** @brief Remove script slot.
+      *
+      * Removes the script slot with the given slot index.
+      *
+      * @param index - index of script slot to remove
+      */
+     void Instrument::RemoveScriptSlot(uint index) {
+         LoadScripts();
+         if (index >= pScriptRefs->size()) return;
+         pScriptRefs->erase( pScriptRefs->begin() + index );
+     }
+     /** @brief Remove reference to given Script (gig format extension).
+      *
+      * This will remove all script slots on the instrument which are referencing
+      * the given script.
+      *
+      * @note This is an own format extension which did not exist i.e. in the
+      * GigaStudio 4 software. It will currently only work with LinuxSampler and
+      * gigedit.
+      *
+      * @param pScript - script reference to remove from this instrument
+      * @see RemoveScriptSlot()
+      */
+     void Instrument::RemoveScript(Script* pScript) {
+         LoadScripts();
+         for (int i = pScriptRefs->size() - 1; i >= 0; --i) {
+             if ((*pScriptRefs)[i].script == pScript) {
+                 pScriptRefs->erase( pScriptRefs->begin() + i );
+             }
+         }
+     }
+     /** @brief Instrument's amount of script slots.
+      *
+      * This method returns the amount of script slots this instrument currently
+      * uses.
+      *
+      * A script slot is a reference of a real-time instrument script to be
+      * executed by the sampler. The scripts will be executed by the sampler in
+      * sequence of the slots. One (same) script may be referenced multiple
+      * times in different slots.
+      *
+      * @note This is an own format extension which did not exist i.e. in the
+      * GigaStudio 4 software. It will currently only work with LinuxSampler and
+      * gigedit.
+      */
+     uint Instrument::ScriptSlotCount() const {
+         return pScriptRefs ? pScriptRefs->size() : scriptPoolFileOffsets.size();
+     }
+     /** @brief Whether script execution shall be skipped.
+      *
+      * Defines locally for the Script reference slot in the Instrument's Script
+      * list, whether the script shall be skipped by the sampler regarding
+      * execution.
+      *
+      * It is also possible to ignore exeuction of the script globally, for all
+      * slots and for all instruments by setting Script::Bypass.
+      *
+      * @note This is an own format extension which did not exist i.e. in the
+      * GigaStudio 4 software. It will currently only work with LinuxSampler and
+      * gigedit.
+      *
+      * @param index - index of the script slot on this instrument
+      * @see Script::Bypass
+      */
+     bool Instrument::IsScriptSlotBypassed(uint index) {
+         if (index >= ScriptSlotCount()) return false;
+         return pScriptRefs ? pScriptRefs->at(index).bypass
+                            : scriptPoolFileOffsets.at(index).bypass;
+     }
+     /** @brief Defines whether execution shall be skipped.
+      *
+      * You can call this method to define locally whether or whether not the
+      * given script slot shall be executed by the sampler.
+      *
+      * @note This is an own format extension which did not exist i.e. in the
+      * GigaStudio 4 software. It will currently only work with LinuxSampler and
+      * gigedit.
+      *
+      * @param index - script slot index on this instrument
+      * @param bBypass - if true, the script slot will be skipped by the sampler
+      * @see Script::Bypass
+      */
+     void Instrument::SetScriptSlotBypassed(uint index, bool bBypass) {
+         if (index >= ScriptSlotCount()) return;
+         if (pScriptRefs)
+             pScriptRefs->at(index).bypass = bBypass;
+         else
+             scriptPoolFileOffsets.at(index).bypass = bBypass;
+     }
+     /**
+      * Make a (semi) deep copy of the Instrument object given by @a orig
+      * and assign it to this object.
+      *
+      * Note that all sample pointers referenced by @a orig are simply copied as
+      * memory address. Thus the respective samples are shared, not duplicated!
+      *
+      * @param orig - original Instrument object to be copied from
+      */
+     void Instrument::CopyAssign(const Instrument* orig) {
+         CopyAssign(orig, NULL);
+     }
+     /**
+      * Make a (semi) deep copy of the Instrument object given by @a orig
+      * and assign it to this object.
+      *
+      * @param orig - original Instrument object to be copied from
+      * @param mSamples - crosslink map between the foreign file's samples and
+      *                   this file's samples
+      */
+     void Instrument::CopyAssign(const Instrument* orig, const std::map<Sample*,Sample*>* mSamples) {
+         // handle base class
+         // (without copying DLS region stuff)
+         DLS::Instrument::CopyAssignCore(orig);
+         // handle own member variables
+         Attenuation = orig->Attenuation;
+         EffectSend = orig->EffectSend;
+         FineTune = orig->FineTune;
+         PitchbendRange = orig->PitchbendRange;
+         PianoReleaseMode = orig->PianoReleaseMode;
+         DimensionKeyRange = orig->DimensionKeyRange;
+         scriptPoolFileOffsets = orig->scriptPoolFileOffsets;
+         pScriptRefs = orig->pScriptRefs;
+         // free old midi rules
+         for (int i = 0 ; pMidiRules[i] ; i++) {
+             delete pMidiRules[i];
+         }
+         //TODO: MIDI rule copying
+         pMidiRules[0] = NULL;
+         // delete all old regions
+         while (Regions) DeleteRegion(GetFirstRegion());
+         // create new regions and copy them from original
+         {
+             RegionList::const_iterator it = orig->pRegions->begin();
+             for (int i = 0; i < orig->Regions; ++i, ++it) {
+                 Region* dstRgn = AddRegion();
+                 //NOTE: Region does semi-deep copy !
+                 dstRgn->CopyAssign(
+                     static_cast<gig::Region*>(*it),
+                     mSamples
+                 );
+             }
+         }
+         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.
+      *
+      * @param pProgress - callback function for progress notification
+      */
+     void Group::UpdateChunks(progress_t* pProgress) {
+         // 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 1319 
 namespace gig {
+Line 5093 
 namespace gig {
  // *************** File ***************
  // *
+     /// Reflects Gigasampler file format version 2.0 (1998-06-28).
+     const DLS::version_t File::VERSION_2 = {
+, 2, 19980628 & 0xffff, 19980628 >> 16
+     };
+     /// Reflects Gigasampler file format version 3.0 (2003-03-31).
+     const DLS::version_t File::VERSION_3 = {
+, 3, 20030331 & 0xffff, 20030331 >> 16
+     };
+     static const DLS::Info::string_length_t _FileFixedStringLengths[] = {
+         { 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() {
+         bAutoLoad = true;
+         *pVersion = VERSION_3;
+         pGroups = NULL;
+         pScriptGroups = NULL;
+         pInfo->SetFixedStringLengths(_FileFixedStringLengths);
+         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;
+         bAutoLoad = true;
-         pInstruments = NULL;
+         pGroups = NULL;
+         pScriptGroups = NULL;
+         pInfo->SetFixedStringLengths(_FileFixedStringLengths);
      }
-     Sample* File::GetFirstSample() {
+     File::~File() {
-         if (!pSamples) LoadSamples();
+         if (pGroups) {
+             std::list<Group*>::iterator iter = pGroups->begin();
+             std::list<Group*>::iterator end  = pGroups->end();
+             while (iter != end) {
+                 delete *iter;
+                 ++iter;
+             }
+             delete pGroups;
+         }
+         if (pScriptGroups) {
+             std::list<ScriptGroup*>::iterator iter = pScriptGroups->begin();
+             std::list<ScriptGroup*>::iterator end  = pScriptGroups->end();
+             while (iter != end) {
+                 delete *iter;
+                 ++iter;
+             }
+             delete pScriptGroups;
+         }
+     }
+     Sample* File::GetFirstSample(progress_t* pProgress) {
+         if (!pSamples) LoadSamples(pProgress);
          if (!pSamples) return NULL;
          SamplesIterator = pSamples->begin();
          return static_cast<gig::Sample*>( (SamplesIterator != pSamples->end()) ? *SamplesIterator : NULL );
-Line 1336 
 namespace gig {
+Line 5181 
 namespace gig {
          SamplesIterator++;
          return static_cast<gig::Sample*>( (SamplesIterator != pSamples->end()) ? *SamplesIterator : NULL );
      }
+     /**
+      * Returns Sample object of @a index.
+      *
+      * @returns sample object or NULL if index is out of bounds
+      */
+     Sample* File::GetSample(uint index) {
+         if (!pSamples) LoadSamples();
+         if (!pSamples) return NULL;
+         DLS::File::SampleList::iterator it = pSamples->begin();
+         for (int i = 0; i < index; ++i) {
+             ++it;
+             if (it == pSamples->end()) return NULL;
+         }
+         if (it == pSamples->end()) return NULL;
+         return static_cast<gig::Sample*>( *it );
+     }
-     void File::LoadSamples() {
+     /** @brief Add a new sample.
-         RIFF::List* wvpl = pRIFF->GetSubList(LIST_TYPE_WVPL);
+      *
-         if (wvpl) {
+      * This will create a new Sample object for the gig file. You have to
-             unsigned long wvplFileOffset = wvpl->GetFilePos();
+      * call Save() to make this persistent to the file.
-             RIFF::List* wave = wvpl->GetFirstSubList();
+      *
-             while (wave) {
+      * @returns pointer to new Sample object
-                 if (wave->GetListType() == LIST_TYPE_WAVE) {
+      */
-                     if (!pSamples) pSamples = new SampleList;
+     Sample* File::AddSample() {
-                     unsigned long waveFileOffset = wave->GetFilePos();
+        if (!pSamples) LoadSamples();
-                     pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset));
+        __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;
+         SampleList::iterator tmp = SamplesIterator;
+         // 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;
                  }
-                 wave = wvpl->GetNextSubList();
              }
          }
-         else throw gig::Exception("Mandatory <wvpl> chunk not found.");
+         SamplesIterator = tmp; // restore iterator
+     }
+     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
+         int iSampleIndex  = 0;
+         int iTotalSamples = WavePoolCount;
+         // check if samples should be loaded from extension files
+         int lastFileNo = 0;
+         for (int i = 0 ; i < WavePoolCount ; i++) {
+             if (pWavePoolTableHi[i] > lastFileNo) lastFileNo = pWavePoolTableHi[i];
+         }
+         String name(pRIFF->GetFileName());
+         int nameLen = name.length();
+         char suffix[6];
+         if (nameLen > 4 && name.substr(nameLen - 4) == ".gig") nameLen -= 4;
+         for (int fileNo = 0 ; ; ) {
+             RIFF::List* wvpl = file->GetSubList(LIST_TYPE_WVPL);
+             if (wvpl) {
+                 unsigned long wvplFileOffset = wvpl->GetFilePos();
+                 RIFF::List* wave = wvpl->GetFirstSubList();
+                 while (wave) {
+                     if (wave->GetListType() == LIST_TYPE_WAVE) {
+                         // notify current progress
+                         const float subprogress = (float) iSampleIndex / (float) iTotalSamples;
+                         __notify_progress(pProgress, subprogress);
+                         unsigned long waveFileOffset = wave->GetFilePos();
+                         pSamples->push_back(new Sample(this, wave, waveFileOffset - wvplFileOffset, fileNo));
+                         iSampleIndex++;
+                     }
+                     wave = wvpl->GetNextSubList();
+                 }
+                 if (fileNo == lastFileNo) break;
+                 // open extension file (*.gx01, *.gx02, ...)
+                 fileNo++;
+                 sprintf(suffix, ".gx%02d", fileNo);
+                 name.replace(nameLen, 5, suffix);
+                 file = new RIFF::File(name);
+                 ExtensionFiles.push_back(file);
+             } else break;
+         }
+         __notify_progress(pProgress, 1.0); // notify done
      }
      Instrument* File::GetFirstInstrument() {
          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 );
      }
      /**
       * Returns the instrument with the given index.
       *
+      * @param index     - number of the sought instrument (0..n)
+      * @param pProgress - optional: callback function for progress notification
       * @returns  sought instrument or NULL if there's no such instrument
       */
-     Instrument* File::GetInstrument(uint index) {
+     Instrument* File::GetInstrument(uint index, progress_t* pProgress) {
-         if (!pInstruments) LoadInstruments();
+         if (!pInstruments) {
+             // TODO: hack - we simply load ALL samples here, it would have been done in the Region constructor anyway (ATM)
+             // sample loading subtask
+             progress_t subprogress;
+             __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask
+             __notify_progress(&subprogress, 0.0f);
+             if (GetAutoLoad())
+                 GetFirstSample(&subprogress); // now force all samples to be loaded
+             __notify_progress(&subprogress, 1.0f);
+             // instrument loading subtask
+             if (pProgress && pProgress->callback) {
+                 subprogress.__range_min = subprogress.__range_max;
+                 subprogress.__range_max = pProgress->__range_max; // schedule remaining percentage for this subtask
+             }
+             __notify_progress(&subprogress, 0.0f);
+             LoadInstruments(&subprogress);
+             __notify_progress(&subprogress, 1.0f);
+         }
          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 Add a duplicate of an existing instrument.
+      *
+      * Duplicates the instrument definition given by @a orig and adds it
+      * to this file. This allows in an instrument editor application to
+      * easily create variations of an instrument, which will be stored in
+      * the same .gig file, sharing i.e. the same samples.
+      *
+      * Note that all sample pointers referenced by @a orig are simply copied as
+      * memory address. Thus the respective samples are shared, not duplicated!
+      *
+      * You have to call Save() to make this persistent to the file.
+      *
+      * @param orig - original instrument to be copied
+      * @returns duplicated copy of the given instrument
+      */
+     Instrument* File::AddDuplicateInstrument(const Instrument* orig) {
+         Instrument* instr = AddInstrument();
+         instr->CopyAssign(orig);
+         return instr;
+     }
+     /** @brief Add content of another existing file.
+      *
+      * Duplicates the samples, groups and instruments of the original file
+      * given by @a pFile and adds them to @c this File. In case @c this File is
+      * a new one that you haven't saved before, then you have to call
+      * SetFileName() before calling AddContentOf(), because this method will
+      * automatically save this file during operation, which is required for
+      * writing the sample waveform data by disk streaming.
+      *
+      * @param pFile - original file whose's content shall be copied from
+      */
+     void File::AddContentOf(File* pFile) {
+         static int iCallCount = -1;
+         iCallCount++;
+         std::map<Group*,Group*> mGroups;
+         std::map<Sample*,Sample*> mSamples;
+         // clone sample groups
+         for (int i = 0; pFile->GetGroup(i); ++i) {
+             Group* g = AddGroup();
+             g->Name =
+                 "COPY" + ToString(iCallCount) + "_" + pFile->GetGroup(i)->Name;
+             mGroups[pFile->GetGroup(i)] = g;
+         }
+         // clone samples (not waveform data here yet)
+         for (int i = 0; pFile->GetSample(i); ++i) {
+             Sample* s = AddSample();
+             s->CopyAssignMeta(pFile->GetSample(i));
+             mGroups[pFile->GetSample(i)->GetGroup()]->AddSample(s);
+             mSamples[pFile->GetSample(i)] = s;
+         }
+         //BUG: For some reason this method only works with this additional
+         //     Save() call in between here.
+         //
+         // Important: The correct one of the 2 Save() methods has to be called
+         // here, depending on whether the file is completely new or has been
+         // saved to disk already, otherwise it will result in data corruption.
+         if (pRIFF->IsNew())
+             Save(GetFileName());
+         else
+             Save();
+         // clone instruments
+         // (passing the crosslink table here for the cloned samples)
+         for (int i = 0; pFile->GetInstrument(i); ++i) {
+             Instrument* instr = AddInstrument();
+             instr->CopyAssign(pFile->GetInstrument(i), &mSamples);
+         }
+         // Mandatory: file needs to be saved to disk at this point, so this
+         // file has the correct size and data layout for writing the samples'
+         // waveform data to disk.
+         Save();
+         // clone samples' waveform data
+         // (using direct read & write disk streaming)
+         for (int i = 0; pFile->GetSample(i); ++i) {
+             mSamples[pFile->GetSample(i)]->CopyAssignWave(pFile->GetSample(i));
+         }
+     }
+     /** @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;
              RIFF::List* lstInstr = lstInstruments->GetFirstSubList();
              while (lstInstr) {
                  if (lstInstr->GetListType() == LIST_TYPE_INS) {
-                     if (!pInstruments) pInstruments = new InstrumentList;
+                     // notify current progress
-                     pInstruments->push_back(new Instrument(this, lstInstr));
+                     const float localProgress = (float) iInstrumentIndex / (float) Instruments;
+                     __notify_progress(pProgress, localProgress);
+                     // divide local progress into subprogress for loading current Instrument
+                     progress_t subprogress;
+                     __divide_progress(pProgress, &subprogress, Instruments, iInstrumentIndex);
+                     pInstruments->push_back(new Instrument(this, lstInstr, &subprogress));
+                     iInstrumentIndex++;
                  }
                  lstInstr = lstInstruments->GetNextSubList();
              }
+             __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;
+     }
+     /**
+      * Returns the group with the given group name.
+      *
+      * Note: group names don't have to be unique in the gig format! So there
+      * can be multiple groups with the same name. This method will simply
+      * return the first group found with the given name.
+      *
+      * @param name - name of the sought group
+      * @returns sought group or NULL if there's no group with that name
+      */
+     Group* File::GetGroup(String name) {
+         if (!pGroups) LoadGroups();
+         GroupsIterator = pGroups->begin();
+         for (uint i = 0; GroupsIterator != pGroups->end(); ++GroupsIterator, ++i)
+             if ((*GroupsIterator)->Name == name) return *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);
+         }
+     }
+     /** @brief Get instrument script group (by index).
+      *
+      * Returns the real-time instrument script group with the given index.
+      *
+      * @param index - number of the sought group (0..n)
+      * @returns sought script group or NULL if there's no such group
+      */
+     ScriptGroup* File::GetScriptGroup(uint index) {
+         if (!pScriptGroups) LoadScriptGroups();
+         std::list<ScriptGroup*>::iterator it = pScriptGroups->begin();
+         for (uint i = 0; it != pScriptGroups->end(); ++i, ++it)
+             if (i == index) return *it;
+         return NULL;
+     }
+     /** @brief Get instrument script group (by name).
+      *
+      * Returns the first real-time instrument script group found with the given
+      * group name. Note that group names may not necessarily be unique.
+      *
+      * @param name - name of the sought script group
+      * @returns sought script group or NULL if there's no such group
+      */
+     ScriptGroup* File::GetScriptGroup(const String& name) {
+         if (!pScriptGroups) LoadScriptGroups();
+         std::list<ScriptGroup*>::iterator it = pScriptGroups->begin();
+         for (uint i = 0; it != pScriptGroups->end(); ++i, ++it)
+             if ((*it)->Name == name) return *it;
+         return NULL;
+     }
+     /** @brief Add new instrument script group.
+      *
+      * Adds a new, empty real-time instrument script group to the file.
+      *
+      * You have to call Save() to make this persistent to the file.
+      *
+      * @return new empty script group
+      */
+     ScriptGroup* File::AddScriptGroup() {
+         if (!pScriptGroups) LoadScriptGroups();
+         ScriptGroup* pScriptGroup = new ScriptGroup(this, NULL);
+         pScriptGroups->push_back(pScriptGroup);
+         return pScriptGroup;
+     }
+     /** @brief Delete an instrument script group.
+      *
+      * This will delete the given real-time instrument script group and all its
+      * instrument scripts it contains. References inside instruments that are
+      * using the deleted scripts will be removed from the respective instruments
+      * accordingly.
+      *
+      * You have to call Save() to make this persistent to the file.
+      *
+      * @param pScriptGroup - script group to delete
+      * @throws gig::Exception if given script group could not be found
+      */
+     void File::DeleteScriptGroup(ScriptGroup* pScriptGroup) {
+         if (!pScriptGroups) LoadScriptGroups();
+         std::list<ScriptGroup*>::iterator iter =
+             find(pScriptGroups->begin(), pScriptGroups->end(), pScriptGroup);
+         if (iter == pScriptGroups->end())
+             throw gig::Exception("Could not delete script group, could not find given script group");
+         pScriptGroups->erase(iter);
+         for (int i = 0; pScriptGroup->GetScript(i); ++i)
+             pScriptGroup->DeleteScript(pScriptGroup->GetScript(i));
+         if (pScriptGroup->pList)
+             pScriptGroup->pList->GetParent()->DeleteSubChunk(pScriptGroup->pList);
+         delete pScriptGroup;
+     }
+     void File::LoadScriptGroups() {
+         if (pScriptGroups) return;
+         pScriptGroups = new std::list<ScriptGroup*>;
+         RIFF::List* lstLS = pRIFF->GetSubList(LIST_TYPE_3LS);
+         if (lstLS) {
+             for (RIFF::List* lst = lstLS->GetFirstSubList(); lst;
+                  lst = lstLS->GetNextSubList())
+             {
+                 if (lst->GetListType() == LIST_TYPE_RTIS) {
+                     pScriptGroups->push_back(new ScriptGroup(this, lst));
+                 }
+             }
+         }
+     }
+     /**
+      * 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.
+      *
+      * @param pProgress - callback function for progress notification
+      * @throws Exception - on errors
+      */
+     void File::UpdateChunks(progress_t* pProgress) {
+         bool newFile = pRIFF->GetSubList(LIST_TYPE_INFO) == NULL;
+         b64BitWavePoolOffsets = pVersion && pVersion->major == 3;
+         // update own gig format extension chunks
+         // (not part of the GigaStudio 4 format)
+         //
+         // This must be performed before writing the chunks for instruments,
+         // because the instruments' script slots will write the file offsets
+         // of the respective instrument script chunk as reference.
+         if (pScriptGroups) {
+             RIFF::List* lst3LS = pRIFF->GetSubList(LIST_TYPE_3LS);
+             if (pScriptGroups->empty()) {
+                 if (lst3LS) pRIFF->DeleteSubChunk(lst3LS);
+             } else {
+                 if (!lst3LS) lst3LS = pRIFF->AddSubList(LIST_TYPE_3LS);
+                 // Update instrument script (group) chunks.
+                 for (std::list<ScriptGroup*>::iterator it = pScriptGroups->begin();
+                      it != pScriptGroups->end(); ++it)
+                 {
+                     (*it)->UpdateChunks(pProgress);
+                 }
+             }
+         }
+         // first update base class's chunks
+         DLS::File::UpdateChunks(pProgress);
+         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) {
+             // make sure '3gri' and '3gnl' list chunks exist
+             // (before updating the Group chunks)
+             RIFF::List* _3gri = pRIFF->GetSubList(LIST_TYPE_3GRI);
+             if (!_3gri) {
+                 _3gri = pRIFF->AddSubList(LIST_TYPE_3GRI);
+                 pRIFF->MoveSubChunk(_3gri, pRIFF->GetSubChunk(CHUNK_ID_PTBL));
+             }
+             RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);
+             if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);
+             // v3: make sure the file has 128 3gnm chunks
+             // (before updating the Group chunks)
+             if (pVersion && pVersion->major == 3) {
+                 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();
+                 }
+             }
+             std::list<Group*>::iterator iter = pGroups->begin();
+             std::list<Group*>::iterator end  = pGroups->end();
+             for (; iter != end; ++iter) {
+                 (*iter)->UpdateChunks(pProgress);
+             }
+         }
+         // 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);
+         }
+     }
+     void File::UpdateFileOffsets() {
+         DLS::File::UpdateFileOffsets();
+         for (Instrument* instrument = GetFirstInstrument(); instrument;
+              instrument = GetNextInstrument())
+         {
+             instrument->UpdateScriptFileOffsets();
+         }
+     }
+     /**
+      * Enable / disable automatic loading. By default this properyt is
+      * enabled and all informations are loaded automatically. However
+      * loading all Regions, DimensionRegions and especially samples might
+      * take a long time for large .gig files, and sometimes one might only
+      * be interested in retrieving very superficial informations like the
+      * amount of instruments and their names. In this case one might disable
+      * automatic loading to avoid very slow response times.
+      *
+      * @e CAUTION: by disabling this property many pointers (i.e. sample
+      * references) and informations will have invalid or even undefined
+      * data! This feature is currently only intended for retrieving very
+      * superficial informations in a very fast way. Don't use it to retrieve
+      * details like synthesis informations or even to modify .gig files!
+      */
+     void File::SetAutoLoad(bool b) {
+         bAutoLoad = b;
+     }
+     /**
+      * Returns whether automatic loading is enabled.
+      * @see SetAutoLoad()
+      */
+     bool File::GetAutoLoad() {
+         return bAutoLoad;
      }
-Line 1410 
 namespace gig {
+Line 6025 
 namespace gig {
          std::cout << "gig::Exception: " << Message << std::endl;
      }
+ // *************** functions ***************
+ // *
+     /**
+      * Returns the name of this C++ library. This is usually "libgig" of
+      * course. This call is equivalent to RIFF::libraryName() and
+      * DLS::libraryName().
+      */
+     String libraryName() {
+         return PACKAGE;
+     }
+     /**
+      * Returns version of this C++ library. This call is equivalent to
+      * RIFF::libraryVersion() and DLS::libraryVersion().
+      */
+     String libraryVersion() {
+         return VERSION;
+     }
  } // namespace gig

 Legend:



Removed from v.36
 


changed lines


 
Added in v.2682
 Legend:



Removed from v.36
 


changed lines


 
Added in v.2682
-Removed from v.36
+Added in v.2682

	ViewVC Help
Powered by ViewVC