KaxSemantic: reorder elements to match the code generation and EBML Schema

Affected elements:
* KaxChapterTranslateID
* KaxChapterTranslateEditionUID
* KaxChapterTranslateCodec

* KaxBlockAdditional
* KaxBlockAddID

* KaxTrackTranslateTrackID
* KaxTrackTranslateEditionUID
* KaxTrackTranslateCodec

diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h
index 3459003f576fef8ba19094c033376feb0a827492..b1e1264f58d0813d9b0b98864d3ca0d07e2f9cfd 100644 (file)
--- a/matroska/KaxSemantic.h
+++ b/matroska/KaxSemantic.h
@@ -84,13 +84,13 @@ public:
 DECLARE_MKX_MASTER(KaxChapterTranslate)
 };
 
-DECLARE_MKX_UINTEGER(KaxChapterTranslateEditionUID)
+DECLARE_MKX_BINARY (KaxChapterTranslateID)
 };
 
 DECLARE_MKX_UINTEGER(KaxChapterTranslateCodec)
 };
 
-DECLARE_MKX_BINARY (KaxChapterTranslateID)
+DECLARE_MKX_UINTEGER(KaxChapterTranslateEditionUID)
 };
 
 DECLARE_MKX_UINTEGER(KaxTimecodeScale)
@@ -138,10 +138,10 @@ DECLARE_MKX_MASTER(KaxBlockAdditions)
 DECLARE_MKX_MASTER(KaxBlockMore)
 };
 
-DECLARE_MKX_UINTEGER(KaxBlockAddID)
+DECLARE_MKX_BINARY (KaxBlockAdditional)
 };
 
-DECLARE_MKX_BINARY (KaxBlockAdditional)
+DECLARE_MKX_UINTEGER(KaxBlockAddID)
 };
 
 DECLARE_MKX_UINTEGER(KaxBlockDuration)
@@ -350,13 +350,13 @@ DECLARE_MKX_UINTEGER(KaxSeekPreRoll)
 DECLARE_MKX_MASTER(KaxTrackTranslate)
 };
 
-DECLARE_MKX_UINTEGER(KaxTrackTranslateEditionUID)
+DECLARE_MKX_BINARY (KaxTrackTranslateTrackID)
 };
 
 DECLARE_MKX_UINTEGER(KaxTrackTranslateCodec)
 };
 
-DECLARE_MKX_BINARY (KaxTrackTranslateTrackID)
+DECLARE_MKX_UINTEGER(KaxTrackTranslateEditionUID)
 };
 
 DECLARE_MKX_MASTER(KaxTrackVideo)

diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp
index b9d3975b91fc1ca6f271d6a5e5e0e87de5b8772b..ef9bb00d6c955721300fdd9a15b56dbf62ba5a8b 100644 (file)
--- a/src/KaxSemantic.cpp
+++ b/src/KaxSemantic.cpp
@@ -97,9 +97,9 @@ DEFINE_MKX_UNISTRING(KaxNextFilename, 0x3E83BB, 3, KaxInfo, "NextFilename")
 DEFINE_MKX_BINARY (KaxSegmentFamily, 0x4444, 2, KaxInfo, "SegmentFamily")
 
 DEFINE_START_SEMANTIC(KaxChapterTranslate)
-DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslateEditionUID)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTranslateCodec)
 DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTranslateID)
+DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTranslateCodec)
+DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslateEditionUID)
 DEFINE_END_SEMANTIC(KaxChapterTranslate)
 
 DEFINE_MKX_MASTER(KaxChapterTranslate, 0x6924, 2, KaxInfo, "ChapterTranslate")
@@ -161,13 +161,13 @@ DEFINE_END_SEMANTIC(KaxBlockAdditions)
 DEFINE_MKX_MASTER(KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup, "BlockAdditions")
 
 DEFINE_START_SEMANTIC(KaxBlockMore)
-DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAddID)
 DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAdditional)
+DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAddID)
 DEFINE_END_SEMANTIC(KaxBlockMore)
 
 DEFINE_MKX_MASTER(KaxBlockMore, 0xA6, 1, KaxBlockAdditions, "BlockMore")
-DEFINE_MKX_UINTEGER_DEF(KaxBlockAddID, 0xEE, 1, KaxBlockMore, "BlockAddID", 1)
 DEFINE_MKX_BINARY (KaxBlockAdditional, 0xA5, 1, KaxBlockMore, "BlockAdditional")
+DEFINE_MKX_UINTEGER_DEF(KaxBlockAddID, 0xEE, 1, KaxBlockMore, "BlockAddID", 1)
 DEFINE_MKX_UINTEGER(KaxBlockDuration, 0x9B, 1, KaxBlockGroup, "BlockDuration")
 DEFINE_MKX_UINTEGER_DEF(KaxReferencePriority, 0xFA, 1, KaxBlockGroup, "FlagReferenced", 0)
 DEFINE_MKX_SINTEGER_CONS(KaxReferenceBlock, 0xFB, 1, KaxBlockGroup, "ReferenceBlock")
@@ -308,15 +308,15 @@ DEFINE_MKX_UINTEGER_DEF(KaxCodecDelay, 0x56AA, 2, KaxTrackEntry, "CodecDelay", 0
 DEFINE_MKX_UINTEGER_DEF(KaxSeekPreRoll, 0x56BB, 2, KaxTrackEntry, "SeekPreRoll", 0)
 
 DEFINE_START_SEMANTIC(KaxTrackTranslate)
-DEFINE_SEMANTIC_ITEM(false, false, KaxTrackTranslateEditionUID)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackTranslateCodec)
 DEFINE_SEMANTIC_ITEM(true, true, KaxTrackTranslateTrackID)
+DEFINE_SEMANTIC_ITEM(true, true, KaxTrackTranslateCodec)
+DEFINE_SEMANTIC_ITEM(false, false, KaxTrackTranslateEditionUID)
 DEFINE_END_SEMANTIC(KaxTrackTranslate)
 
 DEFINE_MKX_MASTER(KaxTrackTranslate, 0x6624, 2, KaxTrackEntry, "TrackTranslate")
-DEFINE_MKX_UINTEGER(KaxTrackTranslateEditionUID, 0x66FC, 2, KaxTrackTranslate, "TrackTranslateEditionUID")
-DEFINE_MKX_UINTEGER(KaxTrackTranslateCodec, 0x66BF, 2, KaxTrackTranslate, "TrackTranslateCodec")
 DEFINE_MKX_BINARY (KaxTrackTranslateTrackID, 0x66A5, 2, KaxTrackTranslate, "TrackTranslateTrackID")
+DEFINE_MKX_UINTEGER(KaxTrackTranslateCodec, 0x66BF, 2, KaxTrackTranslate, "TrackTranslateCodec")
+DEFINE_MKX_UINTEGER(KaxTrackTranslateEditionUID, 0x66FC, 2, KaxTrackTranslate, "TrackTranslateEditionUID")
 
 DEFINE_START_SEMANTIC(KaxTrackVideo)
 DEFINE_SEMANTIC_ITEM(true, true, KaxVideoFlagInterlaced)