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

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

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

revision 1093 by schoenebeck, Sun Mar 11 17:44:31 2007 UTC revision 1105 by schoenebeck, Sun Mar 18 19:32:42 2007 UTC
# Line 29  Line 29 
29    
30  namespace RIFF {  namespace RIFF {
31    
32    // *************** Internal functions **************
33    // *
34    
35        /// Returns a human readable path of the given chunk.
36        String __resolveChunkPath(Chunk* pCk) {
37            String sPath;
38            for (Chunk* pChunk = pCk; pChunk; pChunk = pChunk->GetParent()) {
39                if (pChunk->GetChunkID() == CHUNK_ID_LIST) {
40                    List* pList = (List*) pChunk;
41                    sPath = "->'" + pList->GetListTypeString() + "'" + sPath;
42                } else {
43                    sPath = "->'" + pChunk->GetChunkIDString() + "'" + sPath;
44                }
45            }
46            return sPath;
47        }
48    
49    
50    
51  // *************** Chunk **************  // *************** Chunk **************
52  // *  // *
53    
# Line 70  namespace RIFF { Line 89  namespace RIFF {
89      }      }
90    
91      Chunk::~Chunk() {      Chunk::~Chunk() {
92            if (CurrentChunkSize != NewChunkSize) pFile->UnlogResized(this);
93          if (pChunkData) delete[] pChunkData;          if (pChunkData) delete[] pChunkData;
94      }      }
95    
# Line 774  namespace RIFF { Line 794  namespace RIFF {
794       * @see File::Save()       * @see File::Save()
795       */       */
796      void Chunk::Resize(int iNewSize) {      void Chunk::Resize(int iNewSize) {
797          if (iNewSize <= 0) throw Exception("Chunk size must be at least one byte");          if (iNewSize <= 0)
798                throw Exception("There is at least one empty chunk (zero size): " + __resolveChunkPath(this));
799          if (NewChunkSize == iNewSize) return;          if (NewChunkSize == iNewSize) return;
800          NewChunkSize = iNewSize;          NewChunkSize = iNewSize;
801          pFile->LogAsResized(this);          pFile->LogAsResized(this);
# Line 1134  namespace RIFF { Line 1155  namespace RIFF {
1155          return pNewChunk;          return pNewChunk;
1156      }      }
1157    
1158        /** @brief Moves a sub chunk.
1159         *
1160         * Moves a sub chunk from one position in a list to another
1161         * position in the same list. The pSrc chunk is placed before the
1162         * pDst chunk.
1163         *
1164         * @param pSrc - sub chunk to be moved
1165         * @param pDst - the position to move to. pSrc will be placed
1166         *               before pDst. If pDst is 0, pSrc will be placed
1167         *               last in list.
1168         */
1169        void List::MoveSubChunk(Chunk* pSrc, Chunk* pDst) {
1170            if (!pSubChunks) LoadSubChunks();
1171            pSubChunks->remove(pSrc);
1172            ChunkList::iterator iter = find(pSubChunks->begin(), pSubChunks->end(), pDst);
1173            pSubChunks->insert(iter, pSrc);
1174        }
1175    
1176      /** @brief Creates a new list sub chunk.      /** @brief Creates a new list sub chunk.
1177       *       *
1178       * Creates and adds a new list sub chunk to this list chunk. Note that       * Creates and adds a new list sub chunk to this list chunk. Note that
# Line 1515  namespace RIFF { Line 1554  namespace RIFF {
1554          // first we sum up all positive chunk size changes (and skip all negative ones)          // first we sum up all positive chunk size changes (and skip all negative ones)
1555          unsigned long ulPositiveSizeDiff = 0;          unsigned long ulPositiveSizeDiff = 0;
1556          for (ChunkList::iterator iter = ResizedChunks.begin(), end = ResizedChunks.end(); iter != end; ++iter) {          for (ChunkList::iterator iter = ResizedChunks.begin(), end = ResizedChunks.end(); iter != end; ++iter) {
1557              if ((*iter)->GetNewSize() == 0) throw Exception("There is at least one empty chunk (zero size)");              if ((*iter)->GetNewSize() == 0) {
1558                    throw Exception("There is at least one empty chunk (zero size): " + __resolveChunkPath(*iter));
1559                }
1560              if ((*iter)->GetNewSize() + 1L > (*iter)->GetSize()) {              if ((*iter)->GetNewSize() + 1L > (*iter)->GetSize()) {
1561                  unsigned long ulDiff = (*iter)->GetNewSize() - (*iter)->GetSize() + 1L; // +1 in case we have to add a pad byte                  unsigned long ulDiff = (*iter)->GetNewSize() - (*iter)->GetSize() + 1L; // +1 in case we have to add a pad byte
1562                  ulPositiveSizeDiff += ulDiff;                  ulPositiveSizeDiff += ulDiff;
# Line 1676  namespace RIFF { Line 1717  namespace RIFF {
1717          ResizedChunks.push_back(pResizedChunk);          ResizedChunks.push_back(pResizedChunk);
1718      }      }
1719    
1720        void File::UnlogResized(Chunk* pResizedChunk) {
1721            ResizedChunks.remove(pResizedChunk);
1722        }
1723    
1724      unsigned long File::GetFileSize() {      unsigned long File::GetFileSize() {
1725          return __GetFileSize(hFileRead);          return __GetFileSize(hFileRead);
1726      }      }
Legend:
Removed from v.1093  
changed lines
  Added in v.1105
  ViewVC Help
Powered by ViewVC