[matroska] r742 - in trunk/libmatroska: matroska src
[email protected] Thu, 2 Sep 2004 15:08:38 +0400 (MSD)
Newsgroups
gmane.comp.multimedia.matroska.cvs
Message-ID
<[email protected] >
Author: robux4
Date: 2004-09-02 15:08:36 +0400 (Thu, 02 Sep 2004)
New Revision: 742
Modified:
trunk/libmatroska/matroska/KaxChapters.h
trunk/libmatroska/src/KaxChapters.cpp
Log:
add support for KaxChapterProcessCommand and KaxEditionManagedPrivate
Modified: trunk/libmatroska/matroska/KaxChapters.h
===================================================================
--- trunk/libmatroska/matroska/KaxChapters.h 2004-08-31 17:02:53 UTC (rev 741)
+++ trunk/libmatroska/matroska/KaxChapters.h 2004-09-02 11:08:36 UTC (rev 742)
@@ -39,7 +39,8 @@
#include "ebml/EbmlMaster.h"
#include "ebml/EbmlUInteger.h"
#include "ebml/EbmlUnicodeString.h"
-#include "ebml/EbmlString.h"
+#include "ebml/EbmlString.h"
+#include "ebml/EbmlBinary.h"
using namespace LIBEBML_NAMESPACE;
@@ -111,6 +112,18 @@
EbmlElement * Clone() const {return new KaxEditionManaged(*this);}
};
+class MATROSKA_DLL_API KaxEditionManagedPrivate : public EbmlBinary {
+public:
+ KaxEditionManagedPrivate() {}
+ KaxEditionManagedPrivate(const KaxEditionManagedPrivate & ElementToClone) :EbmlBinary(ElementToClone) {}
+ static EbmlElement & Create() {return *(new KaxEditionManagedPrivate);}
+ const EbmlCallbacks & Generic() const {return ClassInfos;}
+ static const EbmlCallbacks ClassInfos;
+ operator const EbmlId &() const {return ClassInfos.GlobalId;}
+ EbmlElement * Clone() const {return new KaxEditionManagedPrivate(*this);}
+ bool ValidateSize() const {return true;}
+};
+
class MATROSKA_DLL_API KaxChapterAtom : public EbmlMaster {
public:
KaxChapterAtom();
@@ -276,6 +289,18 @@
EbmlElement * Clone() const {return new KaxChapterProcessTime(*this);}
};
+class MATROSKA_DLL_API KaxChapterProcessCommand : public EbmlBinary {
+public:
+ KaxChapterProcessCommand() {}
+ KaxChapterProcessCommand(const KaxChapterProcessCommand & ElementToClone) :EbmlBinary(ElementToClone) {}
+ static EbmlElement & Create() {return *(new KaxChapterProcessCommand);}
+ const EbmlCallbacks & Generic() const {return ClassInfos;}
+ static const EbmlCallbacks ClassInfos;
+ operator const EbmlId &() const {return ClassInfos.GlobalId;}
+ EbmlElement * Clone() const {return new KaxChapterProcessCommand(*this);}
+ bool ValidateSize() const {return true;}
+};
+
END_LIBMATROSKA_NAMESPACE
#endif // LIBMATROSKA_CHAPTERS_H
Modified: trunk/libmatroska/src/KaxChapters.cpp
===================================================================
--- trunk/libmatroska/src/KaxChapters.cpp 2004-08-31 17:02:53 UTC (rev 741)
+++ trunk/libmatroska/src/KaxChapters.cpp 2004-09-02 11:08:36 UTC (rev 742)
@@ -43,12 +43,13 @@
EbmlSemantic(true, false, KaxEditionEntry::ClassInfos),
};
-EbmlSemantic KaxEditionEntry_ContextList[5] =
+EbmlSemantic KaxEditionEntry_ContextList[6] =
{
EbmlSemantic(false, true, KaxEditionUID::ClassInfos),
EbmlSemantic(true , true, KaxEditionFlagHidden::ClassInfos),
EbmlSemantic(true , true, KaxEditionFlagDefault::ClassInfos),
EbmlSemantic(false, true, KaxEditionManaged::ClassInfos),
+ EbmlSemantic(false, true, KaxEditionManagedPrivate::ClassInfos),
EbmlSemantic(true, false, KaxChapterAtom::ClassInfos),
};
@@ -81,6 +82,7 @@
EbmlSemantic KaxChapterProcess_ContextList[1] =
{
EbmlSemantic(true, true, KaxChapterProcessTime::ClassInfos),
+ EbmlSemantic(true, true, KaxChapterProcessCommand::ClassInfos),
};
const EbmlSemanticContext KaxChapters_Context = EbmlSemanticContext(countof(KaxChapters_ContextList), KaxChapters_ContextList, &KaxSegment_Context, *GetKaxGlobal_Context, &KaxChapters::ClassInfos);
@@ -89,6 +91,7 @@
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 KaxEditionManagedPrivate_Context = EbmlSemanticContext(0, NULL, &KaxEditionEntry_Context, *GetKaxGlobal_Context, &KaxEditionManagedPrivate::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);
@@ -104,6 +107,7 @@
const EbmlSemanticContext KaxChapterCountry_Context = EbmlSemanticContext(0, NULL, &KaxChapterCountry_Context, *GetKaxGlobal_Context, &KaxChapterCountry::ClassInfos);
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);
+const EbmlSemanticContext KaxChapterProcessCommand_Context = EbmlSemanticContext(0, NULL, &KaxChapterProcess_Context, *GetKaxGlobal_Context, &KaxChapterProcessCommand::ClassInfos);
EbmlId KaxChapters_TheId (0x1043A770, 4);
EbmlId KaxEditionEntry_TheId (0x45B9, 2);
@@ -111,6 +115,7 @@
EbmlId KaxEditionFlagHidden_TheId (0x45BD, 2);
EbmlId KaxEditionFlagDefault_TheId (0x45DB, 2);
EbmlId KaxEditionManaged_TheId (0x45DD, 2);
+EbmlId KaxEditionManagedPrivate_TheId (0x450D, 2);
EbmlId KaxChapterAtom_TheId (0xB6, 1);
EbmlId KaxChapterUID_TheId (0x73C4, 2);
EbmlId KaxChapterTimeStart_TheId (0x91, 1);
@@ -126,6 +131,7 @@
EbmlId KaxChapterCountry_TheId (0x437E, 2);
EbmlId KaxChapterProcess_TheId (0x6944, 2);
EbmlId KaxChapterProcessTime_TheId (0x6922, 2);
+EbmlId KaxChapterProcessCommand_TheId (0x6933, 2);
const EbmlCallbacks KaxChapters::ClassInfos(KaxChapters::Create, KaxChapters_TheId, "Chapters", KaxChapters_Context);
const EbmlCallbacks KaxEditionEntry::ClassInfos(KaxEditionEntry::Create, KaxEditionEntry_TheId, "EditionEntry", KaxEditionEntry_Context);
@@ -133,6 +139,7 @@
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 KaxEditionManagedPrivate::ClassInfos(KaxEditionManagedPrivate::Create, KaxEditionManagedPrivate_TheId, "EditionManagedPrivate", KaxEditionManagedPrivate_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);
@@ -148,6 +155,7 @@
const EbmlCallbacks KaxChapterCountry::ClassInfos(KaxChapterCountry::Create, KaxChapterCountry_TheId, "ChapterCountry", KaxChapterCountry_Context);
const EbmlCallbacks KaxChapterProcess::ClassInfos(KaxChapterProcess::Create, KaxChapterProcess_TheId, "ChapterProcess", KaxChapterProcess_Context);
const EbmlCallbacks KaxChapterProcessTime::ClassInfos(KaxChapterProcessTime::Create, KaxChapterProcessTime_TheId, "ChapterProcessTime", KaxChapterProcessTime_Context);
+const EbmlCallbacks KaxChapterProcessCommand::ClassInfos(KaxChapterProcessCommand::Create, KaxChapterProcessCommand_TheId, "ChapterProcessCommand", KaxChapterProcessCommand_Context);
KaxChapters::KaxChapters()
:EbmlMaster(KaxChapters_Context)