/[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 1301 by persson, Sat Aug 25 09:59:53 2007 UTC revision 1416 by schoenebeck, Sun Oct 14 12:06:32 2007 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          // this models a strange behaviour or bug in GSt: two of the                                  );
1564          // velocity response curves for release time are not used even  
1565          // if specified, instead another curve is chosen.          pVelocityCutoffTable = GetCutoffVelocityTable(VCFVelocityCurve,
1566          if ((curveType == curve_type_nonlinear && depth == 0) ||                                                        VCFVelocityDynamicRange,
1567              (curveType == curve_type_special   && depth == 4)) {                                                        VCFVelocityScale,
1568              curveType = curve_type_nonlinear;                                                        VCFCutoffController);
             depth = 3;  
         }  
         pVelocityReleaseTable = GetVelocityTable(curveType, depth, 0);  
   
         curveType = VCFVelocityCurve;  
         depth = VCFVelocityDynamicRange;  
   
         // even stranger GSt: two of the velocity response curves for  
         // filter cutoff are not used, instead another special curve  
         // is chosen. This curve is not used anywhere else.  
         if ((curveType == curve_type_nonlinear && depth == 0) ||  
             (curveType == curve_type_special   && depth == 4)) {  
             curveType = curve_type_special;  
             depth = 5;  
         }  
         pVelocityCutoffTable = GetVelocityTable(curveType, depth,  
                                                 VCFCutoffController <= vcf_cutoff_ctrl_none2 ? VCFVelocityScale : 0);  
1569    
1570          SampleAttenuation = pow(10.0, -Gain / (20.0 * 655360));          SampleAttenuation = pow(10.0, -Gain / (20.0 * 655360));
1571          VelocityTable = 0;          VelocityTable = 0;
# Line 1565  namespace { Line 1594  namespace {
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));
1603        }
1604    
1605        /**
1606       * Apply dimension region settings to the respective RIFF chunks. You       * Apply dimension region settings to the respective RIFF chunks. You
1607       * have to call File::Save() to make changes persistent.       * have to call File::Save() to make changes persistent.
1608       *       *
# Line 1572  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 1588  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 1859  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 1874  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 2127  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 2273  namespace { Line 2435  namespace {
2435              RIFF::List* _3prg = rgnList->GetSubList(LIST_TYPE_3PRG);              RIFF::List* _3prg = rgnList->GetSubList(LIST_TYPE_3PRG);
2436              if (!_3prg) _3prg = rgnList->AddSubList(LIST_TYPE_3PRG);              if (!_3prg) _3prg = rgnList->AddSubList(LIST_TYPE_3PRG);
2437              RIFF::List* _3ewl = _3prg->AddSubList(LIST_TYPE_3EWL);              RIFF::List* _3ewl = _3prg->AddSubList(LIST_TYPE_3EWL);
2438              pDimensionRegions[0] = new DimensionRegion(_3ewl);              pDimensionRegions[0] = new DimensionRegion(this, _3ewl);
2439              DimensionRegions = 1;              DimensionRegions = 1;
2440          }          }
2441      }      }
# Line 2297  namespace { Line 2459  namespace {
2459          // first update base class's chunks          // first update base class's chunks
2460          DLS::Region::UpdateChunks();          DLS::Region::UpdateChunks();
2461    
         File* pFile = (File*) GetParent()->GetParent();  
         bool version3 = pFile->pVersion && pFile->pVersion->major == 3;  
   
2462          // update dimension region's chunks          // update dimension region's chunks
2463          for (int i = 0; i < DimensionRegions; i++) {          for (int i = 0; i < DimensionRegions; i++) {
2464              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();  
2465          }          }
2466    
2467            File* pFile = (File*) GetParent()->GetParent();
2468            bool version3 = pFile->pVersion && pFile->pVersion->major == 3;
2469          const int iMaxDimensions =  version3 ? 8 : 5;          const int iMaxDimensions =  version3 ? 8 : 5;
2470          const int iMaxDimensionRegions = version3 ? 256 : 32;          const int iMaxDimensionRegions = version3 ? 256 : 32;
2471    
# Line 2368  namespace { Line 2521  namespace {
2521              RIFF::List* _3ewl = _3prg->GetFirstSubList();              RIFF::List* _3ewl = _3prg->GetFirstSubList();
2522              while (_3ewl) {              while (_3ewl) {
2523                  if (_3ewl->GetListType() == LIST_TYPE_3EWL) {                  if (_3ewl->GetListType() == LIST_TYPE_3EWL) {
2524                      pDimensionRegions[dimensionRegionNr] = new DimensionRegion(_3ewl);                      pDimensionRegions[dimensionRegionNr] = new DimensionRegion(this, _3ewl);
2525                      dimensionRegionNr++;                      dimensionRegionNr++;
2526                  }                  }
2527                  _3ewl = _3prg->GetNextSubList();                  _3ewl = _3prg->GetNextSubList();
# Line 2377  namespace { Line 2530  namespace {
2530          }          }
2531      }      }
2532    
2533        void Region::SetKeyRange(uint16_t Low, uint16_t High) {
2534            // update KeyRange struct and make sure regions are in correct order
2535            DLS::Region::SetKeyRange(Low, High);
2536            // update Region key table for fast lookup
2537            ((gig::Instrument*)GetParent())->UpdateRegionKeyTable();
2538        }
2539    
2540      void Region::UpdateVelocityTable() {      void Region::UpdateVelocityTable() {
2541          // get velocity dimension's index          // get velocity dimension's index
2542          int veldim = -1;          int veldim = -1;
# Line 2764  namespace { Line 2924  namespace {
2924  // *  // *
2925    
2926      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) {
2927          static const DLS::Info::FixedStringLength fixedStringLengths[] = {          static const DLS::Info::string_length_t fixedStringLengths[] = {
2928              { CHUNK_ID_INAM, 64 },              { CHUNK_ID_INAM, 64 },
2929              { CHUNK_ID_ISFT, 12 },              { CHUNK_ID_ISFT, 12 },
2930              { 0, 0 }              { 0, 0 }
2931          };          };
2932          pInfo->FixedStringLengths = fixedStringLengths;          pInfo->SetFixedStringLengths(fixedStringLengths);
2933    
2934          // Initialization          // Initialization
2935          for (int i = 0; i < 128; i++) RegionKeyTable[i] = NULL;          for (int i = 0; i < 128; i++) RegionKeyTable[i] = NULL;
# Line 2816  namespace { Line 2976  namespace {
2976      }      }
2977    
2978      void Instrument::UpdateRegionKeyTable() {      void Instrument::UpdateRegionKeyTable() {
2979            for (int i = 0; i < 128; i++) RegionKeyTable[i] = NULL;
2980          RegionList::iterator iter = pRegions->begin();          RegionList::iterator iter = pRegions->begin();
2981          RegionList::iterator end  = pRegions->end();          RegionList::iterator end  = pRegions->end();
2982          for (; iter != end; ++iter) {          for (; iter != end; ++iter) {
# Line 2883  namespace { Line 3044  namespace {
3044       *             there is no Region defined for the given \a Key       *             there is no Region defined for the given \a Key
3045       */       */
3046      Region* Instrument::GetRegion(unsigned int Key) {      Region* Instrument::GetRegion(unsigned int Key) {
3047          if (!pRegions || !pRegions->size() || Key > 127) return NULL;          if (!pRegions || pRegions->empty() || Key > 127) return NULL;
3048          return RegionKeyTable[Key];          return RegionKeyTable[Key];
3049    
3050          /*for (int i = 0; i < Regions; i++) {          /*for (int i = 0; i < Regions; i++) {
# Line 3066  namespace { Line 3227  namespace {
3227  // *************** File ***************  // *************** File ***************
3228  // *  // *
3229    
3230      // File version 2.0, 1998-06-28      /// Reflects Gigasampler file format version 2.0 (1998-06-28).
3231      const DLS::version_t File::VERSION_2 = {      const DLS::version_t File::VERSION_2 = {
3232          0, 2, 19980628 & 0xffff, 19980628 >> 16          0, 2, 19980628 & 0xffff, 19980628 >> 16
3233      };      };
3234    
3235      // File version 3.0, 2003-03-31      /// Reflects Gigasampler file format version 3.0 (2003-03-31).
3236      const DLS::version_t File::VERSION_3 = {      const DLS::version_t File::VERSION_3 = {
3237          0, 3, 20030331 & 0xffff, 20030331 >> 16          0, 3, 20030331 & 0xffff, 20030331 >> 16
3238      };      };
3239    
3240      const DLS::Info::FixedStringLength File::FixedStringLengths[] = {      static const DLS::Info::string_length_t _FileFixedStringLengths[] = {
3241          { CHUNK_ID_IARL, 256 },          { CHUNK_ID_IARL, 256 },
3242          { CHUNK_ID_IART, 128 },          { CHUNK_ID_IART, 128 },
3243          { CHUNK_ID_ICMS, 128 },          { CHUNK_ID_ICMS, 128 },
# Line 3100  namespace { Line 3261  namespace {
3261      File::File() : DLS::File() {      File::File() : DLS::File() {
3262          *pVersion = VERSION_3;          *pVersion = VERSION_3;
3263          pGroups = NULL;          pGroups = NULL;
3264          pInfo->FixedStringLengths = FixedStringLengths;          pInfo->SetFixedStringLengths(_FileFixedStringLengths);
3265          pInfo->ArchivalLocation = String(256, ' ');          pInfo->ArchivalLocation = String(256, ' ');
3266    
3267          // add some mandatory chunks to get the file chunks in right          // add some mandatory chunks to get the file chunks in right
# Line 3114  namespace { Line 3275  namespace {
3275    
3276      File::File(RIFF::File* pRIFF) : DLS::File(pRIFF) {      File::File(RIFF::File* pRIFF) : DLS::File(pRIFF) {
3277          pGroups = NULL;          pGroups = NULL;
3278          pInfo->FixedStringLengths = FixedStringLengths;          pInfo->SetFixedStringLengths(_FileFixedStringLengths);
3279      }      }
3280    
3281      File::~File() {      File::~File() {

Legend:
Removed from v.1301  
changed lines
  Added in v.1416

  ViewVC Help
Powered by ViewVC