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

Author: robux4
Date: 2004-10-02 20:02:48 +0400 (Sat, 02 Oct 2004)
New Revision: 857

Modified:
   trunk/libmatroska/matroska/KaxTrackEntryData.h
   trunk/libmatroska/src/KaxTrackEntryData.cpp
   trunk/libmatroska/src/KaxTracks.cpp
Log:
added KaxTrackAngle and various fixes

Modified: trunk/libmatroska/matroska/KaxTrackEntryData.h
===================================================================
--- trunk/libmatroska/matroska/KaxTrackEntryData.h	2004-10-02 15:42:37 UTC (rev 856)
+++ trunk/libmatroska/matroska/KaxTrackEntryData.h	2004-10-02 16:02:48 UTC (rev 857)
@@ -215,6 +215,28 @@
 		EbmlElement * Clone() const {return new KaxCodecName(*this);}
 };
 
+class MATROSKA_DLL_API KaxTrackOverlay : public EbmlUInteger {
+	public:
+		KaxTrackOverlay() {}
+		KaxTrackOverlay(const KaxTrackOverlay & ElementToClone) :EbmlUInteger(ElementToClone) {}
+		static EbmlElement & Create() {return *(new KaxTrackOverlay);}
+		const EbmlCallbacks & Generic() const {return ClassInfos;}
+		static const EbmlCallbacks ClassInfos;
+		operator const EbmlId &() const {return ClassInfos.GlobalId;}
+		EbmlElement * Clone() const {return new KaxTrackOverlay(*this);}
+};
+
+class MATROSKA_DLL_API KaxTrackAngle : public EbmlUInteger {
+	public:
+		KaxTrackAngle() : EbmlUInteger(1) {}
+		KaxTrackAngle(const KaxTrackAngle & ElementToClone) :EbmlUInteger(ElementToClone) {}
+		static EbmlElement & Create() {return *(new KaxTrackAngle);}
+		const EbmlCallbacks & Generic() const {return ClassInfos;}
+		static const EbmlCallbacks ClassInfos;
+		operator const EbmlId &() const {return ClassInfos.GlobalId;}
+		EbmlElement * Clone() const {return new KaxTrackAngle(*this);}
+};
+
 #if MATROSKA_VERSION >= 2
 class MATROSKA_DLL_API KaxCodecSettings : public EbmlUnicodeString {
 	public:
@@ -259,17 +281,6 @@
 		operator const EbmlId &() const {return ClassInfos.GlobalId;}
 		EbmlElement * Clone() const {return new KaxCodecDecodeAll(*this);}
 };
-
-class MATROSKA_DLL_API KaxTrackOverlay : public EbmlUInteger {
-	public:
-		KaxTrackOverlay() {}
-		KaxTrackOverlay(const KaxTrackOverlay & ElementToClone) :EbmlUInteger(ElementToClone) {}
-		static EbmlElement & Create() {return *(new KaxTrackOverlay);}
-		const EbmlCallbacks & Generic() const {return ClassInfos;}
-		static const EbmlCallbacks ClassInfos;
-		operator const EbmlId &() const {return ClassInfos.GlobalId;}
-		EbmlElement * Clone() const {return new KaxTrackOverlay(*this);}
-};
 #endif // MATROSKA_VERSION
 
 END_LIBMATROSKA_NAMESPACE

Modified: trunk/libmatroska/src/KaxTrackEntryData.cpp
===================================================================
--- trunk/libmatroska/src/KaxTrackEntryData.cpp	2004-10-02 15:42:37 UTC (rev 856)
+++ trunk/libmatroska/src/KaxTrackEntryData.cpp	2004-10-02 16:02:48 UTC (rev 857)
@@ -52,13 +52,14 @@
 EbmlId KaxCodecID_TheId                (0x86, 1);
 EbmlId KaxCodecPrivate_TheId           (0x63A2, 2);
 EbmlId KaxCodecName_TheId              (0x258688, 3);
+EbmlId KaxTrackOverlay_TheId           (0x6FAB, 2);
+EbmlId KaxTrackAngle_TheId             (0x6F44, 2);
 #if MATROSKA_VERSION >= 2
 EbmlId KaxTrackFlagEnabled_TheId       (0xB9, 1);
 EbmlId KaxCodecSettings_TheId          (0x3A9697, 3);
 EbmlId KaxCodecInfoURL_TheId           (0x3B4040, 3);
 EbmlId KaxCodecDownloadURL_TheId       (0x26B240, 3);
 EbmlId KaxCodecDecodeAll_TheId         (0xAA, 1);
-EbmlId KaxTrackOverlay_TheId           (0x6FAB, 2);
 #endif // MATROSKA_VERSION
 
 const EbmlSemanticContext KaxTrackNumber_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackNumber::ClassInfos);
@@ -75,13 +76,14 @@
 const EbmlSemanticContext KaxCodecID_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxCodecID::ClassInfos);
 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);
 #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);
 const EbmlSemanticContext KaxCodecInfoURL_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxCodecInfoURL::ClassInfos);
 const EbmlSemanticContext KaxCodecDownloadURL_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxCodecDownloadURL::ClassInfos);
 const EbmlSemanticContext KaxCodecDecodeAll_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxCodecDecodeAll::ClassInfos);
-const EbmlSemanticContext KaxTrackOverlay_Context = EbmlSemanticContext(0, NULL, &KaxTracks_Context, *GetKaxGlobal_Context, &KaxTrackOverlay::ClassInfos);
 #endif // MATROSKA_VERSION
 
 const EbmlCallbacks KaxTrackNumber::ClassInfos(KaxTrackNumber::Create, KaxTrackNumber_TheId, "TrackNumber", KaxTrackNumber_Context);
@@ -98,13 +100,14 @@
 const EbmlCallbacks KaxCodecID::ClassInfos(KaxCodecID::Create, KaxCodecID_TheId, "CodecID", KaxCodecID_Context);
 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);
 #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);
 const EbmlCallbacks KaxCodecInfoURL::ClassInfos(KaxCodecInfoURL::Create, KaxCodecInfoURL_TheId, "CodecInfoURL", KaxCodecInfoURL_Context);
 const EbmlCallbacks KaxCodecDownloadURL::ClassInfos(KaxCodecDownloadURL::Create, KaxCodecDownloadURL_TheId, "CodecDownloadURL", KaxCodecDownloadURL_Context);
 const EbmlCallbacks KaxCodecDecodeAll::ClassInfos(KaxCodecDecodeAll::Create, KaxCodecDecodeAll_TheId, "CodecDecodeAll", KaxCodecDecodeAll_Context);
-const EbmlCallbacks KaxTrackOverlay::ClassInfos(KaxTrackOverlay::Create, KaxTrackOverlay_TheId, "TrackOverlay", KaxTrackOverlay_Context);
 #endif // MATROSKA_VERSION
 
 END_LIBMATROSKA_NAMESPACE

Modified: trunk/libmatroska/src/KaxTracks.cpp
===================================================================
--- trunk/libmatroska/src/KaxTracks.cpp	2004-10-02 15:42:37 UTC (rev 856)
+++ trunk/libmatroska/src/KaxTracks.cpp	2004-10-02 16:02:48 UTC (rev 857)
@@ -49,9 +49,9 @@
 };
 
 #if MATROSKA_VERSION == 1
-const EbmlSemantic KaxTrackEntry_ContextList[17] =
+const EbmlSemantic KaxTrackEntry_ContextList[19] =
 #else // MATROSKA_VERSION
-const EbmlSemantic KaxTrackEntry_ContextList[23] =
+const EbmlSemantic KaxTrackEntry_ContextList[24] =
 #endif // MATROSKA_VERSION
 {
 	EbmlSemantic(true , true, KaxTrackNumber::ClassInfos),
@@ -78,6 +78,7 @@
 	EbmlSemantic(true , true, KaxCodecDecodeAll::ClassInfos),
 #endif // MATROSKA_VERSION
 	EbmlSemantic(false, false,KaxTrackOverlay::ClassInfos),
+	EbmlSemantic(false, false,KaxTrackAngle::ClassInfos),
 	EbmlSemantic(false, true, KaxTrackAudio::ClassInfos),
 	EbmlSemantic(false, true, KaxTrackVideo::ClassInfos),
 	EbmlSemantic(false, true, KaxContentEncodings::ClassInfos),