From 34a69ca1e80f02332e7c1a04f16e91f81cc57763 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Wed, 7 Apr 2010 16:12:16 +0000 Subject: [PATCH] new macro to define the old EbmlSemanticContext if it's not done elsewhere + add some missing SEMANTIC start/end git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@86 a6f86f6d-0131-4f8e-9e7b-e335508773d5 --- src/KaxBlockData.cpp | 10 ++++------ src/KaxContexts.cpp | 13 +++++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/KaxBlockData.cpp b/src/KaxBlockData.cpp index 15b4c09..c76e524 100644 --- a/src/KaxBlockData.cpp +++ b/src/KaxBlockData.cpp @@ -41,19 +41,17 @@ using namespace LIBEBML_NAMESPACE; START_LIBMATROSKA_NAMESPACE -const EbmlSemantic ContextList_KaxSlices[1] = -{ +DEFINE_START_SEMANTIC(KaxSlices) DEFINE_SEMANTIC_ITEM(false, false, KaxTimeSlice) -}; +DEFINE_END_SEMANTIC(KaxSlices) -const EbmlSemantic ContextList_KaxTimeSlice[5] = -{ +DEFINE_START_SEMANTIC(KaxTimeSlice) DEFINE_SEMANTIC_ITEM(false, true, KaxSliceLaceNumber) DEFINE_SEMANTIC_ITEM(false, true, KaxSliceFrameNumber) DEFINE_SEMANTIC_ITEM(false, true, KaxSliceBlockAddID) DEFINE_SEMANTIC_ITEM(false, true, KaxSliceDelay) DEFINE_SEMANTIC_ITEM(false, true, KaxSliceDuration) -}; +DEFINE_END_SEMANTIC(KaxTimeSlice) DEFINE_MKX_UINTEGER_DEF (KaxReferencePriority, 0xFA, 1, KaxBlockGroup, "FlagReferenced", 0); DEFINE_MKX_SINTEGER_CONS(KaxReferenceBlock, 0xFB, 1, KaxBlockGroup, "ReferenceBlock"); diff --git a/src/KaxContexts.cpp b/src/KaxContexts.cpp index af8651f..999d74a 100644 --- a/src/KaxContexts.cpp +++ b/src/KaxContexts.cpp @@ -34,11 +34,24 @@ */ #include "ebml/EbmlContexts.h" #include "matroska/KaxContexts.h" +#include "matroska/KaxAttached.h" +#include "matroska/KaxAttachments.h" +#include "matroska/KaxBlock.h" +#include "matroska/KaxCluster.h" +#include "matroska/KaxSegment.h" +#include "matroska/KaxTracks.h" using namespace LIBEBML_NAMESPACE; START_LIBMATROSKA_NAMESPACE +DEFINE_SEMANTIC_CONTEXT(KaxSegment) +DEFINE_SEMANTIC_CONTEXT(KaxAttached) +DEFINE_SEMANTIC_CONTEXT(KaxAttachments) +DEFINE_SEMANTIC_CONTEXT(KaxBlockGroup) +DEFINE_SEMANTIC_CONTEXT(KaxCluster) +DEFINE_SEMANTIC_CONTEXT(KaxTrackEntry) + // for the moment const EbmlSemanticContext & GetKaxGlobal_Context() { -- 2.40.0