From: Moritz Bunkus <moritz@bunkus.org>
Date: Mon, 24 Sep 2012 21:39:23 +0000 (+0000)
Subject: Make CueDuration a child of CueTrackPositions
X-Git-Tag: release-1.4.0~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f3f33bf6f6ad4264f587ff79f49491e4057e8d5;p=libmatroska

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 db7f65c..93ffb85 100644
--- 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 70d2ecc..1dae55c 100644
--- a/src/KaxSemantic.cpp
+++ b/src/KaxSemantic.cpp
@@ -476,23 +476,18 @@ DEFINE_MKX_MASTER(KaxCues, 0x1C53BB6B, 4, KaxSegment, "Cues");
 
 DEFINE_START_SEMANTIC(KaxCuePoint)
 DEFINE_SEMANTIC_ITEM(true, true, KaxCueTime)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxCueDuration)
-#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(true, false, KaxCueTrackPositions)
 DEFINE_END_SEMANTIC(KaxCuePoint)
 
 DEFINE_MKX_MASTER(KaxCuePoint, 0xBB, 1, KaxCues, "CuePoint");
 DEFINE_MKX_UINTEGER(KaxCueTime, 0xB3, 1, KaxCuePoint, "CueTime");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER(KaxCueDuration, 0xB2, 1, KaxCuePoint, "CueDuration");
-#endif
 
 DEFINE_START_SEMANTIC(KaxCueTrackPositions)
 DEFINE_SEMANTIC_ITEM(true, true, KaxCueTrack)
 DEFINE_SEMANTIC_ITEM(true, true, KaxCueClusterPosition)
 #if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(false, true, KaxCueRelativePosition)
+DEFINE_SEMANTIC_ITEM(false, true, KaxCueDuration)
 #endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(false, true, KaxCueBlockNumber)
 #if MATROSKA_VERSION >= 2
@@ -506,6 +501,7 @@ DEFINE_MKX_UINTEGER(KaxCueTrack, 0xF7, 1, KaxCueTrackPositions, "CueTrack");
 DEFINE_MKX_UINTEGER(KaxCueClusterPosition, 0xF1, 1, KaxCueTrackPositions, "CueClusterPosition");
 #if MATROSKA_VERSION >= 2
 DEFINE_MKX_UINTEGER(KaxCueRelativePosition, 0xF0, 1, KaxCueTrackPositions, "CueRelativePosition");
+DEFINE_MKX_UINTEGER(KaxCueDuration, 0xB2, 1, KaxCueTrackPositions, "CueDuration");
 #endif
 DEFINE_MKX_UINTEGER_DEF(KaxCueBlockNumber, 0x5378, 2, KaxCueTrackPositions, "CueBlockNumber", 1);
 #if MATROSKA_VERSION >= 2