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

Author: robux4
Date: 2005-01-31 16:39:28 +0300 (Mon, 31 Jan 2005)
New Revision: 1060

Modified:
   trunk/libmatroska/matroska/KaxTrackEntryData.h
   trunk/libmatroska/src/KaxTrackEntryData.cpp
   trunk/libmatroska/src/KaxTracks.cpp
Log:
libmatroska: no more TrackAngle and new TrackTranslate elements

Modified: trunk/libmatroska/matroska/KaxTrackEntryData.h
===================================================================
--- trunk/libmatroska/matroska/KaxTrackEntryData.h	2005-01-31 13:05:20 UTC (rev 1059)
+++ trunk/libmatroska/matroska/KaxTrackEntryData.h	2005-01-31 13:39:28 UTC (rev 1060)
@@ -248,17 +248,51 @@
 		EbmlElement * Clone() const {return new KaxTrackOverlay(*this);}
 };
 
-class MATROSKA_DLL_API KaxTrackAngle : public EbmlUInteger {
+class MATROSKA_DLL_API KaxTrackTranslate : public EbmlMaster {
 	public:
-		KaxTrackAngle() : EbmlUInteger(1) {}
-		KaxTrackAngle(const KaxTrackAngle & ElementToClone) :EbmlUInteger(ElementToClone) {}
-		static EbmlElement & Create() {return *(new KaxTrackAngle);}
+		KaxTrackTranslate();
+		KaxTrackTranslate(const KaxTrackTranslate & ElementToClone) :EbmlMaster(ElementToClone) {}
+		static EbmlElement & Create() {return *(new KaxTrackTranslate);}
 		const EbmlCallbacks & Generic() const {return ClassInfos;}
 		static const EbmlCallbacks ClassInfos;
 		operator const EbmlId &() const {return ClassInfos.GlobalId;}
-		EbmlElement * Clone() const {return new KaxTrackAngle(*this);}
+		EbmlElement * Clone() const {return new KaxTrackTranslate(*this);}
 };
-
+
+class MATROSKA_DLL_API KaxTrackTranslateCodec : public EbmlUInteger {
+	public:
+		KaxTrackTranslateCodec() {}
+		KaxTrackTranslateCodec(const KaxTrackTranslateCodec & ElementToClone) :EbmlUInteger(ElementToClone) {}
+		static EbmlElement & Create() {return *(new KaxTrackTranslateCodec);}
+		const EbmlCallbacks & Generic() const {return ClassInfos;}
+		static const EbmlCallbacks ClassInfos;
+		operator const EbmlId &() const {return ClassInfos.GlobalId;}
+		EbmlElement * Clone() const {return new KaxTrackTranslateCodec(*this);}
+};
+
+class MATROSKA_DLL_API KaxTrackTranslateEditionUID : public EbmlUInteger {
+	public:
+		KaxTrackTranslateEditionUID() {}
+		KaxTrackTranslateEditionUID(const KaxTrackTranslateEditionUID & ElementToClone) :EbmlUInteger(ElementToClone) {}
+		static EbmlElement & Create() {return *(new KaxTrackTranslateEditionUID);}
+		const EbmlCallbacks & Generic() const {return ClassInfos;}
+		static const EbmlCallbacks ClassInfos;
+		operator const EbmlId &() const {return ClassInfos.GlobalId;}
+		EbmlElement * Clone() const {return new KaxTrackTranslateEditionUID(*this);}
+};
+
+class MATROSKA_DLL_API KaxTrackTranslateID : public EbmlBinary {
+	public:
+		KaxTrackTranslateID() {}
+		KaxTrackTranslateID(const KaxTrackTranslateID & ElementToClone) :EbmlBinary(ElementToClone){}
+		static EbmlElement & Create() {return *(new KaxTrackTranslateID);}
+		bool ValidateSize() const { return true;}
+		const EbmlCallbacks & Generic() const {return ClassInfos;}
+		static const EbmlCallbacks ClassInfos;
+		operator const EbmlId &() const {return ClassInfos.GlobalId;}
+		EbmlElement * Clone() const {return new KaxTrackTranslateID(*this);}
+};
+
 #if MATROSKA_VERSION >= 2
 class MATROSKA_DLL_API KaxCodecSettings : public EbmlUnicodeString {
 	public:

Modified: trunk/libmatroska/src/KaxTrackEntryData.cpp
===================================================================
--- trunk/libmatroska/src/KaxTrackEntryData.cpp	2005-01-31 13:05:20 UTC (rev 1059)
+++ trunk/libmatroska/src/KaxTrackEntryData.cpp	2005-01-31 13:39:28 UTC (rev 1060)
@@ -38,6 +38,13 @@
 
 START_LIBMATROSKA_NAMESPACE
 
+const EbmlSemantic KaxTrackTranslate_ContextList[3] =
+{
+	EbmlSemantic(false, false,KaxTrackTranslateEditionUID::ClassInfos),
+	EbmlSemantic(true , true, KaxTrackTranslateCodec::ClassInfos),
+	EbmlSemantic(true , true, KaxTrackTranslateTrackID::ClassInfos),
+};
+
 EbmlId KaxTrackNumber_TheId            (0xD7, 1);
 EbmlId KaxTrackUID_TheId               (0x73C5, 2);
 EbmlId KaxTrackType_TheId              (0x83, 1);
@@ -55,7 +62,10 @@
 EbmlId KaxCodecPrivate_TheId           (0x63A2, 2);
 EbmlId KaxCodecName_TheId              (0x258688, 3);
 EbmlId KaxTrackOverlay_TheId           (0x6FAB, 2);
-EbmlId KaxTrackAngle_TheId             (0x6F44, 2);
+EbmlId TrackTranslate_TheId            (0x6624, 2);
+EbmlId TrackTranslateEditionUID_TheId  (0x66FC, 2);
+EbmlId TrackTranslateCodec_TheId       (0x66BF, 2);
+EbmlId TrackTranslateTrackID_TheId     (0x66A5, 2);
 #if MATROSKA_VERSION >= 2
 EbmlId KaxTrackFlagEnabled_TheId       (0xB9, 1);
 EbmlId KaxCodecSettings_TheId          (0x3A9697, 3);
@@ -81,7 +91,10 @@
 const EbmlSemanticContext KaxCodecPrivate_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxCodecPrivate::ClassInfos);
 const EbmlSemanticContext KaxCodecName_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxCodecName::ClassInfos);
 const EbmlSemanticContext KaxTrackOverlay_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackOverlay::ClassInfos);
-const EbmlSemanticContext KaxTrackAngle_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackAngle::ClassInfos);
+const EbmlSemanticContext KaxTrackTranslate_Context = EbmlSemanticContext(countof(KaxTrackTranslate_ContextList), KaxTrackTranslate_ContextList, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackTranslate::ClassInfos);
+const EbmlSemanticContext KaxTrackTranslateEditionUID_Context = EbmlSemanticContext(0, NULL, &KaxTrackTranslate_Context, *GetKaxGlobal_Context, &KaxTrackTranslateEditionUID::ClassInfos);
+const EbmlSemanticContext KaxTrackTranslateCodec_Context = EbmlSemanticContext(0, NULL, &KaxTrackTranslate_Context, *GetKaxGlobal_Context, &KaxTrackTranslateCodec::ClassInfos);
+const EbmlSemanticContext KaxTrackTranslateTrackID_Context = EbmlSemanticContext(0, NULL, &KaxTrackTranslate_Context, *GetKaxGlobal_Context, &KaxTrackTranslateTrackID::ClassInfos);
 #if MATROSKA_VERSION >= 2
 const EbmlSemanticContext KaxTrackFlagEnabled_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackFlagEnabled::ClassInfos);
 const EbmlSemanticContext KaxCodecSettings_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxCodecSettings::ClassInfos);
@@ -107,7 +120,10 @@
 const EbmlCallbacks KaxCodecPrivate::ClassInfos(KaxCodecPrivate::Create, KaxCodecPrivate_TheId, "CodecPrivate", KaxCodecPrivate_Context);
 const EbmlCallbacks KaxCodecName::ClassInfos(KaxCodecName::Create, KaxCodecName_TheId, "CodecName", KaxCodecName_Context);
 const EbmlCallbacks KaxTrackOverlay::ClassInfos(KaxTrackOverlay::Create, KaxTrackOverlay_TheId, "TrackOverlay", KaxTrackOverlay_Context);
-const EbmlCallbacks KaxTrackAngle::ClassInfos(KaxTrackAngle::Create, KaxTrackAngle_TheId, "TrackAngle", KaxTrackAngle_Context);
+const EbmlCallbacks KaxTrackTranslate::ClassInfos(KaxTrackTranslate::Create, KaxTrackTranslate_TheId, "TrackTranslate", KaxTrackTranslate_Context);
+const EbmlCallbacks KaxTrackTranslateEditionUID::ClassInfos(KaxTrackTranslateEditionUID::Create, KaxTrackTranslateEditionUID_TheId, "TrackTranslateEditionUID", KaxTrackTranslateEditionUID_Context);
+const EbmlCallbacks KaxTrackTranslateCodec::ClassInfos(KaxTrackTranslateCodec::Create, KaxTrackTranslateCodec_TheId, "TrackTranslateCodec", KaxTrackTranslateCodec_Context);
+const EbmlCallbacks KaxTrackTranslateTrackID::ClassInfos(KaxTrackTranslateTrackID::Create, KaxTrackTranslateTrackID_TheId, "TrackTranslateTrackID", KaxTrackTranslateTrackID_Context);
 #if MATROSKA_VERSION >= 2
 const EbmlCallbacks KaxTrackFlagEnabled::ClassInfos(KaxTrackFlagEnabled::Create, KaxTrackFlagEnabled_TheId, "TrackFlagEnabled", KaxTrackFlagEnabled_Context);
 const EbmlCallbacks KaxCodecSettings::ClassInfos(KaxCodecSettings::Create, KaxCodecSettings_TheId, "CodecSettings", KaxCodecSettings_Context);
@@ -116,4 +132,8 @@
 const EbmlCallbacks KaxCodecDecodeAll::ClassInfos(KaxCodecDecodeAll::Create, KaxCodecDecodeAll_TheId, "CodecDecodeAll", KaxCodecDecodeAll_Context);
 #endif // MATROSKA_VERSION
 
+KaxTrackTranslate::KaxTrackTranslate()
+	:EbmlMaster(KaxTrackTranslate_Context)
+{}
+
 END_LIBMATROSKA_NAMESPACE

Modified: trunk/libmatroska/src/KaxTracks.cpp
===================================================================
--- trunk/libmatroska/src/KaxTracks.cpp	2005-01-31 13:05:20 UTC (rev 1059)
+++ trunk/libmatroska/src/KaxTracks.cpp	2005-01-31 13:39:28 UTC (rev 1060)
@@ -80,7 +80,7 @@
 	EbmlSemantic(true , true, KaxCodecDecodeAll::ClassInfos),
 #endif // MATROSKA_VERSION
 	EbmlSemantic(false, false,KaxTrackOverlay::ClassInfos),
-	EbmlSemantic(false, false,KaxTrackAngle::ClassInfos),
+	EbmlSemantic(false, false,KaxTrackTranslate::ClassInfos),
 	EbmlSemantic(false, true, KaxTrackAudio::ClassInfos),
 	EbmlSemantic(false, true, KaxTrackVideo::ClassInfos),
 	EbmlSemantic(false, true, KaxContentEncodings::ClassInfos),