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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1264 by persson, Sun Jul 29 10:51:09 2007 UTC revision 1627 by persson, Sun Jan 6 10:53:53 2008 UTC
# Line 255  namespace { Line 255  namespace {
255    
256    
257    
258    // *************** Internal CRC-32 (Cyclic Redundancy Check) functions  ***************
259    // *
260    
261        static uint32_t* __initCRCTable() {
262            static uint32_t res[256];
263    
264            for (int i = 0 ; i < 256 ; i++) {
265                uint32_t c = i;
266                for (int j = 0 ; j < 8 ; j++) {
267                    c = (c & 1) ? 0xedb88320 ^ (c >> 1) : c >> 1;
268                }
269                res[i] = c;
270            }
271            return res;
272        }
273    
274        static const uint32_t* __CRCTable = __initCRCTable();
275    
276        /**
277         * Initialize a CRC variable.
278         *
279         * @param crc - variable to be initialized
280         */
281        inline static void __resetCRC(uint32_t& crc) {
282            crc = 0xffffffff;
283        }
284    
285        /**
286         * Used to calculate checksums of the sample data in a gig file. The
287         * checksums are stored in the 3crc chunk of the gig file and
288         * automatically updated when a sample is written with Sample::Write().
289         *
290         * One should call __resetCRC() to initialize the CRC variable to be
291         * used before calling this function the first time.
292         *
293         * After initializing the CRC variable one can call this function
294         * arbitrary times, i.e. to split the overall CRC calculation into
295         * steps.
296         *
297         * Once the whole data was processed by __calculateCRC(), one should
298         * call __encodeCRC() to get the final CRC result.
299         *
300         * @param buf     - pointer to data the CRC shall be calculated of
301         * @param bufSize - size of the data to be processed
302         * @param crc     - variable the CRC sum shall be stored to
303         */
304        static void __calculateCRC(unsigned char* buf, int bufSize, uint32_t& crc) {
305            for (int i = 0 ; i < bufSize ; i++) {
306                crc = __CRCTable[(crc ^ buf[i]) & 0xff] ^ (crc >> 8);
307            }
308        }
309    
310        /**
311         * Returns the final CRC result.
312         *
313         * @param crc - variable previously passed to __calculateCRC()
314         */
315        inline static uint32_t __encodeCRC(const uint32_t& crc) {
316            return crc ^ 0xffffffff;
317        }
318    
319    
320    
321  // *************** Other Internal functions  ***************  // *************** Other Internal functions  ***************
322  // *  // *
323    
# Line 278  namespace { Line 341  namespace {
341    
342    
343    
 // *************** 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;  
     }  
   
   
   
344  // *************** Sample ***************  // *************** Sample ***************
345  // *  // *
346    
# Line 323  namespace { Line 366  namespace {
366       *                         is located, 0 otherwise       *                         is located, 0 otherwise
367       */       */
368      Sample::Sample(File* pFile, RIFF::List* waveList, unsigned long WavePoolOffset, unsigned long fileNo) : DLS::Sample((DLS::File*) pFile, waveList, WavePoolOffset) {      Sample::Sample(File* pFile, RIFF::List* waveList, unsigned long WavePoolOffset, unsigned long fileNo) : DLS::Sample((DLS::File*) pFile, waveList, WavePoolOffset) {
369          static const DLS::Info::FixedStringLength fixedStringLengths[] = {          static const DLS::Info::string_length_t fixedStringLengths[] = {
370              { CHUNK_ID_INAM, 64 },              { CHUNK_ID_INAM, 64 },
371              { 0, 0 }              { 0, 0 }
372          };          };
373          pInfo->FixedStringLengths = fixedStringLengths;          pInfo->SetFixedStringLengths(fixedStringLengths);
374          Instances++;          Instances++;
375          FileNo = fileNo;          FileNo = fileNo;
376    
377            __resetCRC(crc);
378    
379          pCk3gix = waveList->GetSubChunk(CHUNK_ID_3GIX);          pCk3gix = waveList->GetSubChunk(CHUNK_ID_3GIX);
380          if (pCk3gix) {          if (pCk3gix) {
381              uint16_t iSampleGroup = pCk3gix->ReadInt16();              uint16_t iSampleGroup = pCk3gix->ReadInt16();
# Line 1168  namespace { Line 1213  namespace {
1213          // if this is the first write in this sample, reset the          // if this is the first write in this sample, reset the
1214          // checksum calculator          // checksum calculator
1215          if (pCkData->GetPos() == 0) {          if (pCkData->GetPos() == 0) {
1216              crc.reset();              __resetCRC(crc);
1217          }          }
1218          if (GetSize() < SampleCount) throw Exception("Could not write sample data, current sample size to small");          if (GetSize() < SampleCount) throw Exception("Could not write sample data, current sample size to small");
1219          unsigned long res;          unsigned long res;
# Line 1178  namespace { Line 1223  namespace {
1223              res = Channels == 2 ? pCkData->Write(pBuffer, SampleCount << 1, 2) >> 1              res = Channels == 2 ? pCkData->Write(pBuffer, SampleCount << 1, 2) >> 1
1224                                  : pCkData->Write(pBuffer, SampleCount, 2);                                  : pCkData->Write(pBuffer, SampleCount, 2);
1225          }          }
1226          crc.update((unsigned char *)pBuffer, SampleCount * FrameSize);          __calculateCRC((unsigned char *)pBuffer, SampleCount * FrameSize, crc);
1227    
1228          // if this is the last write, update the checksum chunk in the          // if this is the last write, update the checksum chunk in the
1229          // file          // file
1230          if (pCkData->GetPos() == pCkData->GetSize()) {          if (pCkData->GetPos() == pCkData->GetSize()) {
1231              File* pFile = static_cast<File*>(GetParent());              File* pFile = static_cast<File*>(GetParent());
1232              pFile->SetSampleChecksum(this, crc.getValue());              pFile->SetSampleChecksum(this, __encodeCRC(crc));
1233          }          }
1234          return res;          return res;
1235      }      }
# Line 1262  namespace { Line 1307  namespace {
1307      uint                               DimensionRegion::Instances       = 0;      uint                               DimensionRegion::Instances       = 0;
1308      DimensionRegion::VelocityTableMap* DimensionRegion::pVelocityTables = NULL;      DimensionRegion::VelocityTableMap* DimensionRegion::pVelocityTables = NULL;
1309    
1310      DimensionRegion::DimensionRegion(RIFF::List* _3ewl) : DLS::Sampler(_3ewl) {      DimensionRegion::DimensionRegion(Region* pParent, RIFF::List* _3ewl) : DLS::Sampler(_3ewl) {
1311          Instances++;          Instances++;
1312    
1313          pSample = NULL;          pSample = NULL;
1314            pRegion = pParent;
1315    
1316          if (_3ewl->GetSubChunk(CHUNK_ID_WSMP)) memcpy(&Crossfade, &SamplerOptions, 4);          if (_3ewl->GetSubChunk(CHUNK_ID_WSMP)) memcpy(&Crossfade, &SamplerOptions, 4);
1317          else memset(&Crossfade, 0, 4);          else memset(&Crossfade, 0, 4);
# Line 1511  namespace { Line 1557  namespace {
1557                                                       VelocityResponseDepth,                                                       VelocityResponseDepth,
1558                                                       VelocityResponseCurveScaling);                                                       VelocityResponseCurveScaling);
1559    
1560          curve_type_t curveType = ReleaseVelocityResponseCurve;          pVelocityReleaseTable = GetReleaseVelocityTable(
1561          uint8_t depth = ReleaseVelocityResponseDepth;                                      ReleaseVelocityResponseCurve,
1562                                        ReleaseVelocityResponseDepth
1563                                    );
1564    
1565            pVelocityCutoffTable = GetCutoffVelocityTable(VCFVelocityCurve,
1566                                                          VCFVelocityDynamicRange,
1567                                                          VCFVelocityScale,
1568                                                          VCFCutoffController);
1569    
1570          // this models a strange behaviour or bug in GSt: two of the          SampleAttenuation = pow(10.0, -Gain / (20.0 * 655360));
1571          // velocity response curves for release time are not used even          VelocityTable = 0;
1572          // 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;  
         }  
         pVelocityReleaseTable = GetVelocityTable(curveType, depth, 0);  
1573    
1574          curveType = VCFVelocityCurve;      /*
1575          depth = VCFVelocityDynamicRange;       * Constructs a DimensionRegion by copying all parameters from
1576         * another DimensionRegion
1577         */
1578        DimensionRegion::DimensionRegion(RIFF::List* _3ewl, const DimensionRegion& src) : DLS::Sampler(_3ewl) {
1579            Instances++;
1580            *this = src; // default memberwise shallow copy of all parameters
1581            pParentList = _3ewl; // restore the chunk pointer
1582    
1583          // even stranger GSt: two of the velocity response curves for          // deep copy of owned structures
1584          // filter cutoff are not used, instead another special curve          if (src.VelocityTable) {
1585          // is chosen. This curve is not used anywhere else.              VelocityTable = new uint8_t[128];
1586          if ((curveType == curve_type_nonlinear && depth == 0) ||              for (int k = 0 ; k < 128 ; k++)
1587              (curveType == curve_type_special   && depth == 4)) {                  VelocityTable[k] = src.VelocityTable[k];
             curveType = curve_type_special;  
             depth = 5;  
1588          }          }
1589          pVelocityCutoffTable = GetVelocityTable(curveType, depth,          if (src.pSampleLoops) {
1590                                                  VCFCutoffController <= vcf_cutoff_ctrl_none2 ? VCFVelocityScale : 0);              pSampleLoops = new DLS::sample_loop_t[src.SampleLoops];
1591                for (int k = 0 ; k < src.SampleLoops ; k++)
1592                    pSampleLoops[k] = src.pSampleLoops[k];
1593            }
1594        }
1595    
1596        /**
1597         * Updates the respective member variable and updates @c SampleAttenuation
1598         * which depends on this value.
1599         */
1600        void DimensionRegion::SetGain(int32_t gain) {
1601            DLS::Sampler::SetGain(gain);
1602          SampleAttenuation = pow(10.0, -Gain / (20.0 * 655360));          SampleAttenuation = pow(10.0, -Gain / (20.0 * 655360));
         VelocityTable = 0;  
1603      }      }
1604    
1605      /**      /**
# Line 1550  namespace { Line 1610  namespace {
1610       * It will be called automatically when File::Save() was called.       * It will be called automatically when File::Save() was called.
1611       */       */
1612      void DimensionRegion::UpdateChunks() {      void DimensionRegion::UpdateChunks() {
         // check if wsmp is going to be created by  
         // DLS::Sampler::UpdateChunks  
         bool wsmp_created = !pParentList->GetSubChunk(CHUNK_ID_WSMP);  
   
1613          // first update base class's chunk          // first update base class's chunk
1614          DLS::Sampler::UpdateChunks();          DLS::Sampler::UpdateChunks();
1615    
# Line 1566  namespace { Line 1622  namespace {
1622    
1623          // make sure '3ewa' chunk exists          // make sure '3ewa' chunk exists
1624          RIFF::Chunk* _3ewa = pParentList->GetSubChunk(CHUNK_ID_3EWA);          RIFF::Chunk* _3ewa = pParentList->GetSubChunk(CHUNK_ID_3EWA);
1625          if (!_3ewa)  _3ewa = pParentList->AddSubChunk(CHUNK_ID_3EWA, 140);          if (!_3ewa) {
1626          else if (wsmp_created) {              File* pFile = (File*) GetParent()->GetParent()->GetParent();
1627              // make sure the chunk order is: wsmp, 3ewa              bool version3 = pFile->pVersion && pFile->pVersion->major == 3;
1628              pParentList->MoveSubChunk(_3ewa, 0);              _3ewa = pParentList->AddSubChunk(CHUNK_ID_3EWA, version3 ? 148 : 140);
1629          }          }
1630          pData = (uint8_t*) _3ewa->LoadChunkData();          pData = (uint8_t*) _3ewa->LoadChunkData();
1631    
# Line 1617  namespace { Line 1673  namespace {
1673          pData[44] = eg1ctl;          pData[44] = eg1ctl;
1674    
1675          const uint8_t eg1ctrloptions =          const uint8_t eg1ctrloptions =
1676              (EG1ControllerInvert) ? 0x01 : 0x00 |              (EG1ControllerInvert ? 0x01 : 0x00) |
1677              GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(EG1ControllerAttackInfluence) |              GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(EG1ControllerAttackInfluence) |
1678              GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(EG1ControllerDecayInfluence) |              GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(EG1ControllerDecayInfluence) |
1679              GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(EG1ControllerReleaseInfluence);              GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(EG1ControllerReleaseInfluence);
# Line 1627  namespace { Line 1683  namespace {
1683          pData[46] = eg2ctl;          pData[46] = eg2ctl;
1684    
1685          const uint8_t eg2ctrloptions =          const uint8_t eg2ctrloptions =
1686              (EG2ControllerInvert) ? 0x01 : 0x00 |              (EG2ControllerInvert ? 0x01 : 0x00) |
1687              GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(EG2ControllerAttackInfluence) |              GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(EG2ControllerAttackInfluence) |
1688              GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(EG2ControllerDecayInfluence) |              GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(EG2ControllerDecayInfluence) |
1689              GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(EG2ControllerReleaseInfluence);              GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(EG2ControllerReleaseInfluence);
# Line 1805  namespace { Line 1861  namespace {
1861          const uint8_t eg1hold = (EG1Hold) ? 0x80 : 0x00; // bit 7          const uint8_t eg1hold = (EG1Hold) ? 0x80 : 0x00; // bit 7
1862          pData[131] = eg1hold;          pData[131] = eg1hold;
1863    
1864          const uint8_t vcfcutoff = (VCFEnabled) ? 0x80 : 0x00 |  /* bit 7 */          const uint8_t vcfcutoff = (VCFEnabled ? 0x80 : 0x00) |  /* bit 7 */
1865                                    (VCFCutoff & 0x7f);   /* lower 7 bits */                                    (VCFCutoff & 0x7f);   /* lower 7 bits */
1866          pData[132] = vcfcutoff;          pData[132] = vcfcutoff;
1867    
1868          pData[133] = VCFCutoffController;          pData[133] = VCFCutoffController;
1869    
1870          const uint8_t vcfvelscale = (VCFCutoffControllerInvert) ? 0x80 : 0x00 | /* bit 7 */          const uint8_t vcfvelscale = (VCFCutoffControllerInvert ? 0x80 : 0x00) | /* bit 7 */
1871                                      (VCFVelocityScale & 0x7f); /* lower 7 bits */                                      (VCFVelocityScale & 0x7f); /* lower 7 bits */
1872          pData[134] = vcfvelscale;          pData[134] = vcfvelscale;
1873    
1874          // next byte unknown          // next byte unknown
1875    
1876          const uint8_t vcfresonance = (VCFResonanceDynamic) ? 0x00 : 0x80 | /* bit 7 */          const uint8_t vcfresonance = (VCFResonanceDynamic ? 0x00 : 0x80) | /* bit 7 */
1877                                       (VCFResonance & 0x7f); /* lower 7 bits */                                       (VCFResonance & 0x7f); /* lower 7 bits */
1878          pData[136] = vcfresonance;          pData[136] = vcfresonance;
1879    
1880          const uint8_t vcfbreakpoint = (VCFKeyboardTracking) ? 0x80 : 0x00 | /* bit 7 */          const uint8_t vcfbreakpoint = (VCFKeyboardTracking ? 0x80 : 0x00) | /* bit 7 */
1881                                        (VCFKeyboardTrackingBreakpoint & 0x7f); /* lower 7 bits */                                        (VCFKeyboardTrackingBreakpoint & 0x7f); /* lower 7 bits */
1882          pData[137] = vcfbreakpoint;          pData[137] = vcfbreakpoint;
1883    
# Line 1837  namespace { Line 1893  namespace {
1893          }          }
1894      }      }
1895    
1896        double* DimensionRegion::GetReleaseVelocityTable(curve_type_t releaseVelocityResponseCurve, uint8_t releaseVelocityResponseDepth) {
1897            curve_type_t curveType = releaseVelocityResponseCurve;
1898            uint8_t depth = releaseVelocityResponseDepth;
1899            // this models a strange behaviour or bug in GSt: two of the
1900            // velocity response curves for release time are not used even
1901            // if specified, instead another curve is chosen.
1902            if ((curveType == curve_type_nonlinear && depth == 0) ||
1903                (curveType == curve_type_special   && depth == 4)) {
1904                curveType = curve_type_nonlinear;
1905                depth = 3;
1906            }
1907            return GetVelocityTable(curveType, depth, 0);
1908        }
1909    
1910        double* DimensionRegion::GetCutoffVelocityTable(curve_type_t vcfVelocityCurve,
1911                                                        uint8_t vcfVelocityDynamicRange,
1912                                                        uint8_t vcfVelocityScale,
1913                                                        vcf_cutoff_ctrl_t vcfCutoffController)
1914        {
1915            curve_type_t curveType = vcfVelocityCurve;
1916            uint8_t depth = vcfVelocityDynamicRange;
1917            // even stranger GSt: two of the velocity response curves for
1918            // filter cutoff are not used, instead another special curve
1919            // is chosen. This curve is not used anywhere else.
1920            if ((curveType == curve_type_nonlinear && depth == 0) ||
1921                (curveType == curve_type_special   && depth == 4)) {
1922                curveType = curve_type_special;
1923                depth = 5;
1924            }
1925            return GetVelocityTable(curveType, depth,
1926                                    (vcfCutoffController <= vcf_cutoff_ctrl_none2)
1927                                        ? vcfVelocityScale : 0);
1928        }
1929    
1930      // get the corresponding velocity table from the table map or create & calculate that table if it doesn't exist yet      // get the corresponding velocity table from the table map or create & calculate that table if it doesn't exist yet
1931      double* DimensionRegion::GetVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling)      double* DimensionRegion::GetVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling)
1932      {      {
# Line 1852  namespace { Line 1942  namespace {
1942          return table;          return table;
1943      }      }
1944    
1945        Region* DimensionRegion::GetParent() const {
1946            return pRegion;
1947        }
1948    
1949      leverage_ctrl_t DimensionRegion::DecodeLeverageController(_lev_ctrl_t EncodedController) {      leverage_ctrl_t DimensionRegion::DecodeLeverageController(_lev_ctrl_t EncodedController) {
1950          leverage_ctrl_t decodedcontroller;          leverage_ctrl_t decodedcontroller;
1951          switch (EncodedController) {          switch (EncodedController) {
# Line 2105  namespace { Line 2199  namespace {
2199          return pVelocityCutoffTable[MIDIKeyVelocity];          return pVelocityCutoffTable[MIDIKeyVelocity];
2200      }      }
2201    
2202        /**
2203         * Updates the respective member variable and the lookup table / cache
2204         * that depends on this value.
2205         */
2206        void DimensionRegion::SetVelocityResponseCurve(curve_type_t curve) {
2207            pVelocityAttenuationTable =
2208                GetVelocityTable(
2209                    curve, VelocityResponseDepth, VelocityResponseCurveScaling
2210                );
2211            VelocityResponseCurve = curve;
2212        }
2213    
2214        /**
2215         * Updates the respective member variable and the lookup table / cache
2216         * that depends on this value.
2217         */
2218        void DimensionRegion::SetVelocityResponseDepth(uint8_t depth) {
2219            pVelocityAttenuationTable =
2220                GetVelocityTable(
2221                    VelocityResponseCurve, depth, VelocityResponseCurveScaling
2222                );
2223            VelocityResponseDepth = depth;
2224        }
2225    
2226        /**
2227         * Updates the respective member variable and the lookup table / cache
2228         * that depends on this value.
2229         */
2230        void DimensionRegion::SetVelocityResponseCurveScaling(uint8_t scaling) {
2231            pVelocityAttenuationTable =
2232                GetVelocityTable(
2233                    VelocityResponseCurve, VelocityResponseDepth, scaling
2234                );
2235            VelocityResponseCurveScaling = scaling;
2236        }
2237    
2238        /**
2239         * Updates the respective member variable and the lookup table / cache
2240         * that depends on this value.
2241         */
2242        void DimensionRegion::SetReleaseVelocityResponseCurve(curve_type_t curve) {
2243            pVelocityReleaseTable = GetReleaseVelocityTable(curve, ReleaseVelocityResponseDepth);
2244            ReleaseVelocityResponseCurve = curve;
2245        }
2246    
2247        /**
2248         * Updates the respective member variable and the lookup table / cache
2249         * that depends on this value.
2250         */
2251        void DimensionRegion::SetReleaseVelocityResponseDepth(uint8_t depth) {
2252            pVelocityReleaseTable = GetReleaseVelocityTable(ReleaseVelocityResponseCurve, depth);
2253            ReleaseVelocityResponseDepth = depth;
2254        }
2255    
2256        /**
2257         * Updates the respective member variable and the lookup table / cache
2258         * that depends on this value.
2259         */
2260        void DimensionRegion::SetVCFCutoffController(vcf_cutoff_ctrl_t controller) {
2261            pVelocityCutoffTable = GetCutoffVelocityTable(VCFVelocityCurve, VCFVelocityDynamicRange, VCFVelocityScale, controller);
2262            VCFCutoffController = controller;
2263        }
2264    
2265        /**
2266         * Updates the respective member variable and the lookup table / cache
2267         * that depends on this value.
2268         */
2269        void DimensionRegion::SetVCFVelocityCurve(curve_type_t curve) {
2270            pVelocityCutoffTable = GetCutoffVelocityTable(curve, VCFVelocityDynamicRange, VCFVelocityScale, VCFCutoffController);
2271            VCFVelocityCurve = curve;
2272        }
2273    
2274        /**
2275         * Updates the respective member variable and the lookup table / cache
2276         * that depends on this value.
2277         */
2278        void DimensionRegion::SetVCFVelocityDynamicRange(uint8_t range) {
2279            pVelocityCutoffTable = GetCutoffVelocityTable(VCFVelocityCurve, range, VCFVelocityScale, VCFCutoffController);
2280            VCFVelocityDynamicRange = range;
2281        }
2282    
2283        /**
2284         * Updates the respective member variable and the lookup table / cache
2285         * that depends on this value.
2286         */
2287        void DimensionRegion::SetVCFVelocityScale(uint8_t scaling) {
2288            pVelocityCutoffTable = GetCutoffVelocityTable(VCFVelocityCurve, VCFVelocityDynamicRange, scaling, VCFCutoffController);
2289            VCFVelocityScale = scaling;
2290        }
2291    
2292      double* DimensionRegion::CreateVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling) {      double* DimensionRegion::CreateVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling) {
2293    
2294          // line-segment approximations of the 15 velocity curves          // line-segment approximations of the 15 velocity curves
# Line 2188  namespace { Line 2372  namespace {
2372    
2373          // Actual Loading          // Actual Loading
2374    
2375            if (!file->GetAutoLoad()) return;
2376    
2377          LoadDimensionRegions(rgnList);          LoadDimensionRegions(rgnList);
2378    
2379          RIFF::Chunk* _3lnk = rgnList->GetSubChunk(CHUNK_ID_3LNK);          RIFF::Chunk* _3lnk = rgnList->GetSubChunk(CHUNK_ID_3LNK);
# Line 2231  namespace { Line 2417  namespace {
2417              else              else
2418                  _3lnk->SetPos(44);                  _3lnk->SetPos(44);
2419    
2420              // load sample references              // load sample references (if auto loading is enabled)
2421              for (uint i = 0; i < DimensionRegions; i++) {              if (file->GetAutoLoad()) {
2422                  uint32_t wavepoolindex = _3lnk->ReadUint32();                  for (uint i = 0; i < DimensionRegions; i++) {
2423                  if (file->pWavePoolTable) pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);                      uint32_t wavepoolindex = _3lnk->ReadUint32();
2424                        if (file->pWavePoolTable) pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
2425                    }
2426                    GetSample(); // load global region sample reference
2427              }              }
             GetSample(); // load global region sample reference  
2428          } else {          } else {
2429              DimensionRegions = 0;              DimensionRegions = 0;
2430              for (int i = 0 ; i < 8 ; i++) {              for (int i = 0 ; i < 8 ; i++) {
# Line 2251  namespace { Line 2439  namespace {
2439              RIFF::List* _3prg = rgnList->GetSubList(LIST_TYPE_3PRG);              RIFF::List* _3prg = rgnList->GetSubList(LIST_TYPE_3PRG);
2440              if (!_3prg) _3prg = rgnList->AddSubList(LIST_TYPE_3PRG);              if (!_3prg) _3prg = rgnList->AddSubList(LIST_TYPE_3PRG);
2441              RIFF::List* _3ewl = _3prg->AddSubList(LIST_TYPE_3EWL);              RIFF::List* _3ewl = _3prg->AddSubList(LIST_TYPE_3EWL);
2442              pDimensionRegions[0] = new DimensionRegion(_3ewl);              pDimensionRegions[0] = new DimensionRegion(this, _3ewl);
2443              DimensionRegions = 1;              DimensionRegions = 1;
2444          }          }
2445      }      }
# Line 2275  namespace { Line 2463  namespace {
2463          // first update base class's chunks          // first update base class's chunks
2464          DLS::Region::UpdateChunks();          DLS::Region::UpdateChunks();
2465    
         File* pFile = (File*) GetParent()->GetParent();  
         bool version3 = pFile->pVersion && pFile->pVersion->major == 3;  
   
2466          // update dimension region's chunks          // update dimension region's chunks
2467          for (int i = 0; i < DimensionRegions; i++) {          for (int i = 0; i < DimensionRegions; i++) {
2468              DimensionRegion* d = pDimensionRegions[i];              pDimensionRegions[i]->UpdateChunks();
   
             // make sure '3ewa' chunk exists (we need to this before  
             // calling DimensionRegion::UpdateChunks, as  
             // DimensionRegion doesn't know which file version it is)  
             RIFF::Chunk* _3ewa = d->pParentList->GetSubChunk(CHUNK_ID_3EWA);  
             if (!_3ewa) d->pParentList->AddSubChunk(CHUNK_ID_3EWA, version3 ? 148 : 140);  
   
             d->UpdateChunks();  
2469          }          }
2470    
2471            File* pFile = (File*) GetParent()->GetParent();
2472            bool version3 = pFile->pVersion && pFile->pVersion->major == 3;
2473          const int iMaxDimensions =  version3 ? 8 : 5;          const int iMaxDimensions =  version3 ? 8 : 5;
2474          const int iMaxDimensionRegions = version3 ? 256 : 32;          const int iMaxDimensionRegions = version3 ? 256 : 32;
2475    
# Line 2312  namespace { Line 2491  namespace {
2491          for (int i = 0; i < iMaxDimensions; i++) {          for (int i = 0; i < iMaxDimensions; i++) {
2492              pData[4 + i * 8] = (uint8_t) pDimensionDefinitions[i].dimension;              pData[4 + i * 8] = (uint8_t) pDimensionDefinitions[i].dimension;
2493              pData[5 + i * 8] = pDimensionDefinitions[i].bits;              pData[5 + i * 8] = pDimensionDefinitions[i].bits;
2494              pData[6 + i * 8] = shift;              pData[6 + i * 8] = pDimensionDefinitions[i].dimension == dimension_none ? 0 : shift;
2495              pData[7 + i * 8] = (1 << (shift + pDimensionDefinitions[i].bits)) - (1 << shift);              pData[7 + i * 8] = (1 << (shift + pDimensionDefinitions[i].bits)) - (1 << shift);
2496              pData[8 + i * 8] = pDimensionDefinitions[i].zones;              pData[8 + i * 8] = pDimensionDefinitions[i].zones;
2497              // next 3 bytes unknown, always zero?              // next 3 bytes unknown, always zero?
# Line 2334  namespace { Line 2513  namespace {
2513                          break;                          break;
2514                      }                      }
2515                  }                  }
                 if (iWaveIndex < 0) throw gig::Exception("Could not update gig::Region, could not find DimensionRegion's sample");  
2516              }              }
2517              store32(&pData[iWavePoolOffset + i * 4], iWaveIndex);              store32(&pData[iWavePoolOffset + i * 4], iWaveIndex);
2518          }          }
# Line 2347  namespace { Line 2525  namespace {
2525              RIFF::List* _3ewl = _3prg->GetFirstSubList();              RIFF::List* _3ewl = _3prg->GetFirstSubList();
2526              while (_3ewl) {              while (_3ewl) {
2527                  if (_3ewl->GetListType() == LIST_TYPE_3EWL) {                  if (_3ewl->GetListType() == LIST_TYPE_3EWL) {
2528                      pDimensionRegions[dimensionRegionNr] = new DimensionRegion(_3ewl);                      pDimensionRegions[dimensionRegionNr] = new DimensionRegion(this, _3ewl);
2529                      dimensionRegionNr++;                      dimensionRegionNr++;
2530                  }                  }
2531                  _3ewl = _3prg->GetNextSubList();                  _3ewl = _3prg->GetNextSubList();
# Line 2356  namespace { Line 2534  namespace {
2534          }          }
2535      }      }
2536    
2537        void Region::SetKeyRange(uint16_t Low, uint16_t High) {
2538            // update KeyRange struct and make sure regions are in correct order
2539            DLS::Region::SetKeyRange(Low, High);
2540            // update Region key table for fast lookup
2541            ((gig::Instrument*)GetParent())->UpdateRegionKeyTable();
2542        }
2543    
2544      void Region::UpdateVelocityTable() {      void Region::UpdateVelocityTable() {
2545          // get velocity dimension's index          // get velocity dimension's index
2546          int veldim = -1;          int veldim = -1;
# Line 2461  namespace { Line 2646  namespace {
2646              if (pDimensionDefinitions[i].dimension == pDimDef->dimension)              if (pDimensionDefinitions[i].dimension == pDimDef->dimension)
2647                  throw gig::Exception("Could not add new dimension, there is already a dimension of the same type");                  throw gig::Exception("Could not add new dimension, there is already a dimension of the same type");
2648    
2649            // pos is where the new dimension should be placed, normally
2650            // last in list, except for the samplechannel dimension which
2651            // has to be first in list
2652            int pos = pDimDef->dimension == dimension_samplechannel ? 0 : Dimensions;
2653            int bitpos = 0;
2654            for (int i = 0 ; i < pos ; i++)
2655                bitpos += pDimensionDefinitions[i].bits;
2656    
2657            // make room for the new dimension
2658            for (int i = Dimensions ; i > pos ; i--) pDimensionDefinitions[i] = pDimensionDefinitions[i - 1];
2659            for (int i = 0 ; i < (1 << iCurrentBits) ; i++) {
2660                for (int j = Dimensions ; j > pos ; j--) {
2661                    pDimensionRegions[i]->DimensionUpperLimits[j] =
2662                        pDimensionRegions[i]->DimensionUpperLimits[j - 1];
2663                }
2664            }
2665    
2666          // assign definition of new dimension          // assign definition of new dimension
2667          pDimensionDefinitions[Dimensions] = *pDimDef;          pDimensionDefinitions[pos] = *pDimDef;
2668    
2669          // auto correct certain dimension definition fields (where possible)          // auto correct certain dimension definition fields (where possible)
2670          pDimensionDefinitions[Dimensions].split_type  =          pDimensionDefinitions[pos].split_type  =
2671              __resolveSplitType(pDimensionDefinitions[Dimensions].dimension);              __resolveSplitType(pDimensionDefinitions[pos].dimension);
2672          pDimensionDefinitions[Dimensions].zone_size =          pDimensionDefinitions[pos].zone_size =
2673              __resolveZoneSize(pDimensionDefinitions[Dimensions]);              __resolveZoneSize(pDimensionDefinitions[pos]);
2674    
2675          // create new dimension region(s) for this new dimension          // create new dimension region(s) for this new dimension, and make
2676          for (int i = 1 << iCurrentBits; i < 1 << iNewBits; i++) {          // sure that the dimension regions are placed correctly in both the
2677              //TODO: maybe we should copy existing dimension regions if possible instead of simply creating new ones with default values          // RIFF list and the pDimensionRegions array
2678              RIFF::List* _3prg = pCkRegion->GetSubList(LIST_TYPE_3PRG);          RIFF::Chunk* moveTo = NULL;
2679              RIFF::List* pNewDimRgnListChunk = _3prg->AddSubList(LIST_TYPE_3EWL);          RIFF::List* _3prg = pCkRegion->GetSubList(LIST_TYPE_3PRG);
2680              pDimensionRegions[i] = new DimensionRegion(pNewDimRgnListChunk);          for (int i = (1 << iCurrentBits) - (1 << bitpos) ; i >= 0 ; i -= (1 << bitpos)) {
2681                for (int k = 0 ; k < (1 << bitpos) ; k++) {
2682              // copy the upper limits for the other dimensions                  pDimensionRegions[(i << pDimDef->bits) + k] = pDimensionRegions[i + k];
2683              memcpy(pDimensionRegions[i]->DimensionUpperLimits,              }
2684                     pDimensionRegions[i & ((1 << iCurrentBits) - 1)]->DimensionUpperLimits, 8);              for (int j = 1 ; j < (1 << pDimDef->bits) ; j++) {
2685                    for (int k = 0 ; k < (1 << bitpos) ; k++) {
2686                        RIFF::List* pNewDimRgnListChunk = _3prg->AddSubList(LIST_TYPE_3EWL);
2687                        if (moveTo) _3prg->MoveSubChunk(pNewDimRgnListChunk, moveTo);
2688                        // create a new dimension region and copy all parameter values from
2689                        // an existing dimension region
2690                        pDimensionRegions[(i << pDimDef->bits) + (j << bitpos) + k] =
2691                            new DimensionRegion(pNewDimRgnListChunk, *pDimensionRegions[i + k]);
2692    
2693              DimensionRegions++;                      DimensionRegions++;
2694                    }
2695                }
2696                moveTo = pDimensionRegions[i]->pParentList;
2697          }          }
2698    
2699          // initialize the upper limits for this dimension          // initialize the upper limits for this dimension
2700          for (int z = 0, j = 0 ; z < pDimDef->zones ; z++, j += 1 << iCurrentBits) {          int mask = (1 << bitpos) - 1;
2701            for (int z = 0 ; z < pDimDef->zones ; z++) {
2702              uint8_t upperLimit = uint8_t((z + 1) * 128.0 / pDimDef->zones - 1);              uint8_t upperLimit = uint8_t((z + 1) * 128.0 / pDimDef->zones - 1);
2703              for (int i = 0 ; i < 1 << iCurrentBits ; i++) {              for (int i = 0 ; i < 1 << iCurrentBits ; i++) {
2704                  pDimensionRegions[j + i]->DimensionUpperLimits[Dimensions] = upperLimit;                  pDimensionRegions[((i & ~mask) << pDimDef->bits) |
2705                                      (z << bitpos) |
2706                                      (i & mask)]->DimensionUpperLimits[pos] = upperLimit;
2707              }              }
2708          }          }
2709    
# Line 2708  namespace { Line 2923  namespace {
2923      }      }
2924    
2925    
2926    // *************** MidiRule ***************
2927    // *
2928    
2929    MidiRuleCtrlTrigger::MidiRuleCtrlTrigger(RIFF::Chunk* _3ewg) {
2930        _3ewg->SetPos(36);
2931        Triggers = _3ewg->ReadUint8();
2932        _3ewg->SetPos(40);
2933        ControllerNumber = _3ewg->ReadUint8();
2934        _3ewg->SetPos(46);
2935        for (int i = 0 ; i < Triggers ; i++) {
2936            pTriggers[i].TriggerPoint = _3ewg->ReadUint8();
2937            pTriggers[i].Descending = _3ewg->ReadUint8();
2938            pTriggers[i].VelSensitivity = _3ewg->ReadUint8();
2939            pTriggers[i].Key = _3ewg->ReadUint8();
2940            pTriggers[i].NoteOff = _3ewg->ReadUint8();
2941            pTriggers[i].Velocity = _3ewg->ReadUint8();
2942            pTriggers[i].OverridePedal = _3ewg->ReadUint8();
2943            _3ewg->ReadUint8();
2944        }
2945    }
2946    
2947    
2948  // *************** Instrument ***************  // *************** Instrument ***************
2949  // *  // *
2950    
2951      Instrument::Instrument(File* pFile, RIFF::List* insList, progress_t* pProgress) : DLS::Instrument((DLS::File*)pFile, insList) {      Instrument::Instrument(File* pFile, RIFF::List* insList, progress_t* pProgress) : DLS::Instrument((DLS::File*)pFile, insList) {
2952          static const DLS::Info::FixedStringLength fixedStringLengths[] = {          static const DLS::Info::string_length_t fixedStringLengths[] = {
2953              { CHUNK_ID_INAM, 64 },              { CHUNK_ID_INAM, 64 },
2954              { CHUNK_ID_ISFT, 12 },              { CHUNK_ID_ISFT, 12 },
2955              { 0, 0 }              { 0, 0 }
2956          };          };
2957          pInfo->FixedStringLengths = fixedStringLengths;          pInfo->SetFixedStringLengths(fixedStringLengths);
2958    
2959          // Initialization          // Initialization
2960          for (int i = 0; i < 128; i++) RegionKeyTable[i] = NULL;          for (int i = 0; i < 128; i++) RegionKeyTable[i] = NULL;
# Line 2743  namespace { Line 2979  namespace {
2979                  PianoReleaseMode       = dimkeystart & 0x01;                  PianoReleaseMode       = dimkeystart & 0x01;
2980                  DimensionKeyRange.low  = dimkeystart >> 1;                  DimensionKeyRange.low  = dimkeystart >> 1;
2981                  DimensionKeyRange.high = _3ewg->ReadUint8();                  DimensionKeyRange.high = _3ewg->ReadUint8();
2982    
2983                    if (_3ewg->GetSize() > 32) {
2984                        // read MIDI rules
2985                        _3ewg->SetPos(32);
2986                        uint8_t id1 = _3ewg->ReadUint8();
2987                        uint8_t id2 = _3ewg->ReadUint8();
2988    
2989                        if (id1 == 4 && id2 == 16) {
2990                            MidiRules.push_back(new MidiRuleCtrlTrigger(_3ewg));
2991                        }
2992                        //TODO: all the other types of rules
2993                    }
2994              }              }
2995          }          }
2996    
2997          if (!pRegions) pRegions = new RegionList;          if (pFile->GetAutoLoad()) {
2998          RIFF::List* lrgn = insList->GetSubList(LIST_TYPE_LRGN);              if (!pRegions) pRegions = new RegionList;
2999          if (lrgn) {              RIFF::List* lrgn = insList->GetSubList(LIST_TYPE_LRGN);
3000              RIFF::List* rgn = lrgn->GetFirstSubList();              if (lrgn) {
3001              while (rgn) {                  RIFF::List* rgn = lrgn->GetFirstSubList();
3002                  if (rgn->GetListType() == LIST_TYPE_RGN) {                  while (rgn) {
3003                      __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);                      if (rgn->GetListType() == LIST_TYPE_RGN) {
3004                      pRegions->push_back(new Region(this, rgn));                          __notify_progress(pProgress, (float) pRegions->size() / (float) Regions);
3005                            pRegions->push_back(new Region(this, rgn));
3006                        }
3007                        rgn = lrgn->GetNextSubList();
3008                  }                  }
3009                  rgn = lrgn->GetNextSubList();                  // Creating Region Key Table for fast lookup
3010                    UpdateRegionKeyTable();
3011              }              }
             // Creating Region Key Table for fast lookup  
             UpdateRegionKeyTable();  
3012          }          }
3013    
3014          __notify_progress(pProgress, 1.0f); // notify done          __notify_progress(pProgress, 1.0f); // notify done
3015      }      }
3016    
3017      void Instrument::UpdateRegionKeyTable() {      void Instrument::UpdateRegionKeyTable() {
3018            for (int i = 0; i < 128; i++) RegionKeyTable[i] = NULL;
3019          RegionList::iterator iter = pRegions->begin();          RegionList::iterator iter = pRegions->begin();
3020          RegionList::iterator end  = pRegions->end();          RegionList::iterator end  = pRegions->end();
3021          for (; iter != end; ++iter) {          for (; iter != end; ++iter) {
# Line 2818  namespace { Line 3069  namespace {
3069          store32(&pData[2], Attenuation);          store32(&pData[2], Attenuation);
3070          store16(&pData[6], FineTune);          store16(&pData[6], FineTune);
3071          store16(&pData[8], PitchbendRange);          store16(&pData[8], PitchbendRange);
3072          const uint8_t dimkeystart = (PianoReleaseMode) ? 0x01 : 0x00 |          const uint8_t dimkeystart = (PianoReleaseMode ? 0x01 : 0x00) |
3073                                      DimensionKeyRange.low << 1;                                      DimensionKeyRange.low << 1;
3074          pData[10] = dimkeystart;          pData[10] = dimkeystart;
3075          pData[11] = DimensionKeyRange.high;          pData[11] = DimensionKeyRange.high;
# Line 2832  namespace { Line 3083  namespace {
3083       *             there is no Region defined for the given \a Key       *             there is no Region defined for the given \a Key
3084       */       */
3085      Region* Instrument::GetRegion(unsigned int Key) {      Region* Instrument::GetRegion(unsigned int Key) {
3086          if (!pRegions || !pRegions->size() || Key > 127) return NULL;          if (!pRegions || pRegions->empty() || Key > 127) return NULL;
3087          return RegionKeyTable[Key];          return RegionKeyTable[Key];
3088    
3089          /*for (int i = 0; i < Regions; i++) {          /*for (int i = 0; i < Regions; i++) {
# Line 2890  namespace { Line 3141  namespace {
3141          UpdateRegionKeyTable();          UpdateRegionKeyTable();
3142      }      }
3143    
3144        /**
3145         * Returns the first MIDI rule of the instrument. You have to call
3146         * this method once before you use GetNextMidiRule().
3147         *
3148         * The list of MIDI rules, at least in gig v3, always contains at
3149         * most two rules. The second rule can only be the DEF filter
3150         * (which currently isn't supported by libgig).
3151         *
3152         * @returns  pointer address to first MIDI rule or NULL if there is none
3153         * @see      GetNextMidiRule()
3154         */
3155        MidiRule* Instrument::GetFirstMidiRule() {
3156            MidiRulesIterator = MidiRules.begin();
3157            return MidiRulesIterator != MidiRules.end() ? *MidiRulesIterator : NULL;
3158        }
3159    
3160        /**
3161         * Returns the next MIDI rule of the instrument. You have to call
3162         * GetFirstMidiRule() once before you can use this method. By
3163         * calling this method multiple times it iterates through the
3164         * available rules.
3165         *
3166         * @returns  pointer address to the next MIDI rule or NULL if end reached
3167         * @see      GetFirstMidiRule()
3168         */
3169        MidiRule* Instrument::GetNextMidiRule() {
3170            MidiRulesIterator++;
3171            return MidiRulesIterator != MidiRules.end() ? *MidiRulesIterator : NULL;
3172        }
3173    
3174    
3175  // *************** Group ***************  // *************** Group ***************
# Line 2929  namespace { Line 3209  namespace {
3209          }          }
3210          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);
3211          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);
3212    
3213            if (!pNameChunk && pFile->pVersion && pFile->pVersion->major == 3) {
3214                // v3 has a fixed list of 128 strings, find a free one
3215                for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {
3216                    if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {
3217                        pNameChunk = ck;
3218                        break;
3219                    }
3220                }
3221            }
3222    
3223          // now store the name of this group as <3gnm> chunk as subchunk of the <3gnl> list chunk          // now store the name of this group as <3gnm> chunk as subchunk of the <3gnl> list chunk
3224          ::SaveString(CHUNK_ID_3GNM, pNameChunk, _3gnl, Name, String("Unnamed Group"), true, 64);          ::SaveString(CHUNK_ID_3GNM, pNameChunk, _3gnl, Name, String("Unnamed Group"), true, 64);
3225      }      }
# Line 3004  namespace { Line 3295  namespace {
3295  // *************** File ***************  // *************** File ***************
3296  // *  // *
3297    
3298      // File version 2.0, 1998-06-28      /// Reflects Gigasampler file format version 2.0 (1998-06-28).
3299      const DLS::version_t File::VERSION_2 = {      const DLS::version_t File::VERSION_2 = {
3300          0, 2, 19980628 & 0xffff, 19980628 >> 16          0, 2, 19980628 & 0xffff, 19980628 >> 16
3301      };      };
3302    
3303      // File version 3.0, 2003-03-31      /// Reflects Gigasampler file format version 3.0 (2003-03-31).
3304      const DLS::version_t File::VERSION_3 = {      const DLS::version_t File::VERSION_3 = {
3305          0, 3, 20030331 & 0xffff, 20030331 >> 16          0, 3, 20030331 & 0xffff, 20030331 >> 16
3306      };      };
3307    
3308      const DLS::Info::FixedStringLength File::FixedStringLengths[] = {      static const DLS::Info::string_length_t _FileFixedStringLengths[] = {
3309          { CHUNK_ID_IARL, 256 },          { CHUNK_ID_IARL, 256 },
3310          { CHUNK_ID_IART, 128 },          { CHUNK_ID_IART, 128 },
3311          { CHUNK_ID_ICMS, 128 },          { CHUNK_ID_ICMS, 128 },
# Line 3036  namespace { Line 3327  namespace {
3327      };      };
3328    
3329      File::File() : DLS::File() {      File::File() : DLS::File() {
3330            bAutoLoad = true;
3331          *pVersion = VERSION_3;          *pVersion = VERSION_3;
3332          pGroups = NULL;          pGroups = NULL;
3333          pInfo->FixedStringLengths = FixedStringLengths;          pInfo->SetFixedStringLengths(_FileFixedStringLengths);
3334          pInfo->ArchivalLocation = String(256, ' ');          pInfo->ArchivalLocation = String(256, ' ');
3335    
3336          // add some mandatory chunks to get the file chunks in right          // add some mandatory chunks to get the file chunks in right
# Line 3051  namespace { Line 3343  namespace {
3343      }      }
3344    
3345      File::File(RIFF::File* pRIFF) : DLS::File(pRIFF) {      File::File(RIFF::File* pRIFF) : DLS::File(pRIFF) {
3346            bAutoLoad = true;
3347          pGroups = NULL;          pGroups = NULL;
3348          pInfo->FixedStringLengths = FixedStringLengths;          pInfo->SetFixedStringLengths(_FileFixedStringLengths);
3349      }      }
3350    
3351      File::~File() {      File::~File() {
# Line 3105  namespace { Line 3398  namespace {
3398    
3399      /** @brief Delete a sample.      /** @brief Delete a sample.
3400       *       *
3401       * This will delete the given Sample object from the gig file. You have       * This will delete the given Sample object from the gig file. Any
3402       * to call Save() to make this persistent to the file.       * references to this sample from Regions and DimensionRegions will be
3403         * removed. You have to call Save() to make this persistent to the file.
3404       *       *
3405       * @param pSample - sample to delete       * @param pSample - sample to delete
3406       * @throws gig::Exception if given sample could not be found       * @throws gig::Exception if given sample could not be found
# Line 3118  namespace { Line 3412  namespace {
3412          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation
3413          pSamples->erase(iter);          pSamples->erase(iter);
3414          delete pSample;          delete pSample;
3415    
3416            // remove all references to the sample
3417            for (Instrument* instrument = GetFirstInstrument() ; instrument ;
3418                 instrument = GetNextInstrument()) {
3419                for (Region* region = instrument->GetFirstRegion() ; region ;
3420                     region = instrument->GetNextRegion()) {
3421    
3422                    if (region->GetSample() == pSample) region->SetSample(NULL);
3423    
3424                    for (int i = 0 ; i < region->DimensionRegions ; i++) {
3425                        gig::DimensionRegion *d = region->pDimensionRegions[i];
3426                        if (d->pSample == pSample) d->pSample = NULL;
3427                    }
3428                }
3429            }
3430      }      }
3431    
3432      void File::LoadSamples() {      void File::LoadSamples() {
# Line 3208  namespace { Line 3517  namespace {
3517              progress_t subprogress;              progress_t subprogress;
3518              __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask              __divide_progress(pProgress, &subprogress, 3.0f, 0.0f); // randomly schedule 33% for this subtask
3519              __notify_progress(&subprogress, 0.0f);              __notify_progress(&subprogress, 0.0f);
3520              GetFirstSample(&subprogress); // now force all samples to be loaded              if (GetAutoLoad())
3521                    GetFirstSample(&subprogress); // now force all samples to be loaded
3522              __notify_progress(&subprogress, 1.0f);              __notify_progress(&subprogress, 1.0f);
3523    
3524              // instrument loading subtask              // instrument loading subtask
# Line 3422  namespace { Line 3732  namespace {
3732                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();
3733                  while (ck) {                  while (ck) {
3734                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {
3735                            if (pVersion && pVersion->major == 3 &&
3736                                strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;
3737    
3738                          pGroups->push_back(new Group(this, ck));                          pGroups->push_back(new Group(this, ck));
3739                      }                      }
3740                      ck = lst3gnl->GetNextSubChunk();                      ck = lst3gnl->GetNextSubChunk();
# Line 3471  namespace { Line 3784  namespace {
3784              for (; iter != end; ++iter) {              for (; iter != end; ++iter) {
3785                  (*iter)->UpdateChunks();                  (*iter)->UpdateChunks();
3786              }              }
3787    
3788                // v3: make sure the file has 128 3gnm chunks
3789                if (pVersion && pVersion->major == 3) {
3790                    RIFF::List* _3gnl = pRIFF->GetSubList(LIST_TYPE_3GRI)->GetSubList(LIST_TYPE_3GNL);
3791                    RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();
3792                    for (int i = 0 ; i < 128 ; i++) {
3793                        if (i >= pGroups->size()) ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);
3794                        if (_3gnm) _3gnm = _3gnl->GetNextSubChunk();
3795                    }
3796                }
3797          }          }
3798    
3799          // update einf chunk          // update einf chunk
# Line 3602  namespace { Line 3925  namespace {
3925          }          }
3926      }      }
3927    
3928        /**
3929         * Enable / disable automatic loading. By default this properyt is
3930         * enabled and all informations are loaded automatically. However
3931         * loading all Regions, DimensionRegions and especially samples might
3932         * take a long time for large .gig files, and sometimes one might only
3933         * be interested in retrieving very superficial informations like the
3934         * amount of instruments and their names. In this case one might disable
3935         * automatic loading to avoid very slow response times.
3936         *
3937         * @e CAUTION: by disabling this property many pointers (i.e. sample
3938         * references) and informations will have invalid or even undefined
3939         * data! This feature is currently only intended for retrieving very
3940         * superficial informations in a very fast way. Don't use it to retrieve
3941         * details like synthesis informations or even to modify .gig files!
3942         */
3943        void File::SetAutoLoad(bool b) {
3944            bAutoLoad = b;
3945        }
3946    
3947        /**
3948         * Returns whether automatic loading is enabled.
3949         * @see SetAutoLoad()
3950         */
3951        bool File::GetAutoLoad() {
3952            return bAutoLoad;
3953        }
3954    
3955    
3956    
3957  // *************** Exception ***************  // *************** Exception ***************

Legend:
Removed from v.1264  
changed lines
  Added in v.1627

  ViewVC Help
Powered by ViewVC