/[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 1247 by persson, Fri Jun 22 09:59:57 2007 UTC revision 1301 by persson, Sat Aug 25 09:59:53 2007 UTC
# Line 1152  namespace { Line 1152  namespace {
1152       *       *
1153       * Note: there is currently no support for writing compressed samples.       * Note: there is currently no support for writing compressed samples.
1154       *       *
1155         * For 16 bit samples, the data in the source buffer should be
1156         * int16_t (using native endianness). For 24 bit, the buffer
1157         * should contain three bytes per sample, little-endian.
1158         *
1159       * @param pBuffer     - source buffer       * @param pBuffer     - source buffer
1160       * @param SampleCount - number of sample points to write       * @param SampleCount - number of sample points to write
1161       * @throws DLS::Exception if current sample size is too small       * @throws DLS::Exception if current sample size is too small
# Line 1166  namespace { Line 1170  namespace {
1170          if (pCkData->GetPos() == 0) {          if (pCkData->GetPos() == 0) {
1171              crc.reset();              crc.reset();
1172          }          }
1173          unsigned long res = DLS::Sample::Write(pBuffer, SampleCount);          if (GetSize() < SampleCount) throw Exception("Could not write sample data, current sample size to small");
1174            unsigned long res;
1175            if (BitDepth == 24) {
1176                res = pCkData->Write(pBuffer, SampleCount * FrameSize, 1) / FrameSize;
1177            } else { // 16 bit
1178                res = Channels == 2 ? pCkData->Write(pBuffer, SampleCount << 1, 2) >> 1
1179                                    : pCkData->Write(pBuffer, SampleCount, 2);
1180            }
1181          crc.update((unsigned char *)pBuffer, SampleCount * FrameSize);          crc.update((unsigned char *)pBuffer, SampleCount * FrameSize);
1182    
1183          // if this is the last write, update the checksum chunk in the          // if this is the last write, update the checksum chunk in the
# Line 1531  namespace { Line 1542  namespace {
1542          VelocityTable = 0;          VelocityTable = 0;
1543      }      }
1544    
1545        /*
1546         * Constructs a DimensionRegion by copying all parameters from
1547         * another DimensionRegion
1548         */
1549        DimensionRegion::DimensionRegion(RIFF::List* _3ewl, const DimensionRegion& src) : DLS::Sampler(_3ewl) {
1550            Instances++;
1551            *this = src; // default memberwise shallow copy of all parameters
1552            pParentList = _3ewl; // restore the chunk pointer
1553    
1554            // deep copy of owned structures
1555            if (src.VelocityTable) {
1556                VelocityTable = new uint8_t[128];
1557                for (int k = 0 ; k < 128 ; k++)
1558                    VelocityTable[k] = src.VelocityTable[k];
1559            }
1560            if (src.pSampleLoops) {
1561                pSampleLoops = new DLS::sample_loop_t[src.SampleLoops];
1562                for (int k = 0 ; k < src.SampleLoops ; k++)
1563                    pSampleLoops[k] = src.pSampleLoops[k];
1564            }
1565        }
1566    
1567      /**      /**
1568       * Apply dimension region settings to the respective RIFF chunks. You       * Apply dimension region settings to the respective RIFF chunks. You
1569       * have to call File::Save() to make changes persistent.       * have to call File::Save() to make changes persistent.
# Line 1539  namespace { Line 1572  namespace {
1572       * It will be called automatically when File::Save() was called.       * It will be called automatically when File::Save() was called.
1573       */       */
1574      void DimensionRegion::UpdateChunks() {      void DimensionRegion::UpdateChunks() {
1575            // check if wsmp is going to be created by
1576            // DLS::Sampler::UpdateChunks
1577            bool wsmp_created = !pParentList->GetSubChunk(CHUNK_ID_WSMP);
1578    
1579          // first update base class's chunk          // first update base class's chunk
1580          DLS::Sampler::UpdateChunks();          DLS::Sampler::UpdateChunks();
1581    
# Line 1552  namespace { Line 1589  namespace {
1589          // make sure '3ewa' chunk exists          // make sure '3ewa' chunk exists
1590          RIFF::Chunk* _3ewa = pParentList->GetSubChunk(CHUNK_ID_3EWA);          RIFF::Chunk* _3ewa = pParentList->GetSubChunk(CHUNK_ID_3EWA);
1591          if (!_3ewa)  _3ewa = pParentList->AddSubChunk(CHUNK_ID_3EWA, 140);          if (!_3ewa)  _3ewa = pParentList->AddSubChunk(CHUNK_ID_3EWA, 140);
1592            else if (wsmp_created) {
1593                // make sure the chunk order is: wsmp, 3ewa
1594                pParentList->MoveSubChunk(_3ewa, 0);
1595            }
1596          pData = (uint8_t*) _3ewa->LoadChunkData();          pData = (uint8_t*) _3ewa->LoadChunkData();
1597    
1598          // update '3ewa' chunk with DimensionRegion's current settings          // update '3ewa' chunk with DimensionRegion's current settings
# Line 1598  namespace { Line 1639  namespace {
1639          pData[44] = eg1ctl;          pData[44] = eg1ctl;
1640    
1641          const uint8_t eg1ctrloptions =          const uint8_t eg1ctrloptions =
1642              (EG1ControllerInvert) ? 0x01 : 0x00 |              (EG1ControllerInvert ? 0x01 : 0x00) |
1643              GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(EG1ControllerAttackInfluence) |              GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(EG1ControllerAttackInfluence) |
1644              GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(EG1ControllerDecayInfluence) |              GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(EG1ControllerDecayInfluence) |
1645              GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(EG1ControllerReleaseInfluence);              GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(EG1ControllerReleaseInfluence);
# Line 1608  namespace { Line 1649  namespace {
1649          pData[46] = eg2ctl;          pData[46] = eg2ctl;
1650    
1651          const uint8_t eg2ctrloptions =          const uint8_t eg2ctrloptions =
1652              (EG2ControllerInvert) ? 0x01 : 0x00 |              (EG2ControllerInvert ? 0x01 : 0x00) |
1653              GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(EG2ControllerAttackInfluence) |              GIG_EG_CTR_ATTACK_INFLUENCE_ENCODE(EG2ControllerAttackInfluence) |
1654              GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(EG2ControllerDecayInfluence) |              GIG_EG_CTR_DECAY_INFLUENCE_ENCODE(EG2ControllerDecayInfluence) |
1655              GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(EG2ControllerReleaseInfluence);              GIG_EG_CTR_RELEASE_INFLUENCE_ENCODE(EG2ControllerReleaseInfluence);
# Line 1786  namespace { Line 1827  namespace {
1827          const uint8_t eg1hold = (EG1Hold) ? 0x80 : 0x00; // bit 7          const uint8_t eg1hold = (EG1Hold) ? 0x80 : 0x00; // bit 7
1828          pData[131] = eg1hold;          pData[131] = eg1hold;
1829    
1830          const uint8_t vcfcutoff = (VCFEnabled) ? 0x80 : 0x00 |  /* bit 7 */          const uint8_t vcfcutoff = (VCFEnabled ? 0x80 : 0x00) |  /* bit 7 */
1831                                    (VCFCutoff & 0x7f);   /* lower 7 bits */                                    (VCFCutoff & 0x7f);   /* lower 7 bits */
1832          pData[132] = vcfcutoff;          pData[132] = vcfcutoff;
1833    
1834          pData[133] = VCFCutoffController;          pData[133] = VCFCutoffController;
1835    
1836          const uint8_t vcfvelscale = (VCFCutoffControllerInvert) ? 0x80 : 0x00 | /* bit 7 */          const uint8_t vcfvelscale = (VCFCutoffControllerInvert ? 0x80 : 0x00) | /* bit 7 */
1837                                      (VCFVelocityScale & 0x7f); /* lower 7 bits */                                      (VCFVelocityScale & 0x7f); /* lower 7 bits */
1838          pData[134] = vcfvelscale;          pData[134] = vcfvelscale;
1839    
1840          // next byte unknown          // next byte unknown
1841    
1842          const uint8_t vcfresonance = (VCFResonanceDynamic) ? 0x00 : 0x80 | /* bit 7 */          const uint8_t vcfresonance = (VCFResonanceDynamic ? 0x00 : 0x80) | /* bit 7 */
1843                                       (VCFResonance & 0x7f); /* lower 7 bits */                                       (VCFResonance & 0x7f); /* lower 7 bits */
1844          pData[136] = vcfresonance;          pData[136] = vcfresonance;
1845    
1846          const uint8_t vcfbreakpoint = (VCFKeyboardTracking) ? 0x80 : 0x00 | /* bit 7 */          const uint8_t vcfbreakpoint = (VCFKeyboardTracking ? 0x80 : 0x00) | /* bit 7 */
1847                                        (VCFKeyboardTrackingBreakpoint & 0x7f); /* lower 7 bits */                                        (VCFKeyboardTrackingBreakpoint & 0x7f); /* lower 7 bits */
1848          pData[137] = vcfbreakpoint;          pData[137] = vcfbreakpoint;
1849    
# Line 2293  namespace { Line 2334  namespace {
2334          for (int i = 0; i < iMaxDimensions; i++) {          for (int i = 0; i < iMaxDimensions; i++) {
2335              pData[4 + i * 8] = (uint8_t) pDimensionDefinitions[i].dimension;              pData[4 + i * 8] = (uint8_t) pDimensionDefinitions[i].dimension;
2336              pData[5 + i * 8] = pDimensionDefinitions[i].bits;              pData[5 + i * 8] = pDimensionDefinitions[i].bits;
2337              pData[6 + i * 8] = shift;              pData[6 + i * 8] = pDimensionDefinitions[i].dimension == dimension_none ? 0 : shift;
2338              pData[7 + i * 8] = (1 << (shift + pDimensionDefinitions[i].bits)) - (1 << shift);              pData[7 + i * 8] = (1 << (shift + pDimensionDefinitions[i].bits)) - (1 << shift);
2339              pData[8 + i * 8] = pDimensionDefinitions[i].zones;              pData[8 + i * 8] = pDimensionDefinitions[i].zones;
2340              // next 3 bytes unknown, always zero?              // next 3 bytes unknown, always zero?
# Line 2315  namespace { Line 2356  namespace {
2356                          break;                          break;
2357                      }                      }
2358                  }                  }
                 if (iWaveIndex < 0) throw gig::Exception("Could not update gig::Region, could not find DimensionRegion's sample");  
2359              }              }
2360              store32(&pData[iWavePoolOffset + i * 4], iWaveIndex);              store32(&pData[iWavePoolOffset + i * 4], iWaveIndex);
2361          }          }
# Line 2442  namespace { Line 2482  namespace {
2482              if (pDimensionDefinitions[i].dimension == pDimDef->dimension)              if (pDimensionDefinitions[i].dimension == pDimDef->dimension)
2483                  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");
2484    
2485            // pos is where the new dimension should be placed, normally
2486            // last in list, except for the samplechannel dimension which
2487            // has to be first in list
2488            int pos = pDimDef->dimension == dimension_samplechannel ? 0 : Dimensions;
2489            int bitpos = 0;
2490            for (int i = 0 ; i < pos ; i++)
2491                bitpos += pDimensionDefinitions[i].bits;
2492    
2493            // make room for the new dimension
2494            for (int i = Dimensions ; i > pos ; i--) pDimensionDefinitions[i] = pDimensionDefinitions[i - 1];
2495            for (int i = 0 ; i < (1 << iCurrentBits) ; i++) {
2496                for (int j = Dimensions ; j > pos ; j--) {
2497                    pDimensionRegions[i]->DimensionUpperLimits[j] =
2498                        pDimensionRegions[i]->DimensionUpperLimits[j - 1];
2499                }
2500            }
2501    
2502          // assign definition of new dimension          // assign definition of new dimension
2503          pDimensionDefinitions[Dimensions] = *pDimDef;          pDimensionDefinitions[pos] = *pDimDef;
2504    
2505          // auto correct certain dimension definition fields (where possible)          // auto correct certain dimension definition fields (where possible)
2506          pDimensionDefinitions[Dimensions].split_type  =          pDimensionDefinitions[pos].split_type  =
2507              __resolveSplitType(pDimensionDefinitions[Dimensions].dimension);              __resolveSplitType(pDimensionDefinitions[pos].dimension);
2508          pDimensionDefinitions[Dimensions].zone_size =          pDimensionDefinitions[pos].zone_size =
2509              __resolveZoneSize(pDimensionDefinitions[Dimensions]);              __resolveZoneSize(pDimensionDefinitions[pos]);
2510    
2511          // create new dimension region(s) for this new dimension          // create new dimension region(s) for this new dimension, and make
2512          for (int i = 1 << iCurrentBits; i < 1 << iNewBits; i++) {          // sure that the dimension regions are placed correctly in both the
2513              //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
2514              RIFF::List* _3prg = pCkRegion->GetSubList(LIST_TYPE_3PRG);          RIFF::Chunk* moveTo = NULL;
2515              RIFF::List* pNewDimRgnListChunk = _3prg->AddSubList(LIST_TYPE_3EWL);          RIFF::List* _3prg = pCkRegion->GetSubList(LIST_TYPE_3PRG);
2516              pDimensionRegions[i] = new DimensionRegion(pNewDimRgnListChunk);          for (int i = (1 << iCurrentBits) - (1 << bitpos) ; i >= 0 ; i -= (1 << bitpos)) {
2517                for (int k = 0 ; k < (1 << bitpos) ; k++) {
2518              // copy the upper limits for the other dimensions                  pDimensionRegions[(i << pDimDef->bits) + k] = pDimensionRegions[i + k];
2519              memcpy(pDimensionRegions[i]->DimensionUpperLimits,              }
2520                     pDimensionRegions[i & ((1 << iCurrentBits) - 1)]->DimensionUpperLimits, 8);              for (int j = 1 ; j < (1 << pDimDef->bits) ; j++) {
2521                    for (int k = 0 ; k < (1 << bitpos) ; k++) {
2522                        RIFF::List* pNewDimRgnListChunk = _3prg->AddSubList(LIST_TYPE_3EWL);
2523                        if (moveTo) _3prg->MoveSubChunk(pNewDimRgnListChunk, moveTo);
2524                        // create a new dimension region and copy all parameter values from
2525                        // an existing dimension region
2526                        pDimensionRegions[(i << pDimDef->bits) + (j << bitpos) + k] =
2527                            new DimensionRegion(pNewDimRgnListChunk, *pDimensionRegions[i + k]);
2528    
2529              DimensionRegions++;                      DimensionRegions++;
2530                    }
2531                }
2532                moveTo = pDimensionRegions[i]->pParentList;
2533          }          }
2534    
2535          // initialize the upper limits for this dimension          // initialize the upper limits for this dimension
2536          for (int z = 0, j = 0 ; z < pDimDef->zones ; z++, j += 1 << iCurrentBits) {          int mask = (1 << bitpos) - 1;
2537              uint8_t upperLimit = (z + 1) * 128.0 / pDimDef->zones - 1;          for (int z = 0 ; z < pDimDef->zones ; z++) {
2538                uint8_t upperLimit = uint8_t((z + 1) * 128.0 / pDimDef->zones - 1);
2539              for (int i = 0 ; i < 1 << iCurrentBits ; i++) {              for (int i = 0 ; i < 1 << iCurrentBits ; i++) {
2540                  pDimensionRegions[j + i]->DimensionUpperLimits[Dimensions] = upperLimit;                  pDimensionRegions[((i & ~mask) << pDimDef->bits) |
2541                                      (z << bitpos) |
2542                                      (i & mask)]->DimensionUpperLimits[pos] = upperLimit;
2543              }              }
2544          }          }
2545    
# Line 2785  namespace { Line 2855  namespace {
2855          if (!lart)  lart = pCkInstrument->AddSubList(LIST_TYPE_LART);          if (!lart)  lart = pCkInstrument->AddSubList(LIST_TYPE_LART);
2856          // make sure '3ewg' RIFF chunk exists          // make sure '3ewg' RIFF chunk exists
2857          RIFF::Chunk* _3ewg = lart->GetSubChunk(CHUNK_ID_3EWG);          RIFF::Chunk* _3ewg = lart->GetSubChunk(CHUNK_ID_3EWG);
2858          if (!_3ewg)  _3ewg = lart->AddSubChunk(CHUNK_ID_3EWG, 12);          if (!_3ewg)  {
2859                File* pFile = (File*) GetParent();
2860    
2861                // 3ewg is bigger in gig3, as it includes the iMIDI rules
2862                int size = (pFile->pVersion && pFile->pVersion->major == 3) ? 16416 : 12;
2863                _3ewg = lart->AddSubChunk(CHUNK_ID_3EWG, size);
2864                memset(_3ewg->LoadChunkData(), 0, size);
2865            }
2866          // update '3ewg' RIFF chunk          // update '3ewg' RIFF chunk
2867          uint8_t* pData = (uint8_t*) _3ewg->LoadChunkData();          uint8_t* pData = (uint8_t*) _3ewg->LoadChunkData();
2868          store16(&pData[0], EffectSend);          store16(&pData[0], EffectSend);
2869          store32(&pData[2], Attenuation);          store32(&pData[2], Attenuation);
2870          store16(&pData[6], FineTune);          store16(&pData[6], FineTune);
2871          store16(&pData[8], PitchbendRange);          store16(&pData[8], PitchbendRange);
2872          const uint8_t dimkeystart = (PianoReleaseMode) ? 0x01 : 0x00 |          const uint8_t dimkeystart = (PianoReleaseMode ? 0x01 : 0x00) |
2873                                      DimensionKeyRange.low << 1;                                      DimensionKeyRange.low << 1;
2874          pData[10] = dimkeystart;          pData[10] = dimkeystart;
2875          pData[11] = DimensionKeyRange.high;          pData[11] = DimensionKeyRange.high;
# Line 2903  namespace { Line 2980  namespace {
2980          }          }
2981          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);
2982          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);
2983    
2984            if (!pNameChunk && pFile->pVersion && pFile->pVersion->major == 3) {
2985                // v3 has a fixed list of 128 strings, find a free one
2986                for (RIFF::Chunk* ck = _3gnl->GetFirstSubChunk() ; ck ; ck = _3gnl->GetNextSubChunk()) {
2987                    if (strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) {
2988                        pNameChunk = ck;
2989                        break;
2990                    }
2991                }
2992            }
2993    
2994          // 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
2995          ::SaveString(CHUNK_ID_3GNM, pNameChunk, _3gnl, Name, String("Unnamed Group"), true, 64);          ::SaveString(CHUNK_ID_3GNM, pNameChunk, _3gnl, Name, String("Unnamed Group"), true, 64);
2996      }      }
# Line 3010  namespace { Line 3098  namespace {
3098      };      };
3099    
3100      File::File() : DLS::File() {      File::File() : DLS::File() {
3101            *pVersion = VERSION_3;
3102          pGroups = NULL;          pGroups = NULL;
3103          pInfo->FixedStringLengths = FixedStringLengths;          pInfo->FixedStringLengths = FixedStringLengths;
3104          pInfo->ArchivalLocation = String(256, ' ');          pInfo->ArchivalLocation = String(256, ' ');
# Line 3078  namespace { Line 3167  namespace {
3167    
3168      /** @brief Delete a sample.      /** @brief Delete a sample.
3169       *       *
3170       * 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
3171       * to call Save() to make this persistent to the file.       * references to this sample from Regions and DimensionRegions will be
3172         * removed. You have to call Save() to make this persistent to the file.
3173       *       *
3174       * @param pSample - sample to delete       * @param pSample - sample to delete
3175       * @throws gig::Exception if given sample could not be found       * @throws gig::Exception if given sample could not be found
# Line 3091  namespace { Line 3181  namespace {
3181          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation          if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation
3182          pSamples->erase(iter);          pSamples->erase(iter);
3183          delete pSample;          delete pSample;
3184    
3185            // remove all references to the sample
3186            for (Instrument* instrument = GetFirstInstrument() ; instrument ;
3187                 instrument = GetNextInstrument()) {
3188                for (Region* region = instrument->GetFirstRegion() ; region ;
3189                     region = instrument->GetNextRegion()) {
3190    
3191                    if (region->GetSample() == pSample) region->SetSample(NULL);
3192    
3193                    for (int i = 0 ; i < region->DimensionRegions ; i++) {
3194                        gig::DimensionRegion *d = region->pDimensionRegions[i];
3195                        if (d->pSample == pSample) d->pSample = NULL;
3196                    }
3197                }
3198            }
3199      }      }
3200    
3201      void File::LoadSamples() {      void File::LoadSamples() {
# Line 3395  namespace { Line 3500  namespace {
3500                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();                  RIFF::Chunk* ck = lst3gnl->GetFirstSubChunk();
3501                  while (ck) {                  while (ck) {
3502                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {                      if (ck->GetChunkID() == CHUNK_ID_3GNM) {
3503                            if (pVersion && pVersion->major == 3 &&
3504                                strcmp(static_cast<char*>(ck->LoadChunkData()), "") == 0) break;
3505    
3506                          pGroups->push_back(new Group(this, ck));                          pGroups->push_back(new Group(this, ck));
3507                      }                      }
3508                      ck = lst3gnl->GetNextSubChunk();                      ck = lst3gnl->GetNextSubChunk();
# Line 3444  namespace { Line 3552  namespace {
3552              for (; iter != end; ++iter) {              for (; iter != end; ++iter) {
3553                  (*iter)->UpdateChunks();                  (*iter)->UpdateChunks();
3554              }              }
3555    
3556                // v3: make sure the file has 128 3gnm chunks
3557                if (pVersion && pVersion->major == 3) {
3558                    RIFF::List* _3gnl = pRIFF->GetSubList(LIST_TYPE_3GRI)->GetSubList(LIST_TYPE_3GNL);
3559                    RIFF::Chunk* _3gnm = _3gnl->GetFirstSubChunk();
3560                    for (int i = 0 ; i < 128 ; i++) {
3561                        if (i >= pGroups->size()) ::SaveString(CHUNK_ID_3GNM, _3gnm, _3gnl, "", "", true, 64);
3562                        if (_3gnm) _3gnm = _3gnl->GetNextSubChunk();
3563                    }
3564                }
3565          }          }
3566    
3567          // update einf chunk          // update einf chunk
# Line 3487  namespace { Line 3605  namespace {
3605              int totnbusedchannels = 0;              int totnbusedchannels = 0;
3606              int totnbregions = 0;              int totnbregions = 0;
3607              int totnbdimregions = 0;              int totnbdimregions = 0;
3608                int totnbloops = 0;
3609              int instrumentIdx = 0;              int instrumentIdx = 0;
3610    
3611              memset(&pData[48], 0, sublen - 48);              memset(&pData[48], 0, sublen - 48);
# Line 3496  namespace { Line 3615  namespace {
3615                  int nbusedsamples = 0;                  int nbusedsamples = 0;
3616                  int nbusedchannels = 0;                  int nbusedchannels = 0;
3617                  int nbdimregions = 0;                  int nbdimregions = 0;
3618                    int nbloops = 0;
3619    
3620                  memset(&pData[(instrumentIdx + 1) * sublen + 48], 0, sublen - 48);                  memset(&pData[(instrumentIdx + 1) * sublen + 48], 0, sublen - 48);
3621    
# Line 3519  namespace { Line 3639  namespace {
3639                                  }                                  }
3640                              }                              }
3641                          }                          }
3642                            if (d->SampleLoops) nbloops++;
3643                      }                      }
3644                      nbdimregions += region->DimensionRegions;                      nbdimregions += region->DimensionRegions;
3645                  }                  }
# Line 3529  namespace { Line 3650  namespace {
3650                  store32(&pData[(instrumentIdx + 1) * sublen + 12], 1);                  store32(&pData[(instrumentIdx + 1) * sublen + 12], 1);
3651                  store32(&pData[(instrumentIdx + 1) * sublen + 16], instrument->Regions);                  store32(&pData[(instrumentIdx + 1) * sublen + 16], instrument->Regions);
3652                  store32(&pData[(instrumentIdx + 1) * sublen + 20], nbdimregions);                  store32(&pData[(instrumentIdx + 1) * sublen + 20], nbdimregions);
3653                  // next 12 bytes unknown                  store32(&pData[(instrumentIdx + 1) * sublen + 24], nbloops);
3654                    // next 8 bytes unknown
3655                  store32(&pData[(instrumentIdx + 1) * sublen + 36], instrumentIdx);                  store32(&pData[(instrumentIdx + 1) * sublen + 36], instrumentIdx);
3656                  store32(&pData[(instrumentIdx + 1) * sublen + 40], pSamples->size());                  store32(&pData[(instrumentIdx + 1) * sublen + 40], pSamples->size());
3657                  // next 4 bytes unknown                  // next 4 bytes unknown
3658    
3659                  totnbregions += instrument->Regions;                  totnbregions += instrument->Regions;
3660                  totnbdimregions += nbdimregions;                  totnbdimregions += nbdimregions;
3661                    totnbloops += nbloops;
3662                  instrumentIdx++;                  instrumentIdx++;
3663              }              }
3664              // first 4 bytes unknown - sometimes 0, sometimes length of einf part              // first 4 bytes unknown - sometimes 0, sometimes length of einf part
# Line 3545  namespace { Line 3668  namespace {
3668              store32(&pData[12], Instruments);              store32(&pData[12], Instruments);
3669              store32(&pData[16], totnbregions);              store32(&pData[16], totnbregions);
3670              store32(&pData[20], totnbdimregions);              store32(&pData[20], totnbdimregions);
3671              // next 12 bytes unknown              store32(&pData[24], totnbloops);
3672              // next 4 bytes unknown, always 0?              // next 8 bytes unknown
3673                // next 4 bytes unknown, not always 0
3674              store32(&pData[40], pSamples->size());              store32(&pData[40], pSamples->size());
3675              // next 4 bytes unknown              // next 4 bytes unknown
3676          }          }
# Line 3563  namespace { Line 3687  namespace {
3687          } else if (newFile) {          } else if (newFile) {
3688              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);              _3crc = pRIFF->AddSubChunk(CHUNK_ID_3CRC, pSamples->size() * 8);
3689              _3crc->LoadChunkData();              _3crc->LoadChunkData();
3690    
3691                // the order of einf and 3crc is not the same in v2 and v3
3692                if (einf && pVersion && pVersion->major == 3) pRIFF->MoveSubChunk(_3crc, einf);
3693          }          }
3694      }      }
3695    

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

  ViewVC Help
Powered by ViewVC