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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1050 by schoenebeck,
Fri Mar  2 01:04:45 2007 UTC
+revision 1209 by persson,
Sun May 27 13:54:24 2007 UTC
 Line 254 
 namespace {
  }
+ // *************** Other Internal functions  ***************
+ // *
+     static split_type_t __resolveSplitType(dimension_t dimension) {
+         return (
+             dimension == dimension_layer ||
+             dimension == dimension_samplechannel ||
+             dimension == dimension_releasetrigger ||
+             dimension == dimension_keyboard ||
+             dimension == dimension_roundrobin ||
+             dimension == dimension_random ||
+             dimension == dimension_smartmidi ||
+             dimension == dimension_roundrobinkeyboard
+         ) ? split_type_bit : split_type_normal;
+     }
+     static int __resolveZoneSize(dimension_def_t& dimension_definition) {
+         return (dimension_definition.split_type == split_type_normal)
+         ? int(128.0 / dimension_definition.zones) : 0;
+     }
+ // *************** CRC ***************
+ // *
+     const uint32_t* CRC::table(initTable());
+     uint32_t* CRC::initTable() {
+         uint32_t* res = new uint32_t[256];
+         for (int i = 0 ; i < 256 ; i++) {
+             uint32_t c = i;
+             for (int j = 0 ; j < 8 ; j++) {
+                 c = (c & 1) ? 0xedb88320 ^ (c >> 1) : c >> 1;
+             }
+             res[i] = c;
+         }
+         return res;
+     }
  // *************** Sample ***************
  // *
-Line 279 
 namespace {
+Line 323 
 namespace {
       *                         is located, 0 otherwise
       */
      Sample::Sample(File* pFile, RIFF::List* waveList, unsigned long WavePoolOffset, unsigned long fileNo) : DLS::Sample((DLS::File*) pFile, waveList, WavePoolOffset) {
-         pInfo->UseFixedLengthStrings = true;
+         static const DLS::Info::FixedStringLength fixedStringLengths[] = {
+             { CHUNK_ID_INAM, 64 },
+             { 0, 0 }
+         };
+         pInfo->FixedStringLengths = fixedStringLengths;
          Instances++;
          FileNo = fileNo;
-Line 316 
 namespace {
+Line 364 
 namespace {
              SamplePeriod  = uint32_t(1000000000.0 / SamplesPerSecond + 0.5);
              MIDIUnityNote = 64;
              FineTune      = 0;
+             SMPTEFormat   = smpte_format_no_offset;
              SMPTEOffset   = 0;
              Loops         = 0;
              LoopID        = 0;
+             LoopType      = loop_type_normal;
              LoopStart     = 0;
              LoopEnd       = 0;
              LoopFraction  = 0;
-Line 374 
 namespace {
+Line 424 
 namespace {
          // make sure 'smpl' chunk exists
          pCkSmpl = pWaveList->GetSubChunk(CHUNK_ID_SMPL);
-         if (!pCkSmpl) pCkSmpl = pWaveList->AddSubChunk(CHUNK_ID_SMPL, 60);
+         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);
-         memcpy(&pData[0], &Manufacturer, 4);
+         store32(&pData[0], Manufacturer);
-         memcpy(&pData[4], &Product, 4);
+         store32(&pData[4], Product);
-         memcpy(&pData[8], &SamplePeriod, 4);
+         store32(&pData[8], SamplePeriod);
-         memcpy(&pData[12], &MIDIUnityNote, 4);
+         store32(&pData[12], MIDIUnityNote);
-         memcpy(&pData[16], &FineTune, 4);
+         store32(&pData[16], FineTune);
-         memcpy(&pData[20], &SMPTEFormat, 4);
+         store32(&pData[20], SMPTEFormat);
-         memcpy(&pData[24], &SMPTEOffset, 4);
+         store32(&pData[24], SMPTEOffset);
-         memcpy(&pData[28], &Loops, 4);
+         store32(&pData[28], Loops);
          // we skip 'manufByt' for now (4 bytes)
-         memcpy(&pData[36], &LoopID, 4);
+         store32(&pData[36], LoopID);
-         memcpy(&pData[40], &LoopType, 4);
+         store32(&pData[40], LoopType);
-         memcpy(&pData[44], &LoopStart, 4);
+         store32(&pData[44], LoopStart);
-         memcpy(&pData[48], &LoopEnd, 4);
+         store32(&pData[48], LoopEnd);
-         memcpy(&pData[52], &LoopFraction, 4);
+         store32(&pData[52], LoopFraction);
-         memcpy(&pData[56], &LoopPlayCount, 4);
+         store32(&pData[56], LoopPlayCount);
          // make sure '3gix' chunk exists
          pCk3gix = pWaveList->GetSubChunk(CHUNK_ID_3GIX);
-Line 414 
 namespace {
+Line 467 
 namespace {
          }
          // update '3gix' chunk
          pData = (uint8_t*) pCk3gix->LoadChunkData();
-         memcpy(&pData[0], &iSampleGroup, 2);
+         store16(&pData[0], iSampleGroup);
      }
      /// Scans compressed samples for mandatory informations (e.g. actual number of total sample points).
-Line 1107 
 namespace {
+Line 1160 
 namespace {
       */
      unsigned long Sample::Write(void* pBuffer, unsigned long SampleCount) {
          if (Compressed) throw gig::Exception("There is no support for writing compressed gig samples (yet)");
-         return DLS::Sample::Write(pBuffer, SampleCount);
+         // if this is the first write in this sample, reset the
+         // checksum calculator
+         if (pCkData->GetPos() == 0) {
+             crc.reset();
+         }
+         unsigned long res = DLS::Sample::Write(pBuffer, SampleCount);
+         crc.update((unsigned char *)pBuffer, SampleCount * FrameSize);
+         // if this is the last write, update the checksum chunk in the
+         // file
+         if (pCkData->GetPos() == pCkData->GetSize()) {
+             File* pFile = static_cast<File*>(GetParent());
+             pFile->SetSampleChecksum(this, crc.getValue());
+         }
+         return res;
      }
      /**
-Line 1338 
 namespace {
+Line 1406 
 namespace {
                  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;
-Line 1418 
 namespace {
+Line 1491 
 namespace {
              VCFVelocityDynamicRange         = 0x04;
              VCFVelocityCurve                = curve_type_linear;
              VCFType                         = vcf_type_lowpass;
+             memset(DimensionUpperLimits, 0, 8);
          }
          pVelocityAttenuationTable = GetVelocityTable(VelocityResponseCurve,
-Line 1473 
 namespace {
+Line 1547 
 namespace {
          // update '3ewa' chunk with DimensionRegion's current settings
-         const uint32_t unknown = _3ewa->GetSize(); // unknown, always chunk size ?
+         const uint32_t chunksize = _3ewa->GetNewSize();
-         memcpy(&pData[0], &unknown, 4);
+         store32(&pData[0], chunksize); // unknown, always chunk size?
          const int32_t lfo3freq = (int32_t) GIG_EXP_ENCODE(LFO3Frequency);
-         memcpy(&pData[4], &lfo3freq, 4);
+         store32(&pData[4], lfo3freq);
          const int32_t eg3attack = (int32_t) GIG_EXP_ENCODE(EG3Attack);
-         memcpy(&pData[8], &eg3attack, 4);
+         store32(&pData[8], eg3attack);
          // next 2 bytes unknown
-         memcpy(&pData[14], &LFO1InternalDepth, 2);
+         store16(&pData[14], LFO1InternalDepth);
          // next 2 bytes unknown
-         memcpy(&pData[18], &LFO3InternalDepth, 2);
+         store16(&pData[18], LFO3InternalDepth);
          // next 2 bytes unknown
-         memcpy(&pData[22], &LFO1ControlDepth, 2);
+         store16(&pData[22], LFO1ControlDepth);
          // next 2 bytes unknown
-         memcpy(&pData[26], &LFO3ControlDepth, 2);
+         store16(&pData[26], LFO3ControlDepth);
          const int32_t eg1attack = (int32_t) GIG_EXP_ENCODE(EG1Attack);
-         memcpy(&pData[28], &eg1attack, 4);
+         store32(&pData[28], eg1attack);
          const int32_t eg1decay1 = (int32_t) GIG_EXP_ENCODE(EG1Decay1);
-         memcpy(&pData[32], &eg1decay1, 4);
+         store32(&pData[32], eg1decay1);
          // next 2 bytes unknown
-         memcpy(&pData[38], &EG1Sustain, 2);
+         store16(&pData[38], EG1Sustain);
          const int32_t eg1release = (int32_t) GIG_EXP_ENCODE(EG1Release);
-         memcpy(&pData[40], &eg1release, 4);
+         store32(&pData[40], eg1release);
          const uint8_t eg1ctl = (uint8_t) EncodeLeverageController(EG1Controller);
-         memcpy(&pData[44], &eg1ctl, 1);
+         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);
-         memcpy(&pData[45], &eg1ctrloptions, 1);
+         pData[45] = eg1ctrloptions;
          const uint8_t eg2ctl = (uint8_t) EncodeLeverageController(EG2Controller);
-         memcpy(&pData[46], &eg2ctl, 1);
+         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);
-         memcpy(&pData[47], &eg2ctrloptions, 1);
+         pData[47] = eg2ctrloptions;
          const int32_t lfo1freq = (int32_t) GIG_EXP_ENCODE(LFO1Frequency);
-         memcpy(&pData[48], &lfo1freq, 4);
+         store32(&pData[48], lfo1freq);
          const int32_t eg2attack = (int32_t) GIG_EXP_ENCODE(EG2Attack);
-         memcpy(&pData[52], &eg2attack, 4);
+         store32(&pData[52], eg2attack);
          const int32_t eg2decay1 = (int32_t) GIG_EXP_ENCODE(EG2Decay1);
-         memcpy(&pData[56], &eg2decay1, 4);
+         store32(&pData[56], eg2decay1);
          // next 2 bytes unknown
-         memcpy(&pData[62], &EG2Sustain, 2);
+         store16(&pData[62], EG2Sustain);
          const int32_t eg2release = (int32_t) GIG_EXP_ENCODE(EG2Release);
-         memcpy(&pData[64], &eg2release, 4);
+         store32(&pData[64], eg2release);
          // next 2 bytes unknown
-         memcpy(&pData[70], &LFO2ControlDepth, 2);
+         store16(&pData[70], LFO2ControlDepth);
          const int32_t lfo2freq = (int32_t) GIG_EXP_ENCODE(LFO2Frequency);
-         memcpy(&pData[72], &lfo2freq, 4);
+         store32(&pData[72], lfo2freq);
          // next 2 bytes unknown
-         memcpy(&pData[78], &LFO2InternalDepth, 2);
+         store16(&pData[78], LFO2InternalDepth);
          const int32_t eg1decay2 = (int32_t) (EG1InfiniteSustain) ? 0x7fffffff : (int32_t) GIG_EXP_ENCODE(EG1Decay2);
-         memcpy(&pData[80], &eg1decay2, 4);
+         store32(&pData[80], eg1decay2);
          // next 2 bytes unknown
-         memcpy(&pData[86], &EG1PreAttack, 2);
+         store16(&pData[86], EG1PreAttack);
          const int32_t eg2decay2 = (int32_t) (EG2InfiniteSustain) ? 0x7fffffff : (int32_t) GIG_EXP_ENCODE(EG2Decay2);
-         memcpy(&pData[88], &eg2decay2, 4);
+         store32(&pData[88], eg2decay2);
          // next 2 bytes unknown
-         memcpy(&pData[94], &EG2PreAttack, 2);
+         store16(&pData[94], EG2PreAttack);
          {
              if (VelocityResponseDepth > 4) throw Exception("VelocityResponseDepth must be between 0 and 4");
-Line 1588 
 namespace {
+Line 1662 
 namespace {
                  default:
                      throw Exception("Could not update DimensionRegion's chunk, unknown VelocityResponseCurve selected");
              }
-             memcpy(&pData[96], &velocityresponse, 1);
+             pData[96] = velocityresponse;
          }
          {
-Line 1607 
 namespace {
+Line 1681 
 namespace {
                  default:
                      throw Exception("Could not update DimensionRegion's chunk, unknown ReleaseVelocityResponseCurve selected");
              }
-             memcpy(&pData[97], &releasevelocityresponse, 1);
+             pData[97] = releasevelocityresponse;
          }
-         memcpy(&pData[98], &VelocityResponseCurveScaling, 1);
+         pData[98] = VelocityResponseCurveScaling;
-         memcpy(&pData[99], &AttenuationControllerThreshold, 1);
+         pData[99] = AttenuationControllerThreshold;
          // next 4 bytes unknown
-         memcpy(&pData[104], &SampleStartOffset, 2);
+         store16(&pData[104], SampleStartOffset);
          // next 2 bytes unknown
-Line 1635 
 namespace {
+Line 1709 
 namespace {
                  default:
                      throw Exception("Could not update DimensionRegion's chunk, unknown DimensionBypass selected");
              }
-             memcpy(&pData[108], &pitchTrackDimensionBypass, 1);
+             pData[108] = pitchTrackDimensionBypass;
          }
          const uint8_t pan = (Pan >= 0) ? Pan : ((-Pan) + 63); // signed 8 bit -> signed 7 bit
-         memcpy(&pData[109], &pan, 1);
+         pData[109] = pan;
          const uint8_t selfmask = (SelfMask) ? 0x01 : 0x00;
-         memcpy(&pData[110], &selfmask, 1);
+         pData[110] = selfmask;
          // next byte unknown
-Line 1651 
 namespace {
+Line 1725 
 namespace {
              if (LFO3Sync) lfo3ctrl |= 0x20; // bit 5
              if (InvertAttenuationController) lfo3ctrl |= 0x80; // bit 7
              if (VCFType == vcf_type_lowpassturbo) lfo3ctrl |= 0x40; // bit 6
-             memcpy(&pData[112], &lfo3ctrl, 1);
+             pData[112] = lfo3ctrl;
          }
          const uint8_t attenctl = EncodeLeverageController(AttenuationController);
-         memcpy(&pData[113], &attenctl, 1);
+         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
-             memcpy(&pData[114], &lfo2ctrl, 1);
+             pData[114] = lfo2ctrl;
          }
          {
-Line 1671 
 namespace {
+Line 1745 
 namespace {
              if (LFO1Sync)      lfo1ctrl |= 0x40; // bit 6
              if (VCFResonanceController != vcf_res_ctrl_none)
                  lfo1ctrl |= GIG_VCF_RESONANCE_CTRL_ENCODE(VCFResonanceController);
-             memcpy(&pData[115], &lfo1ctrl, 1);
+             pData[115] = lfo1ctrl;
          }
          const uint16_t eg3depth = (EG3Depth >= 0) ? EG3Depth
                                                    : uint16_t(((-EG3Depth) - 1) ^ 0xffff); /* binary complementary for negatives */
-         memcpy(&pData[116], &eg3depth, 1);
+         pData[116] = eg3depth;
          // next 2 bytes unknown
          const uint8_t channeloffset = ChannelOffset * 4;
-         memcpy(&pData[120], &channeloffset, 1);
+         pData[120] = channeloffset;
          {
              uint8_t regoptions = 0;
              if (MSDecode)      regoptions |= 0x01; // bit 0
              if (SustainDefeat) regoptions |= 0x02; // bit 1
-             memcpy(&pData[121], &regoptions, 1);
+             pData[121] = regoptions;
          }
          // next 2 bytes unknown
-         memcpy(&pData[124], &VelocityUpperLimit, 1);
+         pData[124] = VelocityUpperLimit;
          // next 3 bytes unknown
-         memcpy(&pData[128], &ReleaseTriggerDecay, 1);
+         pData[128] = ReleaseTriggerDecay;
          // next 2 bytes unknown
          const uint8_t eg1hold = (EG1Hold) ? 0x80 : 0x00; // bit 7
-         memcpy(&pData[131], &eg1hold, 1);
+         pData[131] = eg1hold;
          const uint8_t vcfcutoff = (VCFEnabled) ? 0x80 : 0x00 |  /* bit 7 */
                                    (VCFCutoff & 0x7f);   /* lower 7 bits */
-         memcpy(&pData[132], &vcfcutoff, 1);
+         pData[132] = vcfcutoff;
-         memcpy(&pData[133], &VCFCutoffController, 1);
+         pData[133] = VCFCutoffController;
          const uint8_t vcfvelscale = (VCFCutoffControllerInvert) ? 0x80 : 0x00 | /* bit 7 */
                                      (VCFVelocityScale & 0x7f); /* lower 7 bits */
-         memcpy(&pData[134], &vcfvelscale, 1);
+         pData[134] = vcfvelscale;
          // next byte unknown
          const uint8_t vcfresonance = (VCFResonanceDynamic) ? 0x00 : 0x80 | /* bit 7 */
                                       (VCFResonance & 0x7f); /* lower 7 bits */
-         memcpy(&pData[136], &vcfresonance, 1);
+         pData[136] = vcfresonance;
          const uint8_t vcfbreakpoint = (VCFKeyboardTracking) ? 0x80 : 0x00 | /* bit 7 */
                                        (VCFKeyboardTrackingBreakpoint & 0x7f); /* lower 7 bits */
-         memcpy(&pData[137], &vcfbreakpoint, 1);
+         pData[137] = vcfbreakpoint;
          const uint8_t vcfvelocity = VCFVelocityDynamicRange % 5 |
                                      VCFVelocityCurve * 5;
-         memcpy(&pData[138], &vcfvelocity, 1);
+         pData[138] = vcfvelocity;
          const uint8_t vcftype = (VCFType == vcf_type_lowpassturbo) ? vcf_type_lowpass : VCFType;
-         memcpy(&pData[139], &vcftype, 1);
+         pData[139] = vcftype;
+         if (chunksize >= 148) {
+             memcpy(&pData[140], DimensionUpperLimits, 8);
+         }
      }
      // get the corresponding velocity table from the table map or create & calculate that table if it doesn't exist yet
-Line 1953 
 namespace {
+Line 2031 
 namespace {
                      default:
                          throw gig::Exception("leverage controller number is not supported by the gig format");
                  }
+                 break;
              default:
                  throw gig::Exception("Unknown leverage controller type.");
          }
-Line 2070 
 namespace {
+Line 2149 
 namespace {
  // *
      Region::Region(Instrument* pInstrument, RIFF::List* rgnList) : DLS::Region((DLS::Instrument*) pInstrument, rgnList) {
-         pInfo->UseFixedLengthStrings = true;
          // Initialization
          Dimensions = 0;
          for (int i = 0; i < 256; i++) {
-Line 2091 
 namespace {
+Line 2168 
 namespace {
              for (int i = 0; i < dimensionBits; i++) {
                  dimension_t dimension = static_cast<dimension_t>(_3lnk->ReadUint8());
                  uint8_t     bits      = _3lnk->ReadUint8();
-                 _3lnk->ReadUint8(); // probably the position of the dimension
+                 _3lnk->ReadUint8(); // bit position of the dimension (bits[0] + bits[1] + ... + bits[i-1])
-                 _3lnk->ReadUint8(); // unknown
+                 _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;
-Line 2105 
 namespace {
+Line 2182 
 namespace {
                      pDimensionDefinitions[i].dimension = dimension;
                      pDimensionDefinitions[i].bits      = bits;
                      pDimensionDefinitions[i].zones     = zones ? zones : 0x01 << bits; // = pow(2,bits)
-                     pDimensionDefinitions[i].split_type = (dimension == dimension_layer ||
+                     pDimensionDefinitions[i].split_type = __resolveSplitType(dimension);
-                                                            dimension == dimension_samplechannel ||
+                     pDimensionDefinitions[i].zone_size  = __resolveZoneSize(pDimensionDefinitions[i]);
-                                                            dimension == dimension_releasetrigger ||
-                                                            dimension == dimension_keyboard ||
-                                                            dimension == dimension_roundrobin ||
-                                                            dimension == dimension_random) ? split_type_bit
-                                                                                           : split_type_normal;
-                     pDimensionDefinitions[i].zone_size  =
-                         (pDimensionDefinitions[i].split_type == split_type_normal) ? 128.0 / pDimensionDefinitions[i].zones
-                                                                                    : 0;
                      Dimensions++;
                      // if this is a layer dimension, remember the amount of layers
-Line 2140 
 namespace {
+Line 2209 
 namespace {
                  if (file->pWavePoolTable) pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
              }
              GetSample(); // load global region sample reference
+         } else {
+             DimensionRegions = 0;
+             for (int i = 0 ; i < 8 ; i++) {
+                 pDimensionDefinitions[i].dimension  = dimension_none;
+                 pDimensionDefinitions[i].bits       = 0;
+                 pDimensionDefinitions[i].zones      = 0;
+             }
          }
          // make sure there is at least one dimension region
-Line 2162 
 namespace {
+Line 2238 
 namespace {
       * @throws gig::Exception if samples cannot be dereferenced
       */
      void Region::UpdateChunks() {
+         // in the gig format we don't care about the Region's sample reference
+         // but we still have to provide some existing one to not corrupt the
+         // file, so to avoid the latter we simply always assign the sample of
+         // the first dimension region of this region
+         pSample = pDimensionRegions[0]->pSample;
          // first update base class's chunks
          DLS::Region::UpdateChunks();
-Line 2179 
 namespace {
+Line 2261 
 namespace {
          if (!_3lnk) {
              const int _3lnkChunkSize = (pFile->pVersion && pFile->pVersion->major == 3) ? 1092 : 172;
              _3lnk = pCkRegion->AddSubChunk(CHUNK_ID_3LNK, _3lnkChunkSize);
+             memset(_3lnk->LoadChunkData(), 0, _3lnkChunkSize);
+             // move 3prg to last position
+             pCkRegion->MoveSubChunk(pCkRegion->GetSubList(LIST_TYPE_3PRG), 0);
          }
          // update dimension definitions in '3lnk' chunk
          uint8_t* pData = (uint8_t*) _3lnk->LoadChunkData();
-         memcpy(&pData[0], &DimensionRegions, 4);
+         store32(&pData[0], DimensionRegions);
+         int shift = 0;
          for (int i = 0; i < iMaxDimensions; i++) {
              pData[4 + i * 8] = (uint8_t) pDimensionDefinitions[i].dimension;
              pData[5 + i * 8] = pDimensionDefinitions[i].bits;
-             // next 2 bytes unknown
+             pData[6 + i * 8] = shift;
+             pData[7 + i * 8] = (1 << (shift + pDimensionDefinitions[i].bits)) - (1 << shift);
              pData[8 + i * 8] = pDimensionDefinitions[i].zones;
-             // next 3 bytes unknown
+             // next 3 bytes unknown, always zero?
+             shift += pDimensionDefinitions[i].bits;
          }
          // update wave pool table in '3lnk' chunk
-Line 2208 
 namespace {
+Line 2298 
 namespace {
                  }
                  if (iWaveIndex < 0) throw gig::Exception("Could not update gig::Region, could not find DimensionRegion's sample");
              }
-             memcpy(&pData[iWavePoolOffset + i * 4], &iWaveIndex, 4);
+             store32(&pData[iWavePoolOffset + i * 4], iWaveIndex);
          }
      }
-Line 2248 
 namespace {
+Line 2338 
 namespace {
          int dim[8] = { 0 };
          for (int i = 0 ; i < DimensionRegions ; i++) {
-             if (pDimensionRegions[i]->VelocityUpperLimit) {
+             if (pDimensionRegions[i]->DimensionUpperLimits[veldim] ||
+                 pDimensionRegions[i]->VelocityUpperLimit) {
                  // create the velocity table
                  uint8_t* table = pDimensionRegions[i]->VelocityTable;
                  if (!table) {
-Line 2257 
 namespace {
+Line 2348 
 namespace {
                  }
                  int tableidx = 0;
                  int velocityZone = 0;
-                 for (int k = i ; k < end ; k += step) {
+                 if (pDimensionRegions[i]->DimensionUpperLimits[veldim]) { // gig3
-                     DimensionRegion *d = pDimensionRegions[k];
+                     for (int k = i ; k < end ; k += step) {
-                     for (; tableidx <= d->VelocityUpperLimit ; tableidx++) table[tableidx] = velocityZone;
+                         DimensionRegion *d = pDimensionRegions[k];
-                     velocityZone++;
+                         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) {
-Line 2327 
 namespace {
+Line 2426 
 namespace {
          // assign definition of new dimension
          pDimensionDefinitions[Dimensions] = *pDimDef;
+         // auto correct certain dimension definition fields (where possible)
+         pDimensionDefinitions[Dimensions].split_type  =
+             __resolveSplitType(pDimensionDefinitions[Dimensions].dimension);
+         pDimensionDefinitions[Dimensions].zone_size =
+             __resolveZoneSize(pDimensionDefinitions[Dimensions]);
          // create new dimension region(s) for this new dimension
          for (int i = 1 << iCurrentBits; i < 1 << iNewBits; i++) {
              //TODO: maybe we should copy existing dimension regions if possible instead of simply creating new ones with default values
-             RIFF::List* pNewDimRgnListChunk = pCkRegion->AddSubList(LIST_TYPE_3EWL);
+             RIFF::List* _3prg = pCkRegion->GetSubList(LIST_TYPE_3PRG);
+             RIFF::List* pNewDimRgnListChunk = _3prg->AddSubList(LIST_TYPE_3EWL);
              pDimensionRegions[i] = new DimensionRegion(pNewDimRgnListChunk);
              DimensionRegions++;
          }
-Line 2455 
 namespace {
+Line 2561 
 namespace {
              } else {
                  switch (pDimensionDefinitions[i].split_type) {
                      case split_type_normal:
-                         bits = uint8_t(DimValues[i] / pDimensionDefinitions[i].zone_size);
+                         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;
-Line 2469 
 namespace {
+Line 2583 
 namespace {
          DimensionRegion* dimreg = pDimensionRegions[dimregidx];
          if (veldim != -1) {
              // (dimreg is now the dimension region for the lowest velocity)
-             if (dimreg->VelocityUpperLimit) // custom defined zone ranges
+             if (dimreg->VelocityTable) // custom defined zone ranges
                  bits = dimreg->VelocityTable[DimValues[veldim]];
              else // normal split type
                  bits = uint8_t(DimValues[veldim] / pDimensionDefinitions[veldim].zone_size);
-Line 2535 
 namespace {
+Line 2649 
 namespace {
  // *
      Instrument::Instrument(File* pFile, RIFF::List* insList, progress_t* pProgress) : DLS::Instrument((DLS::File*)pFile, insList) {
-         pInfo->UseFixedLengthStrings = true;
+         static const DLS::Info::FixedStringLength fixedStringLengths[] = {
+             { CHUNK_ID_INAM, 64 },
+             { CHUNK_ID_ISFT, 12 },
+             { 0, 0 }
+         };
+         pInfo->FixedStringLengths = fixedStringLengths;
          // Initialization
          for (int i = 0; i < 128; i++) RegionKeyTable[i] = NULL;
+         EffectSend = 0;
+         Attenuation = 0;
+         FineTune = 0;
+         PitchbendRange = 0;
+         PianoReleaseMode = false;
+         DimensionKeyRange.low = 0;
+         DimensionKeyRange.high = 0;
          // Loading
          RIFF::List* lart = insList->GetSubList(LIST_TYPE_LART);
-Line 2617 
 namespace {
+Line 2743 
 namespace {
          if (!_3ewg)  _3ewg = lart->AddSubChunk(CHUNK_ID_3EWG, 12);
          // update '3ewg' RIFF chunk
          uint8_t* pData = (uint8_t*) _3ewg->LoadChunkData();
-         memcpy(&pData[0], &EffectSend, 2);
+         store16(&pData[0], EffectSend);
-         memcpy(&pData[2], &Attenuation, 4);
+         store32(&pData[2], Attenuation);
-         memcpy(&pData[6], &FineTune, 2);
+         store16(&pData[6], FineTune);
-         memcpy(&pData[8], &PitchbendRange, 2);
+         store16(&pData[8], PitchbendRange);
          const uint8_t dimkeystart = (PianoReleaseMode) ? 0x01 : 0x00 |
                                      DimensionKeyRange.low << 1;
-         memcpy(&pData[10], &dimkeystart, 1);
+         pData[10] = dimkeystart;
-         memcpy(&pData[11], &DimensionKeyRange.high, 1);
+         pData[11] = DimensionKeyRange.high;
      }
      /**
-Line 2711 
 namespace {
+Line 2837 
 namespace {
      }
      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. You have to call
+      * Apply current Group field values to the respective chunks. You have
-      * File::Save() to make changes persistent.
+      * to call File::Save() to make changes persistent.
+      *
+      * Usually there is absolutely no need to call this method explicitly.
+      * It will be called automatically when File::Save() was called.
       */
      void Group::UpdateChunks() {
          // make sure <3gri> and <3gnl> list chunks exist
          RIFF::List* _3gri = pFile->pRIFF->GetSubList(LIST_TYPE_3GRI);
-         if (!_3gri) _3gri = pFile->pRIFF->AddSubList(LIST_TYPE_3GRI);
+         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 = pFile->pRIFF->AddSubList(LIST_TYPE_3GNL);
+         if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);
          // 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);
      }
-Line 2799 
 namespace {
+Line 2933 
 namespace {
  // *************** File ***************
  // *
+     // File version 2.0, 1998-06-28
+     const DLS::version_t File::VERSION_2 = {
+, 2, 19980628 & 0xffff, 19980628 >> 16
+     };
+     // File version 3.0, 2003-03-31
+     const DLS::version_t File::VERSION_3 = {
+, 3, 20030331 & 0xffff, 20030331 >> 16
+     };
+     const DLS::Info::FixedStringLength File::FixedStringLengths[] = {
+         { CHUNK_ID_IARL, 256 },
+         { CHUNK_ID_IART, 128 },
+         { CHUNK_ID_ICMS, 128 },
+         { CHUNK_ID_ICMT, 1024 },
+         { CHUNK_ID_ICOP, 128 },
+         { CHUNK_ID_ICRD, 128 },
+         { CHUNK_ID_IENG, 128 },
+         { CHUNK_ID_IGNR, 128 },
+         { CHUNK_ID_IKEY, 128 },
+         { CHUNK_ID_IMED, 128 },
+         { CHUNK_ID_INAM, 128 },
+         { CHUNK_ID_IPRD, 128 },
+         { CHUNK_ID_ISBJ, 128 },
+         { CHUNK_ID_ISFT, 128 },
+         { CHUNK_ID_ISRC, 128 },
+         { CHUNK_ID_ISRF, 128 },
+         { CHUNK_ID_ITCH, 128 },
+         { 0, 0 }
+     };
      File::File() : DLS::File() {
          pGroups = NULL;
-         pInfo->UseFixedLengthStrings = true;
+         pInfo->FixedStringLengths = FixedStringLengths;
+         pInfo->ArchivalLocation = String(256, ' ');
+         // add some mandatory chunks to get the file chunks in right
+         // order (INFO chunk will be moved to first position later)
+         pRIFF->AddSubChunk(CHUNK_ID_VERS, 8);
+         pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);
+         pRIFF->AddSubChunk(CHUNK_ID_DLID, 16);
+         GenerateDLSID();
      }
      File::File(RIFF::File* pRIFF) : DLS::File(pRIFF) {
          pGroups = NULL;
-         pInfo->UseFixedLengthStrings = true;
+         pInfo->FixedStringLengths = FixedStringLengths;
      }
      File::~File() {
-Line 2848 
 namespace {
+Line 3022 
 namespace {
         // 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;
      }
-Line 2864 
 namespace {
+Line 3043 
 namespace {
          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;
      }
-Line 2875 
 namespace {
+Line 3055 
 namespace {
      void File::LoadSamples(progress_t* pProgress) {
          // Groups must be loaded before samples, because samples will try
          // to resolve the group they belong to
-         LoadGroups();
+         if (!pGroups) LoadGroups();
          if (!pSamples) pSamples = new SampleList;
-Line 2989 
 namespace {
+Line 3169 
 namespace {
         __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;
      }
-Line 3000 
 namespace {
+Line 3192 
 namespace {
       * have to call Save() to make this persistent to the file.
       *
       * @param pInstrument - instrument to delete
-      * @throws gig::Excption if given instrument could not be found
+      * @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");
-Line 3040 
 namespace {
+Line 3232 
 namespace {
          }
      }
+     /// 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
-Line 3078 
 namespace {
+Line 3296 
 namespace {
          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);
-Line 3113 
 namespace {
+Line 3364 
 namespace {
          }
      }
+     /**
+      * Apply all the gig file's current instruments, samples, groups and settings
+      * to the respective RIFF chunks. You have to call Save() to make changes
+      * persistent.
+      *
+      * Usually there is absolutely no need to call this method explicitly.
+      * It will be called automatically when File::Save() was called.
+      *
+      * @throws Exception - on errors
+      */
+     void File::UpdateChunks() {
+         bool newFile = pRIFF->GetSubList(LIST_TYPE_INFO) == NULL;
+         // first update base class's chunks
+         DLS::File::UpdateChunks();
+         if (newFile) {
+             // INFO was added by Resource::UpdateChunks - make sure it
+             // is placed first in file
+             RIFF::Chunk* info = pRIFF->GetSubList(LIST_TYPE_INFO);
+             RIFF::Chunk* first = pRIFF->GetFirstSubChunk();
+             if (first != info) {
+                 pRIFF->MoveSubChunk(info, first);
+             }
+         }
+         // update group's chunks
+         if (pGroups) {
+             std::list<Group*>::iterator iter = pGroups->begin();
+             std::list<Group*>::iterator end  = pGroups->end();
+             for (; iter != end; ++iter) {
+                 (*iter)->UpdateChunks();
+             }
+         }
+         // 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 instrumentIdx = 0;
+             memset(&pData[48], 0, sublen - 48);
+             for (Instrument* instrument = GetFirstInstrument() ; instrument ;
+                  instrument = GetNextInstrument()) {
+                 int nbusedsamples = 0;
+                 int nbusedchannels = 0;
+                 int nbdimregions = 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;
+                                 }
+                             }
+                         }
+                     }
+                     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);
+                 // next 12 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;
+                 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);
+             // next 12 bytes unknown
+             // next 4 bytes unknown, 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();
+         }
+     }
  // *************** Exception ***************

 Legend:



Removed from v.1050
 


changed lines


 
Added in v.1209
 Legend:



Removed from v.1050
 


changed lines


 
Added in v.1209
-Removed from v.1050
+Added in v.1209

	ViewVC Help
Powered by ViewVC