[matroska] r718 - in trunk/libmatroska: matroska src
[email protected] Thu, 19 Aug 2004 21:15:07 +0400 (MSD)
Newsgroups
gmane.comp.multimedia.matroska.cvs
Message-ID
<[email protected] >
Author: robux4
Date: 2004-08-19 21:15:07 +0400 (Thu, 19 Aug 2004)
New Revision: 718
Modified:
trunk/libmatroska/matroska/KaxChapters.h
trunk/libmatroska/src/KaxChapters.cpp
Log:
added KaxEditionFlagDefault and KaxEditionManaged
Modified: trunk/libmatroska/matroska/KaxChapters.h
===================================================================
--- trunk/libmatroska/matroska/KaxChapters.h 2004-08-19 08:54:57 UTC (rev 717)
+++ trunk/libmatroska/matroska/KaxChapters.h 2004-08-19 17:15:07 UTC (rev 718)
@@ -89,6 +89,28 @@
EbmlElement * Clone() const {return new KaxEditionFlagHidden(*this);}
};
+class MATROSKA_DLL_API KaxEditionFlagDefault : public EbmlUInteger {
+public:
+ KaxEditionFlagDefault(): EbmlUInteger(0) {}
+ KaxEditionFlagDefault(const KaxEditionFlagDefault & ElementToClone) :EbmlUInteger(ElementToClone) {}
+ static EbmlElement & Create() {return *(new KaxEditionFlagDefault);}
+ const EbmlCallbacks & Generic() const {return ClassInfos;}
+ static const EbmlCallbacks ClassInfos;
+ operator const EbmlId &() const {return ClassInfos.GlobalId;}
+ EbmlElement * Clone() const {return new KaxEditionFlagDefault(*this);}
+};
+
+class MATROSKA_DLL_API KaxEditionManaged : public EbmlUInteger {
+public:
+ KaxEditionManaged(): EbmlUInteger() {}
+ KaxEditionManaged(const KaxEditionManaged & ElementToClone) :EbmlUInteger(ElementToClone) {}
+ static EbmlElement & Create() {return *(new KaxEditionManaged);}
+ const EbmlCallbacks & Generic() const {return ClassInfos;}
+ static const EbmlCallbacks ClassInfos;
+ operator const EbmlId &() const {return ClassInfos.GlobalId;}
+ EbmlElement * Clone() const {return new KaxEditionManaged(*this);}
+};
+
class MATROSKA_DLL_API KaxChapterAtom : public EbmlMaster {
public:
KaxChapterAtom();
Modified: trunk/libmatroska/src/KaxChapters.cpp
===================================================================
--- trunk/libmatroska/src/KaxChapters.cpp 2004-08-19 08:54:57 UTC (rev 717)
+++ trunk/libmatroska/src/KaxChapters.cpp 2004-08-19 17:15:07 UTC (rev 718)
@@ -47,6 +47,8 @@
{
EbmlSemantic(false, true, KaxEditionUID::ClassInfos),
EbmlSemantic(false, true, KaxEditionFlagHidden::ClassInfos),
+ EbmlSemantic(false, true, KaxEditionFlagDefault::ClassInfos),
+ EbmlSemantic(false, true, KaxEditionManaged::ClassInfos),
EbmlSemantic(true, false, KaxChapterAtom::ClassInfos),
};
@@ -78,6 +80,8 @@
const EbmlSemanticContext KaxEditionEntry_Context = EbmlSemanticContext(countof(KaxEditionEntry_ContextList), KaxEditionEntry_ContextList, &KaxChapters_Context, *GetKaxGlobal_Context, &KaxEditionEntry::ClassInfos);
const EbmlSemanticContext KaxEditionUID_Context = EbmlSemanticContext(0, NULL, &KaxEditionEntry_Context, *GetKaxGlobal_Context, &KaxEditionUID::ClassInfos);
const EbmlSemanticContext KaxEditionFlagHidden_Context = EbmlSemanticContext(0, NULL, &KaxEditionEntry_Context, *GetKaxGlobal_Context, &KaxEditionFlagHidden::ClassInfos);
+const EbmlSemanticContext KaxEditionFlagDefault_Context = EbmlSemanticContext(0, NULL, &KaxEditionEntry_Context, *GetKaxGlobal_Context, &KaxEditionFlagDefault::ClassInfos);
+const EbmlSemanticContext KaxEditionManaged_Context = EbmlSemanticContext(0, NULL, &KaxEditionEntry_Context, *GetKaxGlobal_Context, &KaxEditionManaged::ClassInfos);
const EbmlSemanticContext KaxChapterAtom_Context = EbmlSemanticContext(countof(KaxChapterAtom_ContextList), KaxChapterAtom_ContextList, &KaxEditionEntry_Context, *GetKaxGlobal_Context, &KaxChapterAtom::ClassInfos);
const EbmlSemanticContext KaxChapterTrack_Context = EbmlSemanticContext(countof(KaxChapterTrack_ContextList), KaxChapterTrack_ContextList, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterTrack::ClassInfos);
const EbmlSemanticContext KaxChapterDisplay_Context = EbmlSemanticContext(countof(KaxChapterDisplay_ContextList), KaxChapterDisplay_ContextList, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterDisplay::ClassInfos);
@@ -95,6 +99,8 @@
EbmlId KaxEditionEntry_TheId (0x45B9, 2);
EbmlId KaxEditionUID_TheId (0x45BC, 2);
EbmlId KaxEditionFlagHidden_TheId (0x45BD, 2);
+EbmlId KaxEditionFlagDefault_TheId(0x45DD, 2);
+EbmlId KaxEditionManaged_TheId (0x45DD, 2);
EbmlId KaxChapterAtom_TheId (0xB6, 1);
EbmlId KaxChapterUID_TheId (0x73C4, 2);
EbmlId KaxChapterTimeStart_TheId (0x91, 1);
@@ -112,6 +118,8 @@
const EbmlCallbacks KaxEditionEntry::ClassInfos(KaxEditionEntry::Create, KaxEditionEntry_TheId, "EditionEntry", KaxEditionEntry_Context);
const EbmlCallbacks KaxEditionUID::ClassInfos(KaxEditionUID::Create, KaxEditionUID_TheId, "EditionUID", KaxEditionUID_Context);
const EbmlCallbacks KaxEditionFlagHidden::ClassInfos(KaxEditionFlagHidden::Create, KaxEditionFlagHidden_TheId, "EditionFlagHidden", KaxEditionFlagHidden_Context);
+const EbmlCallbacks KaxEditionFlagDefault::ClassInfos(KaxEditionFlagDefault::Create, KaxEditionFlagDefault_TheId, "EditionFlagDefault", KaxEditionFlagDefault_Context);
+const EbmlCallbacks KaxEditionManaged::ClassInfos(KaxEditionManaged::Create, KaxEditionManaged_TheId, "EditionManaged", KaxEditionManaged_Context);
const EbmlCallbacks KaxChapterAtom::ClassInfos(KaxChapterAtom::Create, KaxChapterAtom_TheId, "ChapterAtom", KaxChapterAtom_Context);
const EbmlCallbacks KaxChapterUID::ClassInfos(KaxChapterUID::Create, KaxChapterUID_TheId, "ChapterUID", KaxChapterUID_Context);
const EbmlCallbacks KaxChapterTimeStart::ClassInfos(KaxChapterTimeStart::Create, KaxChapterTimeStart_TheId, "ChapterTimeStart", KaxChapterTimeStart_Context);