Merge pull request #203 from robUx4/1x-no-trackoverlay

[1.x] deprecate TrackOverlay
Matroska-Org · Jan 25, 2025 · 11e35f9 · 11e35f9
2 parents a380c2d + b149fd3
commit 11e35f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h
@@ -341,6 +341,8 @@ DECLARE_MKX_UINTEGER(KaxCodecDecodeAll)
 };
 
 DECLARE_MKX_UINTEGER(KaxTrackOverlay)
+public:
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override;
 };
 
 DECLARE_MKX_UINTEGER(KaxCodecDelay)

diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp
@@ -244,7 +244,7 @@ DEFINE_SEMANTIC_ITEM(false, true, KaxCodecSettings) // not supported
 DEFINE_SEMANTIC_ITEM(false, false, KaxCodecInfoURL) // not supported
 DEFINE_SEMANTIC_ITEM(false, false, KaxCodecDownloadURL) // not supported
 DEFINE_SEMANTIC_ITEM(true, true, KaxCodecDecodeAll) // not supported
-DEFINE_SEMANTIC_ITEM(false, false, KaxTrackOverlay)
+DEFINE_SEMANTIC_ITEM(false, false, KaxTrackOverlay) // not supported
 DEFINE_SEMANTIC_ITEM(true, true, KaxCodecDelay)
 DEFINE_SEMANTIC_ITEM(true, true, KaxSeekPreRoll)
 DEFINE_SEMANTIC_ITEM(false, false, KaxTrackTranslate)
@@ -877,6 +877,11 @@ filepos_t KaxCodecDecodeAll::RenderData(IOCallback & /* output */, bool /* bForc
   return 0;
 }
 
+filepos_t KaxTrackOverlay::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+  assert(false); // no you are not allowed to use this element !
+  return 0;
+}
+
 filepos_t KaxOldStereoMode::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
   assert(false); // no you are not allowed to use this element !
   return 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -341,6 +341,8 @@ DECLARE_MKX_UINTEGER(KaxCodecDecodeAll) @@
     };
     DECLARE_MKX_UINTEGER(KaxTrackOverlay)
+    public:
+      filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) override;
     };
     DECLARE_MKX_UINTEGER(KaxCodecDelay)
@@ Expand Down @@