[matroska] r1214 - trunk/libmatroska/src

Author: robux4
Date: 2005-10-08 19:27:30 +0400 (Sat, 08 Oct 2005)
New Revision: 1214

Modified:
   trunk/libmatroska/src/KaxBlock.cpp
   trunk/libmatroska/src/KaxCluster.cpp
Log:
libmatroska: make KaxSimpleBlock really MATROSKA_VERSION 2

Modified: trunk/libmatroska/src/KaxBlock.cpp
===================================================================
--- trunk/libmatroska/src/KaxBlock.cpp	2005-10-08 15:04:42 UTC (rev 1213)
+++ trunk/libmatroska/src/KaxBlock.cpp	2005-10-08 15:27:30 UTC (rev 1214)
@@ -87,9 +87,9 @@
 
 const EbmlSemanticContext KaxBlockGroup_Context = EbmlSemanticContext(countof(KaxBlockGroup_ContextList), KaxBlockGroup_ContextList, &KaxCluster_Context, *GetKaxGlobal_Context, &KaxBlockGroup::ClassInfos);
 const EbmlSemanticContext KaxBlock_Context = EbmlSemanticContext(0, NULL, &KaxBlockGroup_Context, *GetKaxGlobal_Context, &KaxBlock::ClassInfos);
-const EbmlSemanticContext KaxSimpleBlock_Context = EbmlSemanticContext(0, NULL, &KaxCluster_Context, *GetKaxGlobal_Context, &KaxSimpleBlock::ClassInfos);
 const EbmlSemanticContext KaxBlockDuration_Context = EbmlSemanticContext(0, NULL, &KaxBlockGroup_Context, *GetKaxGlobal_Context, &KaxBlockDuration::ClassInfos);
 #if MATROSKA_VERSION >= 2
+const EbmlSemanticContext KaxSimpleBlock_Context = EbmlSemanticContext(0, NULL, &KaxCluster_Context, *GetKaxGlobal_Context, &KaxSimpleBlock::ClassInfos);
 const EbmlSemanticContext KaxBlockVirtual_Context = EbmlSemanticContext(0, NULL, &KaxBlockGroup_Context, *GetKaxGlobal_Context, &KaxBlockVirtual::ClassInfos);
 #endif // MATROSKA_VERSION
 const EbmlSemanticContext KaxBlockAdditions_Context = EbmlSemanticContext(countof(KaxBlockAdditions_ContextList), KaxBlockAdditions_ContextList, &KaxBlockGroup_Context, *GetKaxGlobal_Context, &KaxBlockAdditions::ClassInfos);
@@ -99,9 +99,9 @@
 
 const EbmlCallbacks KaxBlockGroup::ClassInfos(KaxBlockGroup::Create, KaxBlockGroup_TheId, "BlockGroup", KaxBlockGroup_Context);
 const EbmlCallbacks KaxBlock::ClassInfos(KaxBlock::Create, KaxBlock_TheId, "Block", KaxBlock_Context);
-const EbmlCallbacks KaxSimpleBlock::ClassInfos(KaxSimpleBlock::Create, KaxSimpleBlock_TheId, "SimpleBlock", KaxSimpleBlock_Context);
 const EbmlCallbacks KaxBlockDuration::ClassInfos(KaxBlockDuration::Create, KaxBlockDuration_TheId, "BlockDuration", KaxBlockDuration_Context);
 #if MATROSKA_VERSION >= 2
+const EbmlCallbacks KaxSimpleBlock::ClassInfos(KaxSimpleBlock::Create, KaxSimpleBlock_TheId, "SimpleBlock", KaxSimpleBlock_Context);
 const EbmlCallbacks KaxBlockVirtual::ClassInfos(KaxBlockVirtual::Create, KaxBlockVirtual_TheId, "BlockVirtual", KaxBlockVirtual_Context);
 #endif // MATROSKA_VERSION
 const EbmlCallbacks KaxBlockAdditions::ClassInfos(KaxBlockAdditions::Create, KaxBlockAdditions_TheId, "BlockAdditions", KaxBlockAdditions_Context);

Modified: trunk/libmatroska/src/KaxCluster.cpp
===================================================================
--- trunk/libmatroska/src/KaxCluster.cpp	2005-10-08 15:04:42 UTC (rev 1213)
+++ trunk/libmatroska/src/KaxCluster.cpp	2005-10-08 15:27:30 UTC (rev 1214)
@@ -39,13 +39,19 @@
 // sub elements
 START_LIBMATROSKA_NAMESPACE
 
+#if MATROSKA_VERSION == 1
+EbmlSemantic KaxCluster_ContextList[5] =
+#else // MATROSKA_VERSION
 EbmlSemantic KaxCluster_ContextList[6] =
+#endif // MATROSKA_VERSION
 {
 	EbmlSemantic(true,  true,  KaxClusterTimecode::ClassInfos),
 	EbmlSemantic(false, true,  KaxClusterSilentTracks::ClassInfos),
 	EbmlSemantic(false, true,  KaxClusterPrevSize::ClassInfos),
 	EbmlSemantic(false, false, KaxBlockGroup::ClassInfos),
+#if MATROSKA_VERSION == 2
 	EbmlSemantic(false, false, KaxSimpleBlock::ClassInfos),
+#endif
 	EbmlSemantic(false, true,  KaxClusterPosition::ClassInfos),
 };