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

Author: mosu
Date: 2005-01-31 16:48:04 +0300 (Mon, 31 Jan 2005)
New Revision: 1061

Modified:
   trunk/libmatroska/matroska/KaxTrackEntryData.h
   trunk/libmatroska/src/KaxTrackEntryData.cpp
Log:
The usual compilation fixes.

Modified: trunk/libmatroska/matroska/KaxTrackEntryData.h
===================================================================
--- trunk/libmatroska/matroska/KaxTrackEntryData.h	2005-01-31 13:39:28 UTC (rev 1060)
+++ trunk/libmatroska/matroska/KaxTrackEntryData.h	2005-01-31 13:48:04 UTC (rev 1061)
@@ -42,6 +42,7 @@
 #include "ebml/EbmlString.h"
 #include "ebml/EbmlUnicodeString.h"
 #include "ebml/EbmlBinary.h"
+#include "ebml/EbmlMaster.h"
 
 using namespace LIBEBML_NAMESPACE;
 
@@ -281,16 +282,16 @@
 		EbmlElement * Clone() const {return new KaxTrackTranslateEditionUID(*this);}
 };
 
-class MATROSKA_DLL_API KaxTrackTranslateID : public EbmlBinary {
+class MATROSKA_DLL_API KaxTrackTranslateTrackID : public EbmlBinary {
 	public:
-		KaxTrackTranslateID() {}
-		KaxTrackTranslateID(const KaxTrackTranslateID & ElementToClone) :EbmlBinary(ElementToClone){}
-		static EbmlElement & Create() {return *(new KaxTrackTranslateID);}
+		KaxTrackTranslateTrackID() {}
+		KaxTrackTranslateTrackID(const KaxTrackTranslateTrackID & ElementToClone) :EbmlBinary(ElementToClone){}
+		static EbmlElement & Create() {return *(new KaxTrackTranslateTrackID);}
 		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);}
+		EbmlElement * Clone() const {return new KaxTrackTranslateTrackID(*this);}
 };
 
 #if MATROSKA_VERSION >= 2

Modified: trunk/libmatroska/src/KaxTrackEntryData.cpp
===================================================================
--- trunk/libmatroska/src/KaxTrackEntryData.cpp	2005-01-31 13:39:28 UTC (rev 1060)
+++ trunk/libmatroska/src/KaxTrackEntryData.cpp	2005-01-31 13:48:04 UTC (rev 1061)
@@ -62,10 +62,10 @@
 EbmlId KaxCodecPrivate_TheId           (0x63A2, 2);
 EbmlId KaxCodecName_TheId              (0x258688, 3);
 EbmlId KaxTrackOverlay_TheId           (0x6FAB, 2);
-EbmlId TrackTranslate_TheId            (0x6624, 2);
-EbmlId TrackTranslateEditionUID_TheId  (0x66FC, 2);
-EbmlId TrackTranslateCodec_TheId       (0x66BF, 2);
-EbmlId TrackTranslateTrackID_TheId     (0x66A5, 2);
+EbmlId KaxTrackTranslate_TheId         (0x6624, 2);
+EbmlId KaxTrackTranslateEditionUID_TheId(0x66FC, 2);
+EbmlId KaxTrackTranslateCodec_TheId    (0x66BF, 2);
+EbmlId KaxTrackTranslateTrackID_TheId  (0x66A5, 2);
 #if MATROSKA_VERSION >= 2
 EbmlId KaxTrackFlagEnabled_TheId       (0xB9, 1);
 EbmlId KaxCodecSettings_TheId          (0x3A9697, 3);