From e20aa34b4c2edcf3ab93349b0fb87953b40e46db Mon Sep 17 00:00:00 2001 From: Steve Lhomme <slhomme@matroska.org> Date: Sat, 2 Jan 2021 15:14:04 +0100 Subject: [PATCH] generate code with the XLST based spectool --- matroska/KaxSemantic.h | 45 +++--------------------------------------- src/KaxSemantic.cpp | 2 +- 2 files changed, 4 insertions(+), 43 deletions(-) diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h index a59a38c..b7a3dfd 100644 --- a/matroska/KaxSemantic.h +++ b/matroska/KaxSemantic.h @@ -2,9 +2,9 @@ ** DO NOT EDIT, GENERATED WITH DATA2LIB ** https://github.com/Matroska-Org/foundation-source/tree/master/spectool ** -** libmatroska : parse Matroska files, see http://www.matroska.org/ +** libmatroska : parse Matroska files, see https://www.matroska.org/ ** -** Copyright (c) 2002-2017, Matroska (non-profit organisation) +** Copyright (c) 2002-2020, Matroska (non-profit organisation) ** All rights reserved. ** ** This file is part of libmatroska. @@ -47,7 +47,6 @@ using namespace LIBEBML_NAMESPACE; START_LIBMATROSKA_NAMESPACE - DECLARE_MKX_BINARY (KaxSeekID) public: virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() <= 4;} @@ -59,7 +58,6 @@ DECLARE_MKX_UINTEGER(KaxSeekPosition) DECLARE_MKX_MASTER(KaxInfo) }; - DECLARE_MKX_BINARY (KaxSegmentUID) #if defined(HAVE_EBML2) || defined(HAS_EBML2) public: @@ -86,7 +84,6 @@ public: DECLARE_MKX_MASTER(KaxChapterTranslate) }; - DECLARE_MKX_UINTEGER(KaxChapterTranslateEditionUID) }; @@ -120,7 +117,6 @@ DECLARE_MKX_UINTEGER(KaxClusterTimecode) DECLARE_MKX_MASTER(KaxClusterSilentTracks) }; - DECLARE_MKX_UINTEGER(KaxClusterSilentTrackNumber) }; @@ -133,11 +129,9 @@ DECLARE_MKX_UINTEGER(KaxClusterPrevSize) DECLARE_MKX_MASTER(KaxBlockAdditions) }; - DECLARE_MKX_MASTER(KaxBlockMore) }; - DECLARE_MKX_UINTEGER(KaxBlockAddID) }; @@ -164,13 +158,11 @@ DECLARE_MKX_SINTEGER(KaxDiscardPadding) DECLARE_MKX_MASTER(KaxSlices) }; - DECLARE_MKX_MASTER(KaxTimeSlice) public: filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); }; - DECLARE_MKX_UINTEGER(KaxSliceLaceNumber) public: filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); @@ -199,7 +191,6 @@ public: DECLARE_MKX_MASTER(KaxReferenceFrame) }; - DECLARE_MKX_UINTEGER(KaxReferenceOffset) }; @@ -214,7 +205,6 @@ public: DECLARE_MKX_MASTER(KaxTracks) }; - DECLARE_MKX_UINTEGER(KaxTrackNumber) }; @@ -327,7 +317,6 @@ DECLARE_MKX_UINTEGER(KaxSeekPreRoll) DECLARE_MKX_MASTER(KaxTrackTranslate) }; - DECLARE_MKX_UINTEGER(KaxTrackTranslateEditionUID) }; @@ -340,7 +329,6 @@ DECLARE_MKX_BINARY (KaxTrackTranslateTrackID) DECLARE_MKX_MASTER(KaxTrackVideo) }; - DECLARE_MKX_UINTEGER(KaxVideoFlagInterlaced) }; @@ -406,7 +394,6 @@ public: DECLARE_MKX_MASTER(KaxVideoColour) }; - DECLARE_MKX_UINTEGER(KaxVideoColourMatrix) }; @@ -449,7 +436,6 @@ DECLARE_MKX_UINTEGER(KaxVideoColourMaxFALL) DECLARE_MKX_MASTER(KaxVideoColourMasterMeta) }; - DECLARE_MKX_FLOAT(KaxVideoRChromaX) }; @@ -483,7 +469,6 @@ DECLARE_MKX_FLOAT(KaxVideoLuminanceMin) DECLARE_MKX_MASTER(KaxVideoProjection) }; - DECLARE_MKX_UINTEGER(KaxVideoProjectionType) }; @@ -499,11 +484,9 @@ DECLARE_MKX_FLOAT(KaxVideoProjectionPosePitch) DECLARE_MKX_FLOAT(KaxVideoProjectionPoseRoll) }; - DECLARE_MKX_MASTER(KaxTrackAudio) }; - DECLARE_MKX_FLOAT(KaxAudioSamplingFreq) }; @@ -524,15 +507,12 @@ DECLARE_MKX_UINTEGER(KaxAudioBitDepth) DECLARE_MKX_MASTER(KaxTrackOperation) }; - DECLARE_MKX_MASTER(KaxTrackCombinePlanes) }; - DECLARE_MKX_MASTER(KaxTrackPlane) }; - DECLARE_MKX_UINTEGER(KaxTrackPlaneUID) }; @@ -542,7 +522,6 @@ DECLARE_MKX_UINTEGER(KaxTrackPlaneType) DECLARE_MKX_MASTER(KaxTrackJoinBlocks) }; - DECLARE_MKX_UINTEGER(KaxTrackJoinUID) }; @@ -568,11 +547,9 @@ public: DECLARE_MKX_MASTER(KaxContentEncodings) }; - DECLARE_MKX_MASTER(KaxContentEncoding) }; - DECLARE_MKX_UINTEGER(KaxContentEncodingOrder) }; @@ -585,7 +562,6 @@ DECLARE_MKX_UINTEGER(KaxContentEncodingType) DECLARE_MKX_MASTER(KaxContentCompression) }; - DECLARE_MKX_UINTEGER(KaxContentCompAlgo) }; @@ -595,7 +571,6 @@ DECLARE_MKX_BINARY (KaxContentCompSettings) DECLARE_MKX_MASTER(KaxContentEncryption) }; - DECLARE_MKX_UINTEGER(KaxContentEncAlgo) }; @@ -659,15 +634,12 @@ public: filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); }; - DECLARE_MKX_MASTER(KaxAttachments) }; - DECLARE_MKX_MASTER(KaxAttached) }; - DECLARE_MKX_UNISTRING(KaxFileDescription) }; @@ -698,15 +670,12 @@ public: filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); }; - DECLARE_MKX_MASTER(KaxChapters) }; - DECLARE_MKX_MASTER(KaxEditionEntry) }; - DECLARE_MKX_UINTEGER(KaxEditionUID) }; @@ -722,7 +691,6 @@ DECLARE_MKX_UINTEGER(KaxEditionFlagOrdered) DECLARE_MKX_MASTER(KaxChapterAtom) }; - DECLARE_MKX_UINTEGER(KaxChapterUID) }; @@ -755,14 +723,12 @@ DECLARE_MKX_UINTEGER(KaxChapterPhysicalEquiv) DECLARE_MKX_MASTER(KaxChapterTrack) }; - DECLARE_MKX_UINTEGER(KaxChapterTrackNumber) }; DECLARE_MKX_MASTER(KaxChapterDisplay) }; - DECLARE_MKX_UNISTRING(KaxChapterString) }; @@ -778,7 +744,6 @@ DECLARE_MKX_STRING(KaxChapterCountry) DECLARE_MKX_MASTER(KaxChapterProcess) }; - DECLARE_MKX_UINTEGER(KaxChapterProcessCodecID) }; @@ -788,7 +753,6 @@ DECLARE_MKX_BINARY (KaxChapterProcessPrivate) DECLARE_MKX_MASTER(KaxChapterProcessCommand) }; - DECLARE_MKX_UINTEGER(KaxChapterProcessTime) }; @@ -798,15 +762,12 @@ DECLARE_MKX_BINARY (KaxChapterProcessData) DECLARE_MKX_MASTER(KaxTags) }; - DECLARE_MKX_MASTER(KaxTag) }; - DECLARE_MKX_MASTER(KaxTagTargets) }; - DECLARE_MKX_UINTEGER(KaxTagTargetTypeValue) }; @@ -828,7 +789,6 @@ DECLARE_MKX_UINTEGER(KaxTagAttachmentUID) DECLARE_MKX_MASTER(KaxTagSimple) }; - DECLARE_MKX_UNISTRING(KaxTagName) }; @@ -847,6 +807,7 @@ DECLARE_MKX_UNISTRING(KaxTagString) DECLARE_MKX_BINARY (KaxTagBinary) }; + END_LIBMATROSKA_NAMESPACE #endif // LIBMATROSKA_SEMANTIC_H diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp index f58be60..eb239b7 100644 --- a/src/KaxSemantic.cpp +++ b/src/KaxSemantic.cpp @@ -2,7 +2,7 @@ ** DO NOT EDIT, GENERATED WITH schema_2_kaxsemantic_cpp.xsl ** https://github.com/Matroska-Org/foundation-source/tree/master/spectool ** -** libmatroska : parse Matroska files, see http://www.matroska.org/ +** libmatroska : parse Matroska files, see https://www.matroska.org/ ** ** Copyright (c) 2002-2020, Matroska (non-profit organisation) ** All rights reserved. -- 2.40.0