don't export EbmlMaster semantic context as a DLL entry

It's accessible via GetContextMaster().
Matroska-Org · Mar 2, 2024 · ed1948b · ed1948b
1 parent 2b4a0ca
commit ed1948b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/matroska/KaxContexts.h b/matroska/KaxContexts.h
@@ -13,22 +13,23 @@
 
 namespace libmatroska {
 
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxMatroska;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxSegment;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxAttachments;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxAttached;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxChapters;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxCluster;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxTags;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxTag;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxBlockGroup;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxCues;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxInfo;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxSeekHead;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxTracks;
-extern const libebml::EbmlSemanticContext MATROSKA_DLL_API Context_KaxTrackEntry;
-
-extern MATROSKA_DLL_API const libebml::EbmlSemanticContext & GetKaxGlobal_Context();
+extern const libebml::EbmlSemanticContextMaster MATROSKA_DLL_API Context_KaxMatroska;
+
+#define Context_KaxSegment      EBML_CLASS_CONTEXT(KaxSegment)
+#define Context_KaxAttachments  EBML_CLASS_CONTEXT(KaxAttachments)
+#define Context_KaxAttached     EBML_CLASS_CONTEXT(KaxAttached)
+#define Context_KaxChapters     EBML_CLASS_CONTEXT(KaxChapters)
+#define Context_KaxCluster      EBML_CLASS_CONTEXT(KaxCluster)
+#define Context_KaxTags         EBML_CLASS_CONTEXT(KaxTags)
+#define Context_KaxTag          EBML_CLASS_CONTEXT(KaxTag)
+#define Context_KaxBlockGroup   EBML_CLASS_CONTEXT(KaxBlockGroup)
+#define Context_KaxCues         EBML_CLASS_CONTEXT(KaxCues)
+#define Context_KaxInfo         EBML_CLASS_CONTEXT(KaxInfo)
+#define Context_KaxSeekHead     EBML_CLASS_CONTEXT(KaxSeekHead)
+#define Context_KaxTracks       EBML_CLASS_CONTEXT(KaxTracks)
+#define Context_KaxTrackEntry   EBML_CLASS_CONTEXT(KaxTrackEntry)
+
+extern MATROSKA_DLL_API const libebml::EbmlSemanticContextMaster & GetKaxGlobal_Context();
 
 } // namespace libmatroska
 

diff --git a/src/KaxContexts.cpp b/src/KaxContexts.cpp
@@ -32,7 +32,7 @@ DEFINE_SEMANTIC_CONTEXT(KaxCluster)
 DEFINE_SEMANTIC_CONTEXT(KaxTrackEntry)
 
 // for the moment
-const EbmlSemanticContext & GetKaxGlobal_Context()
+const EbmlSemanticContextMaster & GetKaxGlobal_Context()
 {
   return GetEbmlGlobal_Context();
 }