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

Author: robux4
Date: 2005-10-14 23:36:51 +0400 (Fri, 14 Oct 2005)
New Revision: 1228

Modified:
   trunk/libmatroska/matroska/KaxBlock.h
   trunk/libmatroska/src/KaxBlock.cpp
   trunk/libmatroska/src/KaxCluster.cpp
   trunk/libmatroska/src/KaxCuesData.cpp
Log:
libmatroska: allow correct compilation & linking with MATROSKA_VERSION set to 1

Modified: trunk/libmatroska/matroska/KaxBlock.h
===================================================================
--- trunk/libmatroska/matroska/KaxBlock.h	2005-10-13 21:21:59 UTC (rev 1227)
+++ trunk/libmatroska/matroska/KaxBlock.h	2005-10-14 19:36:51 UTC (rev 1228)
@@ -317,7 +317,9 @@
 	}
 
 	operator KaxBlockGroup &();
+#if MATROSKA_VERSION >= 2
 	operator KaxSimpleBlock &();
+#endif
 	operator KaxInternalBlock &();
 	operator const KaxInternalBlock &() const;
 

Modified: trunk/libmatroska/src/KaxBlock.cpp
===================================================================
--- trunk/libmatroska/src/KaxBlock.cpp	2005-10-13 21:21:59 UTC (rev 1227)
+++ trunk/libmatroska/src/KaxBlock.cpp	2005-10-14 19:36:51 UTC (rev 1228)
@@ -958,22 +958,26 @@
 KaxBlockBlob::operator KaxInternalBlock &()
 {
 	assert(Block.group);
+#if MATROSKA_VERSION >= 2
 	if (bUseSimpleBlock)
 		return *Block.simpleblock;
 	else
+#endif
 		return *Block.group;
 }
 
 KaxBlockBlob::operator const KaxInternalBlock &() const
 {
 	assert(Block.group);
+#if MATROSKA_VERSION >= 2
 	if (bUseSimpleBlock)
 		return *Block.simpleblock;
 	else
+#endif
 		return *Block.group;
 }
 
-#if defined(MATROSKA_VERSION) && (MATROSKA_VERSION == 2)
+#if MATROSKA_VERSION >= 2
 KaxBlockBlob::operator KaxSimpleBlock &()
 {
 	assert(bUseSimpleBlock);
@@ -985,6 +989,7 @@
 bool KaxBlockBlob::AddFrameAuto(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, LacingType lacing, const KaxBlockBlob * PastBlock, const KaxBlockBlob * ForwBlock)
 {
 	bool bResult = false;
+#if MATROSKA_VERSION >= 2
 	if ((SimpleBlockMode == BLOCK_BLOB_ALWAYS_SIMPLE) || (SimpleBlockMode == BLOCK_BLOB_SIMPLE_AUTO && PastBlock == NULL && ForwBlock == NULL)) {
 		assert(bUseSimpleBlock == true);
 		if (Block.simpleblock == NULL) {
@@ -995,7 +1000,10 @@
 		bResult = Block.simpleblock->AddFrame(track, timecode, buffer, lacing);
 		Block.simpleblock->SetKeyframe(PastBlock == NULL);
 		Block.simpleblock->SetDiscardable(ForwBlock != NULL);
-	} else {
+	}
+	else
+#endif
+	{
 		if (ReplaceSimpleByGroup()) {
 			bResult = Block.group->AddFrame(track, timecode, buffer, PastBlock, ForwBlock, lacing);
 		}
@@ -1024,7 +1032,10 @@
 		if (Block.group == NULL) {
 			Block.group = new KaxBlockGroup();
 		}
-	} else {
+	}
+#if MATROSKA_VERSION >= 2
+	else 
+	{
 
 		if (Block.simpleblock != NULL) {
 			KaxSimpleBlock *old_simpleblock = Block.simpleblock;
@@ -1037,6 +1048,7 @@
 			Block.group = new KaxBlockGroup();
 		}
 	}
+#endif
 	if (ParentCluster != NULL)
 		Block.group->SetParent(*ParentCluster);
 

Modified: trunk/libmatroska/src/KaxCluster.cpp
===================================================================
--- trunk/libmatroska/src/KaxCluster.cpp	2005-10-13 21:21:59 UTC (rev 1227)
+++ trunk/libmatroska/src/KaxCluster.cpp	2005-10-14 19:36:51 UTC (rev 1228)
@@ -224,9 +224,11 @@
 		// new school, using KaxBlockBlob
 		for (Index = 0; Index<Blobs.size(); Index++)
 		{
+#if MATROSKA_VERSION >= 2
 			if (Blobs[Index]->IsSimpleBlock())
 				ElementList.push_back( &(KaxSimpleBlock&) *Blobs[Index] );
 			else
+#endif
 				ElementList.push_back( &(KaxBlockGroup&) *Blobs[Index] );
 		}
 

Modified: trunk/libmatroska/src/KaxCuesData.cpp
===================================================================
--- trunk/libmatroska/src/KaxCuesData.cpp	2005-10-13 21:21:59 UTC (rev 1227)
+++ trunk/libmatroska/src/KaxCuesData.cpp	2005-10-14 19:36:51 UTC (rev 1228)
@@ -189,6 +189,7 @@
 	bValueIsSet = true;
 }
 
+#if MATROSKA_VERSION >= 2
 /*!
 	\todo handle codec state checking
 */
@@ -212,6 +213,7 @@
 	}
 #endif /* OLD */
 }
+#endif
 
 bool KaxCuePoint::operator<(const EbmlElement & EltB) const
 {