[matroska] r995 - in trunk/libmatroska: matroska src

[email protected]
Newsgroups gmane.comp.multimedia.matroska.cvs
Message-ID <[email protected]> 
Author: robux4
Date: 2005-01-03 15:31:27 +0300 (Mon, 03 Jan 2005)
New Revision: 995

Modified:
   trunk/libmatroska/matroska/KaxChapters.h
   trunk/libmatroska/src/KaxChapters.cpp
Log:
libmatroska: update with latest changes in the chapter codecs (may not compile)

Modified: trunk/libmatroska/matroska/KaxChapters.h
===================================================================
--- trunk/libmatroska/matroska/KaxChapters.h	2005-01-02 19:15:25 UTC (rev 994)
+++ trunk/libmatroska/matroska/KaxChapters.h	2005-01-03 12:31:27 UTC (rev 995)
@@ -101,29 +101,17 @@
 	EbmlElement * Clone() const {return new KaxEditionFlagDefault(*this);}
 };
 
-class MATROSKA_DLL_API KaxEditionProcessed : public EbmlUInteger {
+class MATROSKA_DLL_API KaxEditionFlagOrdered : public EbmlUInteger {
 public:
-    KaxEditionProcessed(): EbmlUInteger(0) {}
-	KaxEditionProcessed(const KaxEditionProcessed & ElementToClone) :EbmlUInteger(ElementToClone) {}
-    static EbmlElement & Create() {return *(new KaxEditionProcessed);}
+    KaxEditionFlagOrdered(): EbmlUInteger(0) {}
+	KaxEditionFlagOrdered(const KaxEditionFlagOrdered & ElementToClone) :EbmlUInteger(ElementToClone) {}
+    static EbmlElement & Create() {return *(new KaxEditionFlagOrdered);}
     const EbmlCallbacks & Generic() const {return ClassInfos;}
     static const EbmlCallbacks ClassInfos;
     operator const EbmlId &() const {return ClassInfos.GlobalId;}
-	EbmlElement * Clone() const {return new KaxEditionProcessed(*this);}
+	EbmlElement * Clone() const {return new KaxEditionFlagOrdered(*this);}
 };
 
-class MATROSKA_DLL_API KaxChapterProcessedPrivate : public EbmlBinary {
-public:
-    KaxChapterProcessedPrivate() {}
-	KaxChapterProcessedPrivate(const KaxChapterProcessedPrivate & ElementToClone) :EbmlBinary(ElementToClone) {}
-    static EbmlElement & Create() {return *(new KaxChapterProcessedPrivate);}
-    const EbmlCallbacks & Generic() const {return ClassInfos;}
-    static const EbmlCallbacks ClassInfos;
-    operator const EbmlId &() const {return ClassInfos.GlobalId;}
-	EbmlElement * Clone() const {return new KaxChapterProcessedPrivate(*this);}
-	bool ValidateSize() const {return true;}
-};
-
 class MATROSKA_DLL_API KaxChapterAtom : public EbmlMaster {
 public:
     KaxChapterAtom();
@@ -278,6 +266,40 @@
 	EbmlElement * Clone() const {return new KaxChapterProcess(*this);}
 };
 
+class MATROSKA_DLL_API KaxChapterProcessCodecID : public EbmlUInteger {
+public:
+    KaxChapterProcessCodecID() :EbmlUInteger(0) {}
+	KaxChapterProcessCodecID(const KaxChapterProcessCodecID & ElementToClone) :EbmlUInteger(ElementToClone) {}
+    static EbmlElement & Create() {return *(new KaxChapterProcessCodecID);}
+    const EbmlCallbacks & Generic() const {return ClassInfos;}
+    static const EbmlCallbacks ClassInfos;
+    operator const EbmlId &() const {return ClassInfos.GlobalId;}
+	EbmlElement * Clone() const {return new KaxChapterProcessCodecID(*this);}
+};
+
+class MATROSKA_DLL_API KaxChapterProcessedPrivate : public EbmlBinary {
+public:
+    KaxChapterProcessedPrivate() {}
+	KaxChapterProcessedPrivate(const KaxChapterProcessedPrivate & ElementToClone) :EbmlBinary(ElementToClone) {}
+    static EbmlElement & Create() {return *(new KaxChapterProcessedPrivate);}
+    const EbmlCallbacks & Generic() const {return ClassInfos;}
+    static const EbmlCallbacks ClassInfos;
+    operator const EbmlId &() const {return ClassInfos.GlobalId;}
+	EbmlElement * Clone() const {return new KaxChapterProcessedPrivate(*this);}
+	bool ValidateSize() const {return true;}
+};
+
+class MATROSKA_DLL_API KaxChapterProcessCommand : public EbmlMaster {
+public:
+    KaxChapterProcessCommand();
+	KaxChapterProcessCommand(const KaxChapterProcessCommand & ElementToClone) :EbmlMaster(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);}
+};
+
 class MATROSKA_DLL_API KaxChapterProcessTime : public EbmlUInteger {
 public:
     KaxChapterProcessTime() {}
@@ -289,15 +311,15 @@
 	EbmlElement * Clone() const {return new KaxChapterProcessTime(*this);}
 };
 
-class MATROSKA_DLL_API KaxChapterProcessCommand : public EbmlBinary {
+class MATROSKA_DLL_API KaxChapterProcessData : public EbmlBinary {
 public:
-    KaxChapterProcessCommand() {}
-	KaxChapterProcessCommand(const KaxChapterProcessCommand & ElementToClone) :EbmlBinary(ElementToClone) {}
-    static EbmlElement & Create() {return *(new KaxChapterProcessCommand);}
+    KaxChapterProcessData() {}
+	KaxChapterProcessData(const KaxChapterProcessData & ElementToClone) :EbmlBinary(ElementToClone) {}
+    static EbmlElement & Create() {return *(new KaxChapterProcessData);}
     const EbmlCallbacks & Generic() const {return ClassInfos;}
     static const EbmlCallbacks ClassInfos;
     operator const EbmlId &() const {return ClassInfos.GlobalId;}
-	EbmlElement * Clone() const {return new KaxChapterProcessCommand(*this);}
+	EbmlElement * Clone() const {return new KaxChapterProcessData(*this);}
 	bool ValidateSize() const {return true;}
 };
 

Modified: trunk/libmatroska/src/KaxChapters.cpp
===================================================================
--- trunk/libmatroska/src/KaxChapters.cpp	2005-01-02 19:15:25 UTC (rev 994)
+++ trunk/libmatroska/src/KaxChapters.cpp	2005-01-03 12:31:27 UTC (rev 995)
@@ -48,13 +48,13 @@
     EbmlSemantic(false, true , KaxEditionUID::ClassInfos),
     EbmlSemantic(true , true , KaxEditionFlagHidden::ClassInfos),
     EbmlSemantic(true , true , KaxEditionFlagDefault::ClassInfos),
-    EbmlSemantic(true , true , KaxEditionProcessed::ClassInfos),
+    EbmlSemantic(false, true , KaxEditionFlagOrdered::ClassInfos),
     EbmlSemantic(true , false, KaxChapterAtom::ClassInfos),
 };
 
-EbmlSemantic KaxChapterAtom_ContextList[11] =
+EbmlSemantic KaxChapterAtom_ContextList[10] =
 {
-    EbmlSemantic(false, false, KaxChapterAtom::ClassInfos),
+    EbmlSemantic(true,  false, KaxChapterAtom::ClassInfos),
     EbmlSemantic(true,  true,  KaxChapterUID::ClassInfos),
     EbmlSemantic(true,  true,  KaxChapterTimeStart::ClassInfos),
     EbmlSemantic(false, true,  KaxChapterTimeEnd::ClassInfos),
@@ -64,7 +64,6 @@
     EbmlSemantic(false, true,  KaxChapterTrack::ClassInfos),
     EbmlSemantic(false, false, KaxChapterDisplay::ClassInfos),
     EbmlSemantic(false, false, KaxChapterProcess::ClassInfos),
-    EbmlSemantic(false, true,  KaxChapterProcessedPrivate::ClassInfos),
 };
 
 EbmlSemantic KaxChapterTrack_ContextList[1] =
@@ -79,10 +78,17 @@
     EbmlSemantic(false, false, KaxChapterCountry::ClassInfos),
 };
 
-EbmlSemantic KaxChapterProcess_ContextList[2] =
+EbmlSemantic KaxChapterProcess_ContextList[3] =
 {
+    EbmlSemantic(true,  true,  KaxChapterProcessCodecID::ClassInfos),
+    EbmlSemantic(false, true,  KaxChapterProcessPrivate::ClassInfos),
+    EbmlSemantic(false, false, KaxChapterProcessCommand::ClassInfos),
+};
+
+EbmlSemantic KaxChapterProcessCommand_ContextList[2] =
+{
     EbmlSemantic(true,  true,  KaxChapterProcessTime::ClassInfos),
-    EbmlSemantic(true,  true,  KaxChapterProcessCommand::ClassInfos),
+    EbmlSemantic(true,  true,  KaxChapterProcessData::ClassInfos),
 };
 
 const EbmlSemanticContext KaxChapters_Context = EbmlSemanticContext(countof(KaxChapters_ContextList), KaxChapters_ContextList, &KaxSegment_Context, *GetKaxGlobal_Context, &KaxChapters::ClassInfos);
@@ -90,8 +96,7 @@
 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 KaxEditionProcessed_Context = EbmlSemanticContext(0, NULL, &KaxEditionEntry_Context, *GetKaxGlobal_Context, &KaxEditionProcessed::ClassInfos);
-const EbmlSemanticContext KaxChapterProcessedPrivate_Context = EbmlSemanticContext(0, NULL, &KaxEditionEntry_Context, *GetKaxGlobal_Context, &KaxChapterProcessedPrivate::ClassInfos);
+const EbmlSemanticContext KaxEditionFlagOrdered_Context = EbmlSemanticContext(0, NULL, &KaxEditionEntry_Context, *GetKaxGlobal_Context, &KaxEditionFlagOrdered::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);
@@ -106,16 +111,18 @@
 const EbmlSemanticContext KaxChapterLanguage_Context = EbmlSemanticContext(0, NULL, &KaxChapterLanguage_Context, *GetKaxGlobal_Context, &KaxChapterLanguage::ClassInfos);
 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);
+const EbmlSemanticContext KaxChapterProcessCodecID_Context = EbmlSemanticContext(0, NULL, &KaxChapterProcess_Context, *GetKaxGlobal_Context, &KaxChapterProcessCodecID::ClassInfos);
+const EbmlSemanticContext KaxChapterProcessPrivate_Context = EbmlSemanticContext(0, NULL, &KaxChapterProcess_Context, *GetKaxGlobal_Context, &KaxChapterProcessPrivate::ClassInfos);
+const EbmlSemanticContext KaxChapterProcessCommand_Context = EbmlSemanticContext(countof(KaxChapterProcessCommand_ContextList), KaxChapterProcessCommand_ContextList, &KaxChapterProcess_Context, *GetKaxGlobal_Context, &KaxChapterProcessCommand::ClassInfos);
+const EbmlSemanticContext KaxChapterProcessTime_Context = EbmlSemanticContext(0, NULL, &KaxChapterProcessCommand_ContextList, *GetKaxGlobal_Context, &KaxChapterProcessTime::ClassInfos);
+const EbmlSemanticContext KaxChapterProcessData_Context = EbmlSemanticContext(0, NULL, &KaxChapterProcessCommand_ContextList, *GetKaxGlobal_Context, &KaxChapterProcessData::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 KaxEditionProcessed_TheId       (0x45DD, 2);
-EbmlId KaxChapterProcessedPrivate_TheId(0x450D, 2);
+EbmlId KaxEditionFlagOrdered_TheId     (0x45DD, 2);
 EbmlId KaxChapterAtom_TheId            (0xB6, 1);
 EbmlId KaxChapterUID_TheId             (0x73C4, 2);
 EbmlId KaxChapterTimeStart_TheId       (0x91, 1);
@@ -130,16 +137,18 @@
 EbmlId KaxChapterLanguage_TheId        (0x437C, 2);
 EbmlId KaxChapterCountry_TheId         (0x437E, 2);
 EbmlId KaxChapterProcess_TheId         (0x6944, 2);
+EbmlId KaxChapterProcessCodecID_TheId  (0x6955, 2);
+EbmlId KaxChapterProcessPrivate_TheId  (0x450D, 2);
+EbmlId KaxChapterProcessCommand_TheId  (0x6911, 2);
 EbmlId KaxChapterProcessTime_TheId     (0x6922, 2);
-EbmlId KaxChapterProcessCommand_TheId  (0x6933, 2);
+EbmlId KaxChapterProcessData_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);
 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 KaxEditionProcessed::ClassInfos(KaxEditionProcessed::Create, KaxEditionProcessed_TheId, "EditionProcessed", KaxEditionProcessed_Context);
-const EbmlCallbacks KaxChapterProcessedPrivate::ClassInfos(KaxChapterProcessedPrivate::Create, KaxChapterProcessedPrivate_TheId, "ChapterProcessedPrivate", KaxChapterProcessedPrivate_Context);
+const EbmlCallbacks KaxEditionFlagOrdered::ClassInfos(KaxEditionFlagOrdered::Create, KaxEditionFlagOrdered_TheId, "EditionFlagOrdered", KaxEditionFlagOrdered_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);
@@ -154,8 +163,11 @@
 const EbmlCallbacks KaxChapterLanguage::ClassInfos(KaxChapterLanguage::Create, KaxChapterLanguage_TheId, "ChapterLanguage", KaxChapterLanguage_Context);
 const EbmlCallbacks KaxChapterCountry::ClassInfos(KaxChapterCountry::Create, KaxChapterCountry_TheId, "ChapterCountry", KaxChapterCountry_Context);
 const EbmlCallbacks KaxChapterProcess::ClassInfos(KaxChapterProcess::Create, KaxChapterProcess_TheId, "ChapterProcess", KaxChapterProcess_Context);
+const EbmlCallbacks KaxChapterProcessCodecID::ClassInfos(KaxChapterProcessCodecID::Create, KaxChapterProcessCodecID_TheId, "ChapterProcessCodecID", KaxChapterProcessCodecID_Context);
+const EbmlCallbacks KaxChapterProcessPrivate::ClassInfos(KaxChapterProcessPrivate::Create, KaxChapterProcessPrivate_TheId, "ChapterProcessPrivate", KaxChapterProcessPrivate_Context);
+const EbmlCallbacks KaxChapterProcessCommand::ClassInfos(KaxChapterProcessCommand::Create, KaxChapterProcessCommand_TheId, "ChapterProcessCommand", KaxChapterProcessCommand_Context);
 const EbmlCallbacks KaxChapterProcessTime::ClassInfos(KaxChapterProcessTime::Create, KaxChapterProcessTime_TheId, "ChapterProcessTime", KaxChapterProcessTime_Context);
-const EbmlCallbacks KaxChapterProcessCommand::ClassInfos(KaxChapterProcessCommand::Create, KaxChapterProcessCommand_TheId, "ChapterProcessCommand", KaxChapterProcessCommand_Context);
+const EbmlCallbacks KaxChapterProcessData::ClassInfos(KaxChapterProcessData::Create, KaxChapterProcessData_TheId, "ChapterProcessData", KaxChapterProcessData_Context);
 
 KaxChapters::KaxChapters()
  :EbmlMaster(KaxChapters_Context)
@@ -181,4 +193,8 @@
 :EbmlMaster(KaxChapterProcess_Context)
 {}
 
+KaxChapterProcessCommand::KaxChapterProcessCommand()
+:EbmlMaster(KaxChapterProcessCommand_Context)
+{}
+
 END_LIBMATROSKA_NAMESPACE
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.