Make CueDuration a child of CueTrackPositions

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@862 a6f86f6d-0131-4f8e-9e7b-e335508773d5

diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h
index db7f65ce330966b4e138f7d368a828040958efbb..93ffb8565a1f0f78e76464688341918e7b69b0b4 100644 (file)
--- a/matroska/KaxSemantic.h
+++ b/matroska/KaxSemantic.h
@@ -502,11 +502,6 @@ DECLARE_MKX_UINTEGER(KaxContentSigHashAlgo)
 DECLARE_MKX_UINTEGER(KaxCueTime)
 };
 
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_UINTEGER(KaxCueDuration)
-};
-#endif
-
 DECLARE_MKX_UINTEGER(KaxCueTrack)
 };
 
@@ -516,6 +511,9 @@ DECLARE_MKX_UINTEGER(KaxCueClusterPosition)
 #if MATROSKA_VERSION >= 2
 DECLARE_MKX_UINTEGER(KaxCueRelativePosition)
 };
+
+DECLARE_MKX_UINTEGER(KaxCueDuration)
+};
 #endif
 
 DECLARE_MKX_UINTEGER(KaxCueBlockNumber)

diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp
index 70d2ecccc7050726d2909b86c73b62be0bc8f6c1..1dae55c65120bcc3c8c85efbfda8bd79e9547d21 100644 (file)
--- a/src/KaxSemantic.cpp
+++ b/src/KaxSemantic.cpp
@@ -476,23 +476,18 @@ DEFINE_MKX_MASTER(KaxCues, 0x1C53BB6B, 4, KaxSegment, "Cues");
 \r
 DEFINE_START_SEMANTIC(KaxCuePoint)\r
 DEFINE_SEMANTIC_ITEM(true, true, KaxCueTime)\r
-#if MATROSKA_VERSION >= 2\r
-DEFINE_SEMANTIC_ITEM(false, true, KaxCueDuration)\r
-#endif // MATROSKA_VERSION\r
 DEFINE_SEMANTIC_ITEM(true, false, KaxCueTrackPositions)\r
 DEFINE_END_SEMANTIC(KaxCuePoint)\r
 \r
 DEFINE_MKX_MASTER(KaxCuePoint, 0xBB, 1, KaxCues, "CuePoint");\r
 DEFINE_MKX_UINTEGER(KaxCueTime, 0xB3, 1, KaxCuePoint, "CueTime");\r
-#if MATROSKA_VERSION >= 2\r
-DEFINE_MKX_UINTEGER(KaxCueDuration, 0xB2, 1, KaxCuePoint, "CueDuration");\r
-#endif\r
 \r
 DEFINE_START_SEMANTIC(KaxCueTrackPositions)\r
 DEFINE_SEMANTIC_ITEM(true, true, KaxCueTrack)\r
 DEFINE_SEMANTIC_ITEM(true, true, KaxCueClusterPosition)\r
 #if MATROSKA_VERSION >= 2\r
 DEFINE_SEMANTIC_ITEM(false, true, KaxCueRelativePosition)\r
+DEFINE_SEMANTIC_ITEM(false, true, KaxCueDuration)\r
 #endif // MATROSKA_VERSION\r
 DEFINE_SEMANTIC_ITEM(false, true, KaxCueBlockNumber)\r
 #if MATROSKA_VERSION >= 2\r
@@ -506,6 +501,7 @@ DEFINE_MKX_UINTEGER(KaxCueTrack, 0xF7, 1, KaxCueTrackPositions, "CueTrack");
 DEFINE_MKX_UINTEGER(KaxCueClusterPosition, 0xF1, 1, KaxCueTrackPositions, "CueClusterPosition");\r
 #if MATROSKA_VERSION >= 2\r
 DEFINE_MKX_UINTEGER(KaxCueRelativePosition, 0xF0, 1, KaxCueTrackPositions, "CueRelativePosition");\r
+DEFINE_MKX_UINTEGER(KaxCueDuration, 0xB2, 1, KaxCueTrackPositions, "CueDuration");\r
 #endif\r
 DEFINE_MKX_UINTEGER_DEF(KaxCueBlockNumber, 0x5378, 2, KaxCueTrackPositions, "CueBlockNumber", 1);\r
 #if MATROSKA_VERSION >= 2\r