[matroska] r730 - in trunk/libmatroska: matroska src
[email protected] Fri, 27 Aug 2004 13:22:47 +0400 (MSD)
Newsgroups
gmane.comp.multimedia.matroska.cvs
Message-ID
<[email protected] >
Author: robux4
Date: 2004-08-27 13:22:46 +0400 (Fri, 27 Aug 2004)
New Revision: 730
Modified:
trunk/libmatroska/matroska/KaxChapters.h
trunk/libmatroska/src/KaxChapters.cpp
Log:
add KaxChapterPhysicalEquiv as in the new specs
Modified: trunk/libmatroska/matroska/KaxChapters.h
===================================================================
--- trunk/libmatroska/matroska/KaxChapters.h 2004-08-25 14:56:31 UTC (rev 729)
+++ trunk/libmatroska/matroska/KaxChapters.h 2004-08-27 09:22:46 UTC (rev 730)
@@ -177,6 +177,17 @@
EbmlElement * Clone() const {return new KaxChapterFlagEnabled(*this);}
};
+class MATROSKA_DLL_API KaxChapterPhysicalEquiv : public EbmlUInteger {
+public:
+ KaxChapterPhysicalEquiv(): EbmlUInteger() {}
+ KaxChapterPhysicalEquiv(const KaxChapterPhysicalEquiv & ElementToClone) :EbmlUInteger(ElementToClone) {}
+ static EbmlElement & Create() {return *(new KaxChapterPhysicalEquiv);}
+ const EbmlCallbacks & Generic() const {return ClassInfos;}
+ static const EbmlCallbacks ClassInfos;
+ operator const EbmlId &() const {return ClassInfos.GlobalId;}
+ EbmlElement * Clone() const {return new KaxChapterPhysicalEquiv(*this);}
+};
+
class MATROSKA_DLL_API KaxChapterTrack : public EbmlMaster {
public:
KaxChapterTrack();
Modified: trunk/libmatroska/src/KaxChapters.cpp
===================================================================
--- trunk/libmatroska/src/KaxChapters.cpp 2004-08-25 14:56:31 UTC (rev 729)
+++ trunk/libmatroska/src/KaxChapters.cpp 2004-08-27 09:22:46 UTC (rev 730)
@@ -52,7 +52,7 @@
EbmlSemantic(true, false, KaxChapterAtom::ClassInfos),
};
-EbmlSemantic KaxChapterAtom_ContextList[9] =
+EbmlSemantic KaxChapterAtom_ContextList[10] =
{
EbmlSemantic(false, false, KaxChapterAtom::ClassInfos),
EbmlSemantic(true, true, KaxChapterUID::ClassInfos),
@@ -60,6 +60,7 @@
EbmlSemantic(false, true, KaxChapterTimeEnd::ClassInfos),
EbmlSemantic(false, true, KaxChapterFlagHidden::ClassInfos),
EbmlSemantic(false, true, KaxChapterFlagEnabled::ClassInfos),
+ EbmlSemantic(false, true, KaxChapterPhysicalEquiv::ClassInfos),
EbmlSemantic(false, true, KaxChapterTrack::ClassInfos),
EbmlSemantic(false, false, KaxChapterDisplay::ClassInfos),
EbmlSemantic(false, false, KaxChapterProcess::ClassInfos),
@@ -96,6 +97,7 @@
const EbmlSemanticContext KaxChapterTimeEnd_Context = EbmlSemanticContext(0, NULL, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterTimeEnd::ClassInfos);
const EbmlSemanticContext KaxChapterFlagHidden_Context = EbmlSemanticContext(0, NULL, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterFlagHidden::ClassInfos);
const EbmlSemanticContext KaxChapterFlagEnabled_Context = EbmlSemanticContext(0, NULL, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterFlagEnabled::ClassInfos);
+const EbmlSemanticContext KaxKaxChapterPhysicalEquiv_Context = EbmlSemanticContext(0, NULL, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterPhysicalEquiv::ClassInfos);
const EbmlSemanticContext KaxChapterTrackNumber_Context = EbmlSemanticContext(0, NULL, &KaxChapterTrack_Context, *GetKaxGlobal_Context, &KaxChapterTrackNumber::ClassInfos);
const EbmlSemanticContext KaxChapterString_Context = EbmlSemanticContext(0, NULL, &KaxChapterDisplay_Context, *GetKaxGlobal_Context, &KaxChapterString::ClassInfos);
const EbmlSemanticContext KaxChapterLanguage_Context = EbmlSemanticContext(0, NULL, &KaxChapterLanguage_Context, *GetKaxGlobal_Context, &KaxChapterLanguage::ClassInfos);
@@ -103,26 +105,27 @@
const EbmlSemanticContext KaxChapterProcess_Context = EbmlSemanticContext(countof(KaxChapterProcess_ContextList), KaxChapterProcess_ContextList, &KaxChapterAtom_Context, *GetKaxGlobal_Context, &KaxChapterProcess::ClassInfos);
const EbmlSemanticContext KaxChapterProcessTime_Context = EbmlSemanticContext(0, NULL, &KaxChapterProcess_Context, *GetKaxGlobal_Context, &KaxChapterProcessTime::ClassInfos);
-EbmlId KaxChapters_TheId (0x1043A770, 4);
-EbmlId KaxEditionEntry_TheId (0x45B9, 2);
-EbmlId KaxEditionUID_TheId (0x45BC, 2);
-EbmlId KaxEditionFlagHidden_TheId (0x45BD, 2);
-EbmlId KaxEditionFlagDefault_TheId(0x45DB, 2);
-EbmlId KaxEditionManaged_TheId (0x45DD, 2);
-EbmlId KaxChapterAtom_TheId (0xB6, 1);
-EbmlId KaxChapterUID_TheId (0x73C4, 2);
-EbmlId KaxChapterTimeStart_TheId (0x91, 1);
-EbmlId KaxChapterTimeEnd_TheId (0x92, 1);
-EbmlId KaxChapterFlagHidden_TheId (0x98, 1);
-EbmlId KaxChapterFlagEnabled_TheId(0x4598, 2);
-EbmlId KaxChapterTrack_TheId (0x8F, 1);
-EbmlId KaxChapterTrackNumber_TheId(0x89, 1);
-EbmlId KaxChapterDisplay_TheId (0x80, 1);
-EbmlId KaxChapterString_TheId (0x85, 1);
-EbmlId KaxChapterLanguage_TheId (0x437C, 2);
-EbmlId KaxChapterCountry_TheId (0x437E, 2);
-EbmlId KaxChapterProcess_TheId (0x6944, 2);
-EbmlId KaxChapterProcessTime_TheId(0x6922, 2);
+EbmlId KaxChapters_TheId (0x1043A770, 4);
+EbmlId KaxEditionEntry_TheId (0x45B9, 2);
+EbmlId KaxEditionUID_TheId (0x45BC, 2);
+EbmlId KaxEditionFlagHidden_TheId (0x45BD, 2);
+EbmlId KaxEditionFlagDefault_TheId (0x45DB, 2);
+EbmlId KaxEditionManaged_TheId (0x45DD, 2);
+EbmlId KaxChapterAtom_TheId (0xB6, 1);
+EbmlId KaxChapterUID_TheId (0x73C4, 2);
+EbmlId KaxChapterTimeStart_TheId (0x91, 1);
+EbmlId KaxChapterTimeEnd_TheId (0x92, 1);
+EbmlId KaxChapterFlagHidden_TheId (0x98, 1);
+EbmlId KaxChapterFlagEnabled_TheId (0x4598, 2);
+EbmlId KaxKaxChapterPhysicalEquiv_TheId(0x63C3, 2);
+EbmlId KaxChapterTrack_TheId (0x8F, 1);
+EbmlId KaxChapterTrackNumber_TheId (0x89, 1);
+EbmlId KaxChapterDisplay_TheId (0x80, 1);
+EbmlId KaxChapterString_TheId (0x85, 1);
+EbmlId KaxChapterLanguage_TheId (0x437C, 2);
+EbmlId KaxChapterCountry_TheId (0x437E, 2);
+EbmlId KaxChapterProcess_TheId (0x6944, 2);
+EbmlId KaxChapterProcessTime_TheId (0x6922, 2);
const EbmlCallbacks KaxChapters::ClassInfos(KaxChapters::Create, KaxChapters_TheId, "Chapters", KaxChapters_Context);
const EbmlCallbacks KaxEditionEntry::ClassInfos(KaxEditionEntry::Create, KaxEditionEntry_TheId, "EditionEntry", KaxEditionEntry_Context);
@@ -136,6 +139,7 @@
const EbmlCallbacks KaxChapterTimeEnd::ClassInfos(KaxChapterTimeEnd::Create, KaxChapterTimeEnd_TheId, "ChapterTimeEnd", KaxChapterTimeEnd_Context);
const EbmlCallbacks KaxChapterFlagHidden::ClassInfos(KaxChapterFlagHidden::Create, KaxChapterFlagHidden_TheId, "ChapterFlagHidden", KaxChapterFlagHidden_Context);
const EbmlCallbacks KaxChapterFlagEnabled::ClassInfos(KaxChapterFlagEnabled::Create, KaxChapterFlagEnabled_TheId, "ChapterFlagEnabled", KaxChapterFlagEnabled_Context);
+const EbmlCallbacks KaxChapterPhysicalEquiv::ClassInfos(KaxChapterPhysicalEquiv::Create, KaxChapterPhysicalEquiv_TheId, "ChapterPhysicalEquiv", KaxChapterPhysicalEquiv_Context);
const EbmlCallbacks KaxChapterTrack::ClassInfos(KaxChapterTrack::Create, KaxChapterTrack_TheId, "ChapterTrack", KaxChapterTrack_Context);
const EbmlCallbacks KaxChapterTrackNumber::ClassInfos(KaxChapterTrackNumber::Create, KaxChapterTrackNumber_TheId, "ChapterTrackNumber", KaxChapterTrackNumber_Context);
const EbmlCallbacks KaxChapterDisplay::ClassInfos(KaxChapterDisplay::Create, KaxChapterDisplay_TheId, "ChapterDisplay", KaxChapterDisplay_Context);