/[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 1182 by persson, Sun May 13 05:48:51 2007 UTC revision 1192 by persson, Thu May 17 10:12:08 2007 UTC
# Line 2227  namespace { Line 2227  namespace {
2227              const int _3lnkChunkSize = (pFile->pVersion && pFile->pVersion->major == 3) ? 1092 : 172;              const int _3lnkChunkSize = (pFile->pVersion && pFile->pVersion->major == 3) ? 1092 : 172;
2228              _3lnk = pCkRegion->AddSubChunk(CHUNK_ID_3LNK, _3lnkChunkSize);              _3lnk = pCkRegion->AddSubChunk(CHUNK_ID_3LNK, _3lnkChunkSize);
2229              memset(_3lnk->LoadChunkData(), 0, _3lnkChunkSize);              memset(_3lnk->LoadChunkData(), 0, _3lnkChunkSize);
2230    
2231                // move 3prg to last position
2232                pCkRegion->MoveSubChunk(pCkRegion->GetSubList(LIST_TYPE_3PRG), 0);
2233          }          }
2234    
2235          // update dimension definitions in '3lnk' chunk          // update dimension definitions in '3lnk' chunk
# Line 2809  namespace { Line 2812  namespace {
2812      void Group::UpdateChunks() {      void Group::UpdateChunks() {
2813          // make sure <3gri> and <3gnl> list chunks exist          // make sure <3gri> and <3gnl> list chunks exist
2814          RIFF::List* _3gri = pFile->pRIFF->GetSubList(LIST_TYPE_3GRI);          RIFF::List* _3gri = pFile->pRIFF->GetSubList(LIST_TYPE_3GRI);
2815          if (!_3gri) _3gri = pFile->pRIFF->AddSubList(LIST_TYPE_3GRI);          if (!_3gri) {
2816                _3gri = pFile->pRIFF->AddSubList(LIST_TYPE_3GRI);
2817                pFile->pRIFF->MoveSubChunk(_3gri, pFile->pRIFF->GetSubChunk(CHUNK_ID_PTBL));
2818            }
2819          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);          RIFF::List* _3gnl = _3gri->GetSubList(LIST_TYPE_3GNL);
2820          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);          if (!_3gnl) _3gnl = _3gri->AddSubList(LIST_TYPE_3GNL);
2821          // 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
# Line 2912  namespace { Line 2918  namespace {
2918          pGroups = NULL;          pGroups = NULL;
2919          pInfo->FixedStringLengths = FixedStringLengths;          pInfo->FixedStringLengths = FixedStringLengths;
2920          pInfo->ArchivalLocation = String(256, ' ');          pInfo->ArchivalLocation = String(256, ' ');
2921    
2922            // add some mandatory chunks to get the file chunks in right
2923            // order (INFO chunk will be moved to first position later)
2924            pRIFF->AddSubChunk(CHUNK_ID_VERS, 8);
2925            pRIFF->AddSubChunk(CHUNK_ID_COLH, 4);
2926      }      }
2927    
2928      File::File(RIFF::File* pRIFF) : DLS::File(pRIFF) {      File::File(RIFF::File* pRIFF) : DLS::File(pRIFF) {
# Line 2958  namespace { Line 2969  namespace {
2969         // create new Sample object and its respective 'wave' list chunk         // create new Sample object and its respective 'wave' list chunk
2970         RIFF::List* wave = wvpl->AddSubList(LIST_TYPE_WAVE);         RIFF::List* wave = wvpl->AddSubList(LIST_TYPE_WAVE);
2971         Sample* pSample = new Sample(this, wave, 0 /*arbitrary value, we update offsets when we save*/);         Sample* pSample = new Sample(this, wave, 0 /*arbitrary value, we update offsets when we save*/);
2972    
2973           // add mandatory chunks to get the chunks in right order
2974           wave->AddSubChunk(CHUNK_ID_FMT, 16);
2975           wave->AddSubList(LIST_TYPE_INFO);
2976    
2977         pSamples->push_back(pSample);         pSamples->push_back(pSample);
2978         return pSample;         return pSample;
2979      }      }
# Line 3100  namespace { Line 3116  namespace {
3116         __ensureMandatoryChunksExist();         __ensureMandatoryChunksExist();
3117         RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);         RIFF::List* lstInstruments = pRIFF->GetSubList(LIST_TYPE_LINS);
3118         RIFF::List* lstInstr = lstInstruments->AddSubList(LIST_TYPE_INS);         RIFF::List* lstInstr = lstInstruments->AddSubList(LIST_TYPE_INS);
3119    
3120           // add mandatory chunks to get the chunks in right order
3121           lstInstr->AddSubList(LIST_TYPE_INFO);
3122    
3123         Instrument* pInstrument = new Instrument(this, lstInstr);         Instrument* pInstrument = new Instrument(this, lstInstr);
3124    
3125           lstInstr->AddSubChunk(CHUNK_ID_INSH, 12);
3126    
3127         // this string is needed for the gig to be loadable in GSt:         // this string is needed for the gig to be loadable in GSt:
3128         pInstrument->pInfo->Software = "Endless Wave";         pInstrument->pInfo->Software = "Endless Wave";
3129    
# Line 3272  namespace { Line 3294  namespace {
3294       * @throws Exception - on errors       * @throws Exception - on errors
3295       */       */
3296      void File::UpdateChunks() {      void File::UpdateChunks() {
3297            RIFF::Chunk* info = pRIFF->GetSubList(LIST_TYPE_INFO);
3298    
3299          // first update base class's chunks          // first update base class's chunks
3300          DLS::File::UpdateChunks();          DLS::File::UpdateChunks();
3301    
3302            if (!info) {
3303                // INFO was added by Resource::UpdateChunks - make sure it
3304                // is placed first in file
3305                info = pRIFF->GetSubList(LIST_TYPE_INFO);
3306                RIFF::Chunk* first = pRIFF->GetFirstSubChunk();
3307                if (first != info) {
3308                    pRIFF->MoveSubChunk(info, first);
3309                }
3310            }
3311    
3312          // update group's chunks          // update group's chunks
3313          if (pGroups) {          if (pGroups) {
3314              std::list<Group*>::iterator iter = pGroups->begin();              std::list<Group*>::iterator iter = pGroups->begin();

Legend:
Removed from v.1182  
changed lines
  Added in v.1192

  ViewVC Help
Powered by ViewVC