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

Author: robux4
Date: 2004-09-04 20:29:03 +0400 (Sat, 04 Sep 2004)
New Revision: 745

Modified:
   trunk/libmatroska/matroska/KaxChapters.h
   trunk/libmatroska/src/KaxChapters.cpp
Log:
KaxEditionManaged becomes KaxEditionProcessed and mandatory
KaxEditionManagedPrivate becomes KaxChapterManagedPrivate and moves

Modified: trunk/libmatroska/matroska/KaxChapters.h
===================================================================
--- trunk/libmatroska/matroska/KaxChapters.h	2004-09-03 13:38:05 UTC (rev 744)
+++ trunk/libmatroska/matroska/KaxChapters.h	2004-09-04 16:29:03 UTC (rev 745)
@@ -101,26 +101,26 @@
 	EbmlElement * Clone() const {return new KaxEditionFlagDefault(*this);}
 };
 
-class MATROSKA_DLL_API KaxEditionManaged : public EbmlUInteger {
+class MATROSKA_DLL_API KaxEditionProcessed : public EbmlUInteger {
 public:
-    KaxEditionManaged(): EbmlUInteger() {}
-	KaxEditionManaged(const KaxEditionManaged & ElementToClone) :EbmlUInteger(ElementToClone) {}
-    static EbmlElement & Create() {return *(new KaxEditionManaged);}
+    KaxEditionProcessed(): EbmlUInteger() {}
+	KaxEditionProcessed(const KaxEditionProcessed & ElementToClone) :EbmlUInteger(ElementToClone) {}
+    static EbmlElement & Create() {return *(new KaxEditionProcessed);}
     const EbmlCallbacks & Generic() const {return ClassInfos;}
     static const EbmlCallbacks ClassInfos;
     operator const EbmlId &() const {return ClassInfos.GlobalId;}
-	EbmlElement * Clone() const {return new KaxEditionManaged(*this);}
+	EbmlElement * Clone() const {return new KaxEditionProcessed(*this);}
 };
 
-class MATROSKA_DLL_API KaxEditionManagedPrivate : public EbmlBinary {
+class MATROSKA_DLL_API KaxChapterProcessedPrivate : public EbmlBinary {
 public:
-    KaxEditionManagedPrivate() {}
-	KaxEditionManagedPrivate(const KaxEditionManagedPrivate & ElementToClone) :EbmlBinary(ElementToClone) {}
-    static EbmlElement & Create() {return *(new KaxEditionManagedPrivate);}
+    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 KaxEditionManagedPrivate(*this);}
+	EbmlElement * Clone() const {return new KaxChapterProcessedPrivate(*this);}
 	bool ValidateSize() const {return true;}
 };
 

Modified: trunk/libmatroska/src/KaxChapters.cpp
===================================================================
--- trunk/libmatroska/src/KaxChapters.cpp	2004-09-03 13:38:05 UTC (rev 744)
+++ trunk/libmatroska/src/KaxChapters.cpp	2004-09-04 16:29:03 UTC (rev 745)
@@ -43,17 +43,16 @@
     EbmlSemantic(true, false,  KaxEditionEntry::ClassInfos),
 };
 
-EbmlSemantic KaxEditionEntry_ContextList[6] =
+EbmlSemantic KaxEditionEntry_ContextList[5] =
 {
-    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),
+    EbmlSemantic(false, true , KaxEditionUID::ClassInfos),
+    EbmlSemantic(true , true , KaxEditionFlagHidden::ClassInfos),
+    EbmlSemantic(true , true , KaxEditionFlagDefault::ClassInfos),
+    EbmlSemantic(true , true , KaxEditionProcessed::ClassInfos),
+    EbmlSemantic(true , false, KaxChapterAtom::ClassInfos),
 };
 
-EbmlSemantic KaxChapterAtom_ContextList[10] =
+EbmlSemantic KaxChapterAtom_ContextList[11] =
 {
     EbmlSemantic(false, false, KaxChapterAtom::ClassInfos),
     EbmlSemantic(true,  true,  KaxChapterUID::ClassInfos),
@@ -65,6 +64,7 @@
     EbmlSemantic(false, true,  KaxChapterTrack::ClassInfos),
     EbmlSemantic(false, false, KaxChapterDisplay::ClassInfos),
     EbmlSemantic(false, false, KaxChapterProcess::ClassInfos),
+    EbmlSemantic(false, true,  KaxChapterProcessedPrivate::ClassInfos),
 };
 
 EbmlSemantic KaxChapterTrack_ContextList[1] =
@@ -90,8 +90,8 @@
 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 KaxEditionManagedPrivate_Context = EbmlSemanticContext(0, NULL, &KaxEditionEntry_Context, *GetKaxGlobal_Context, &KaxEditionManagedPrivate::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 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);
@@ -114,8 +114,8 @@
 EbmlId KaxEditionUID_TheId             (0x45BC, 2);
 EbmlId KaxEditionFlagHidden_TheId      (0x45BD, 2);
 EbmlId KaxEditionFlagDefault_TheId     (0x45DB, 2);
-EbmlId KaxEditionManaged_TheId         (0x45DD, 2);
-EbmlId KaxEditionManagedPrivate_TheId  (0x450D, 2);
+EbmlId KaxEditionProcessed_TheId       (0x45DD, 2);
+EbmlId KaxChapterProcessedPrivate_TheId(0x450D, 2);
 EbmlId KaxChapterAtom_TheId            (0xB6, 1);
 EbmlId KaxChapterUID_TheId             (0x73C4, 2);
 EbmlId KaxChapterTimeStart_TheId       (0x91, 1);
@@ -138,8 +138,8 @@
 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 KaxEditionManagedPrivate::ClassInfos(KaxEditionManagedPrivate::Create, KaxEditionManagedPrivate_TheId, "EditionManagedPrivate", KaxEditionManagedPrivate_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 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);