[matroska] r956 - in trunk/libmatroska: matroska src

Author: robux4
Date: 2004-11-28 20:43:08 +0300 (Sun, 28 Nov 2004)
New Revision: 956

Modified:
   trunk/libmatroska/matroska/KaxBlock.h
   trunk/libmatroska/src/KaxBlock.cpp
Log:
remove support for the gap flag in the Block

Modified: trunk/libmatroska/matroska/KaxBlock.h
===================================================================
--- trunk/libmatroska/matroska/KaxBlock.h	2004-11-28 15:24:37 UTC (rev 955)
+++ trunk/libmatroska/matroska/KaxBlock.h	2004-11-28 17:43:08 UTC (rev 956)
@@ -190,7 +190,7 @@
 
 class MATROSKA_DLL_API KaxBlock : public EbmlBinary {
 	public:
-		KaxBlock() :bLocalTimecodeUsed(false), bGap(false), mLacing(LACING_AUTO), ParentCluster(NULL) {}
+		KaxBlock() :bLocalTimecodeUsed(false), mLacing(LACING_AUTO), ParentCluster(NULL) {}
 		KaxBlock(const KaxBlock & ElementToClone);
 		~KaxBlock();
 		static EbmlElement & Create() {return *(new KaxBlock);}
@@ -257,7 +257,6 @@
 		int16      LocalTimecode;
 		bool       bLocalTimecodeUsed;
 		uint16     TrackNumber;
-		bool       bGap;
 		LacingType mLacing;
 		uint64     FirstFrameLocation;
 

Modified: trunk/libmatroska/src/KaxBlock.cpp
===================================================================
--- trunk/libmatroska/src/KaxBlock.cpp	2004-11-28 15:24:37 UTC (rev 955)
+++ trunk/libmatroska/src/KaxBlock.cpp	2004-11-28 17:43:08 UTC (rev 956)
@@ -142,7 +142,6 @@
  ,LocalTimecode(ElementToClone.LocalTimecode)
  ,bLocalTimecodeUsed(ElementToClone.bLocalTimecodeUsed)
  ,TrackNumber(ElementToClone.TrackNumber)
- ,bGap(ElementToClone.bGap)
  ,ParentCluster(ElementToClone.ParentCluster) ///< \todo not exactly
 {
 	// add a clone of the list
@@ -231,9 +230,6 @@
 		return LACING_EBML;
 }
 
-/*!
-	\todo handle gap flag
-*/
 uint64 KaxBlock::UpdateSize(bool bSaveDefault, bool bForceRender)
 {
 	LacingType LacingHere;
@@ -298,9 +294,6 @@
 	Data = DataBlock;
 }
 
-/*!
-	\todo handle the gap flag
-*/
 uint64 KaxBlockVirtual::UpdateSize(bool bSaveDefault, bool bForceRender)
 {
 	assert(TrackNumber < 0x4000);
@@ -319,7 +312,7 @@
 	b16.Fill(cursor);
 	cursor += 2;
 
-	*cursor++ = (0 << 0); // no gap
+	*cursor++ = 0; // flags
 
 	return Size;
 }
@@ -363,7 +356,7 @@
 		b16.Fill(cursor);
 		cursor += 2;
 
-		*cursor = (0 << 0); // no gap
+		*cursor = 0; // flags
 
 		if (mLacing == LACING_AUTO) {
 			mLacing = GetBestLacingType();
@@ -490,7 +483,6 @@
 	bLocalTimecodeUsed = false;
 	cursor += 2;
 
-	bGap = (*cursor && 0x01);
 	return Result;
 }
 
@@ -530,7 +522,6 @@
 		bLocalTimecodeUsed = true;
 		cursor += 2;
 
-		bGap = (*cursor && 0x01);
 		mLacing = LacingType((*cursor++ & 0x06) >> 1);
 
 		// put all Frames in the list
@@ -633,7 +624,6 @@
 		bLocalTimecodeUsed = true;
 		cursor += 2;
 
-		bGap = (*cursor && 0x01);
 		mLacing = LacingType((*cursor++ & 0x06) >> 1);
 		if (cursor == &_TempHead[4])
 		{