[matroska] r952 - in trunk/libmatroska: matroska src
[email protected] Wed, 17 Nov 2004 17:51:26 +0300 (MSK)
Newsgroups
gmane.comp.multimedia.matroska.cvs
Message-ID
<[email protected] >
Author: robux4
Date: 2004-11-17 17:51:26 +0300 (Wed, 17 Nov 2004)
New Revision: 952
Modified:
trunk/libmatroska/matroska/KaxTrackEntryData.h
trunk/libmatroska/src/KaxTrackEntryData.cpp
trunk/libmatroska/src/KaxTracks.cpp
Log:
added KaxTrackFlagForced
Modified: trunk/libmatroska/matroska/KaxTrackEntryData.h
===================================================================
--- trunk/libmatroska/matroska/KaxTrackEntryData.h 2004-11-17 08:45:18 UTC (rev 951)
+++ trunk/libmatroska/matroska/KaxTrackEntryData.h 2004-11-17 14:51:26 UTC (rev 952)
@@ -104,6 +104,17 @@
EbmlElement * Clone() const {return new KaxTrackFlagDefault(*this);}
};
+class MATROSKA_DLL_API KaxTrackFlagForced : public EbmlUInteger {
+ public:
+ KaxTrackFlagForced() :EbmlUInteger(0) {}
+ KaxTrackFlagForced(const KaxTrackFlagForced & ElementToClone) :EbmlUInteger(ElementToClone) {}
+ static EbmlElement & Create() {return *(new KaxTrackFlagForced);}
+ const EbmlCallbacks & Generic() const {return ClassInfos;}
+ static const EbmlCallbacks ClassInfos;
+ operator const EbmlId &() const {return ClassInfos.GlobalId;}
+ EbmlElement * Clone() const {return new KaxTrackFlagForced(*this);}
+};
+
class MATROSKA_DLL_API KaxTrackFlagLacing : public EbmlUInteger {
public:
KaxTrackFlagLacing() :EbmlUInteger(1) {}
Modified: trunk/libmatroska/src/KaxTrackEntryData.cpp
===================================================================
--- trunk/libmatroska/src/KaxTrackEntryData.cpp 2004-11-17 08:45:18 UTC (rev 951)
+++ trunk/libmatroska/src/KaxTrackEntryData.cpp 2004-11-17 14:51:26 UTC (rev 952)
@@ -42,6 +42,7 @@
EbmlId KaxTrackUID_TheId (0x73C5, 2);
EbmlId KaxTrackType_TheId (0x83, 1);
EbmlId KaxTrackFlagDefault_TheId (0x88, 1);
+EbmlId KaxTrackFlagForced_TheId (0x55AA, 2);
EbmlId KaxTrackFlagLacing_TheId (0x9C, 1);
EbmlId KaxTrackMinCache_TheId (0x6DE7, 2);
EbmlId KaxTrackMaxCache_TheId (0x6DF8, 2);
@@ -66,6 +67,7 @@
const EbmlSemanticContext KaxTrackUID_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackUID::ClassInfos);
const EbmlSemanticContext KaxTrackType_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackType::ClassInfos);
const EbmlSemanticContext KaxTrackFlagDefault_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackFlagDefault::ClassInfos);
+const EbmlSemanticContext KaxTrackFlagForced_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackFlagForced::ClassInfos);
const EbmlSemanticContext KaxTrackFlagLacing_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackFlagLacing::ClassInfos);
const EbmlSemanticContext KaxTrackMinCache_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackMinCache::ClassInfos);
const EbmlSemanticContext KaxTrackMaxCache_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackMaxCache::ClassInfos);
@@ -90,6 +92,7 @@
const EbmlCallbacks KaxTrackUID::ClassInfos(KaxTrackUID::Create, KaxTrackUID_TheId, "TrackUID", KaxTrackUID_Context);
const EbmlCallbacks KaxTrackType::ClassInfos(KaxTrackType::Create, KaxTrackType_TheId, "TrackType", KaxTrackType_Context);
const EbmlCallbacks KaxTrackFlagDefault::ClassInfos(KaxTrackFlagDefault::Create, KaxTrackFlagDefault_TheId, "TrackFlagDefault", KaxTrackFlagDefault_Context);
+const EbmlCallbacks KaxTrackFlagForced::ClassInfos(KaxTrackFlagForced::Create, KaxTrackFlagForced_TheId, "TrackFlagForced", KaxTrackFlagForced_Context);
const EbmlCallbacks KaxTrackFlagLacing::ClassInfos(KaxTrackFlagLacing::Create, KaxTrackFlagLacing_TheId, "TrackFlagLacing", KaxTrackFlagLacing_Context);
const EbmlCallbacks KaxTrackMinCache::ClassInfos(KaxTrackMinCache::Create, KaxTrackMinCache_TheId, "TrackMinCache", KaxTrackMinCache_Context);
const EbmlCallbacks KaxTrackMaxCache::ClassInfos(KaxTrackMaxCache::Create, KaxTrackMaxCache_TheId, "TrackMaxCache", KaxTrackMaxCache_Context);
Modified: trunk/libmatroska/src/KaxTracks.cpp
===================================================================
--- trunk/libmatroska/src/KaxTracks.cpp 2004-11-17 08:45:18 UTC (rev 951)
+++ trunk/libmatroska/src/KaxTracks.cpp 2004-11-17 14:51:26 UTC (rev 952)
@@ -49,9 +49,9 @@
};
#if MATROSKA_VERSION == 1
-const EbmlSemantic KaxTrackEntry_ContextList[19] =
+const EbmlSemantic KaxTrackEntry_ContextList[20] =
#else // MATROSKA_VERSION
-const EbmlSemantic KaxTrackEntry_ContextList[24] =
+const EbmlSemantic KaxTrackEntry_ContextList[25] =
#endif // MATROSKA_VERSION
{
EbmlSemantic(true , true, KaxTrackNumber::ClassInfos),
@@ -61,6 +61,7 @@
EbmlSemantic(true , true, KaxTrackFlagEnabled::ClassInfos),
#endif // MATROSKA_VERSION
EbmlSemantic(true , true, KaxTrackFlagDefault::ClassInfos),
+ EbmlSemantic(true , true, KaxTrackFlagForced::ClassInfos),
EbmlSemantic(true , true, KaxTrackFlagLacing::ClassInfos),
EbmlSemantic(true , true, KaxTrackMinCache::ClassInfos),
EbmlSemantic(false, true, KaxTrackMaxCache::ClassInfos),