From: Moritz Bunkus Date: Sat, 27 Jun 2020 09:23:25 +0000 (+0200) Subject: allow KaxChapterTranslate* to be written again X-Git-Tag: release-1.6.0~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ef2af8def9935c2cd670f30b2eb1a13c6f2ce45;p=libmatroska allow KaxChapterTranslate* to be written again Merging PR #33 was supposed to only prevent writing of KaxFileUsed{Start,End}Time. Unfortunately git make a mess of it in 5ba4db4449507e32ff78bbec71c58a6d6065c419 where KaxSemantic.cpp was correct but the change to KaxSemantic.h was written at the wrong position, accidentally disabling writing for KaxChapterTranslate* I didn't realize this, fixed the situation for KaxFileUsed* in 2be299cd6617427fe5c89f1894a9d91fd9e2ed08 and made the situation worse for KaxChapterTranslate* in b21e0d395d9f0e94e94008a5d685cead6fa45cac. This commit restores the functionality for KaxChapterTranslate* while still leaving KaxFileUsed* disabled. --- diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h index fc7f87e..a59a38c 100644 --- a/matroska/KaxSemantic.h +++ b/matroska/KaxSemantic.h @@ -88,13 +88,9 @@ DECLARE_MKX_MASTER(KaxChapterTranslate) DECLARE_MKX_UINTEGER(KaxChapterTranslateEditionUID) -public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); }; DECLARE_MKX_UINTEGER(KaxChapterTranslateCodec) -public: - filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault); }; DECLARE_MKX_BINARY (KaxChapterTranslateID) diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp index dc962ea..3cefb11 100644 --- a/src/KaxSemantic.cpp +++ b/src/KaxSemantic.cpp @@ -851,14 +851,4 @@ filepos_t KaxFileUsedEndTime::RenderData(IOCallback & /* output */, bool /* bFor return 0; } -filepos_t KaxChapterTranslateEditionUID::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) { - assert(false); // no you are not allowed to use this element ! - return 0; -} - -filepos_t KaxChapterTranslateCodec::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) { - assert(false); // no you are not allowed to use this element ! - return 0; -} - END_LIBMATROSKA_NAMESPACE