From: Steve Lhomme <slhomme@matroska.org>
Date: Mon, 5 Apr 2010 16:36:03 +0000 (+0000)
Subject: no need to rename contexts that are not exported
X-Git-Tag: release-0.9.0~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4071a63a5d619846fab4b6b065861139ac3395a3;p=libmatroska

no need to rename contexts that are not exported

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@72 a6f86f6d-0131-4f8e-9e7b-e335508773d5
---

diff --git a/matroska/KaxContexts.h b/matroska/KaxContexts.h
index e5e8381..11b7f69 100644
--- a/matroska/KaxContexts.h
+++ b/matroska/KaxContexts.h
@@ -83,61 +83,17 @@ extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackOverlay_Context;
 #define Context_KaxSegment               KaxSegment_Context
 #define Context_KaxTrackEntry            KaxTrackEntry_Context
 #define Context_KaxTracks                KaxTracks_Context
-#define Context_KaxTrackVideo            KaxTrackVideo_Context
 #define Context_KaxCluster               KaxCluster_Context
-#define Context_KaxBlockMore             KaxBlockMore_Context
-#define Context_KaxBlockAdditions        KaxBlockAdditions_Context
 #define Context_KaxBlockGroup            KaxBlockGroup_Context
-#define Context_KaxTimeSlice             KaxTimeSlice_Context
-#define Context_KaxSlices                KaxSlices_Context
-#define Context_KaxContentEncoding       KaxContentEncoding_Context
-#define Context_KaxContentEncodings      KaxContentEncodings_Context
-#define Context_KaxContentCompression    KaxContentCompression_Context
-#define Context_KaxContentEncryption     KaxContentEncryption_Context
 #define Context_KaxInfo                  KaxInfo_Context
-#define Context_KaxChapterTranslate      KaxChapterTranslate_Context
-#define Context_KaxTrackAudio            KaxTrackAudio_Context
-#define Context_KaxTrackTranslate        KaxTrackTranslate_Context
 #define Context_KaxAttached              KaxAttached_Context
 #define Context_KaxAttachments           KaxAttachments_Context
-#define Context_KaxEditionEntry          KaxEditionEntry_Context
 #define Context_KaxChapters              KaxChapters_Context
-#define Context_KaxChapterAtom           KaxChapterAtom_Context
-#define Context_KaxChapterTrack          KaxChapterTrack_Context
-#define Context_KaxChapterDisplay        KaxChapterDisplay_Context
-#define Context_KaxChapterProcess        KaxChapterProcess_Context
-#define Context_KaxChapterProcessCommand KaxChapterProcessCommand_Context
-#define Context_KaxClusterSilentTracks   KaxClusterSilentTracks_Context
 #define Context_KaxCues                  KaxCues_Context
-#define Context_KaxCuePoint              KaxCuePoint_Context
-#define Context_KaxCueTrackPositions     KaxCueTrackPositions_Context
-#define Context_KaxCueReference          KaxCueReference_Context
-#define Context_KaxSeek                  KaxSeek_Context
 #define Context_KaxTags                  KaxTags_Context
 #define Context_KaxSeekHead              KaxSeekHead_Context
-#define Context_KaxTagGeneral            KaxTagGeneral_Context
-#define Context_KaxTagAudioSpecific      KaxTagAudioSpecific_Context
-#define Context_KaxTagImageSpecific      KaxTagImageSpecific_Context
-#define Context_KaxTagGenres             KaxTagGenres_Context
-#define Context_KaxTagTargets            KaxTagTargets_Context
 #define Context_KaxTag                   KaxTag_Context
-#define Context_KaxTagSimple             KaxTagSimple_Context
-#define Context_KaxTagMultiComment       KaxTagMultiComment_Context
-#define Context_KaxTagMultiCommercial    KaxTagMultiCommercial_Context
 #define Context_KaxTagCommercial         KaxTagCommercial_Context
-#define Context_KaxTagMultiPrice         KaxTagMultiPrice_Context
-#define Context_KaxTagMultiDate          KaxTagMultiDate_Context
-#define Context_KaxTagDate               KaxTagDate_Context
-#define Context_KaxTagMultiEntity        KaxTagMultiEntity_Context
-#define Context_KaxTagEntity             KaxTagEntity_Context
-#define Context_KaxTagMultiLegal         KaxTagMultiLegal_Context
-#define Context_KaxTagLegal              KaxTagLegal_Context
-#define Context_KaxTagMultiIdentifier    KaxTagMultiIdentifier_Context
-#define Context_KaxTagIdentifier         KaxTagIdentifier_Context
-#define Context_KaxTagMultiTitle         KaxTagMultiTitle_Context
-#define Context_KaxTagTitle              KaxTagTitle_Context
-#define Context_KaxTagMultiAttachment    KaxTagMultiAttachment_Context
-#define Context_KaxTagAttachment         KaxTagAttachment_Context
 
 extern const EbmlSemanticContext & MATROSKA_DLL_API GetKaxGlobal_Context();
 //extern const EbmlSemanticContext & MATROSKA_DLL_API GetKaxTagsGlobal_Context();
diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp
index 078ddf9..35f96af 100644
--- a/src/KaxBlock.cpp
+++ b/src/KaxBlock.cpp
@@ -144,17 +144,17 @@ KaxBlockGroup::~KaxBlockGroup()
 }
 
 KaxBlockGroup::KaxBlockGroup()
- :EbmlMaster(KaxBlockGroup_Context)
+ :EbmlMaster(Context_KaxBlockGroup)
  ,ParentCluster(NULL)
  ,ParentTrack(NULL)
 {}
 
 KaxBlockAdditions::KaxBlockAdditions()
- :EbmlMaster(KaxBlockAdditions_Context)
+ :EbmlMaster(Context_KaxBlockAdditions)
 {}
 
 KaxBlockMore::KaxBlockMore()
- :EbmlMaster(KaxBlockMore_Context)
+ :EbmlMaster(Context_KaxBlockMore)
 {}
 
 /*!
diff --git a/src/KaxBlockData.cpp b/src/KaxBlockData.cpp
index 8236988..678fa4c 100644
--- a/src/KaxBlockData.cpp
+++ b/src/KaxBlockData.cpp
@@ -70,11 +70,11 @@ DEFINE_MKX_UINTEGER(KaxReferenceVirtual,  0xFD, 1, KaxBlockGroup, "ReferenceVirt
 
 
 KaxSlices::KaxSlices()
- :EbmlMaster(KaxSlices_Context)
+ :EbmlMaster(Context_KaxSlices)
 {}
 
 KaxTimeSlice::KaxTimeSlice()
- :EbmlMaster(KaxTimeSlice_Context)
+ :EbmlMaster(Context_KaxTimeSlice)
 {}
 
 const KaxBlockBlob & KaxReferenceBlock::RefBlock() const
diff --git a/src/KaxChapters.cpp b/src/KaxChapters.cpp
index a440089..b167118 100644
--- a/src/KaxChapters.cpp
+++ b/src/KaxChapters.cpp
@@ -124,31 +124,31 @@ DEFINE_MKX_BINARY   (KaxChapterProcessData,       0x6933, 2, KaxChapterProcessCo
 
 
 KaxChapters::KaxChapters()
- :EbmlMaster(KaxChapters_Context)
+ :EbmlMaster(Context_KaxChapters)
 {}
 
 KaxEditionEntry::KaxEditionEntry()
-:EbmlMaster(KaxEditionEntry_Context)
+:EbmlMaster(Context_KaxEditionEntry)
 {}
 
 KaxChapterAtom::KaxChapterAtom()
-:EbmlMaster(KaxChapterAtom_Context)
+:EbmlMaster(Context_KaxChapterAtom)
 {}
 
 KaxChapterTrack::KaxChapterTrack()
-:EbmlMaster(KaxChapterTrack_Context)
+:EbmlMaster(Context_KaxChapterTrack)
 {}
 
 KaxChapterDisplay::KaxChapterDisplay()
-:EbmlMaster(KaxChapterDisplay_Context)
+:EbmlMaster(Context_KaxChapterDisplay)
 {}
 
 KaxChapterProcess::KaxChapterProcess()
-:EbmlMaster(KaxChapterProcess_Context)
+:EbmlMaster(Context_KaxChapterProcess)
 {}
 
 KaxChapterProcessCommand::KaxChapterProcessCommand()
-:EbmlMaster(KaxChapterProcessCommand_Context)
+:EbmlMaster(Context_KaxChapterProcessCommand)
 {}
 
 END_LIBMATROSKA_NAMESPACE
diff --git a/src/KaxClusterData.cpp b/src/KaxClusterData.cpp
index 309efaf..13cd774 100644
--- a/src/KaxClusterData.cpp
+++ b/src/KaxClusterData.cpp
@@ -50,7 +50,7 @@ DEFINE_MKX_UINTEGER(KaxClusterPosition,            0xA7, 1, KaxCluster, "Cluster
 DEFINE_MKX_UINTEGER(KaxClusterPrevSize,            0xAB, 1, KaxCluster, "ClusterPrevSize");
 
 KaxClusterSilentTracks::KaxClusterSilentTracks()
-:EbmlMaster(KaxClusterSilentTracks_Context)
+:EbmlMaster(Context_KaxClusterSilentTracks)
 {}
 
 END_LIBMATROSKA_NAMESPACE
diff --git a/src/KaxContentEncoding.cpp b/src/KaxContentEncoding.cpp
index 0eb6734..da6107f 100644
--- a/src/KaxContentEncoding.cpp
+++ b/src/KaxContentEncoding.cpp
@@ -81,19 +81,19 @@ DEFINE_MKX_UINTEGER(KaxContentSigAlgo,       0x47e5, 2, KaxContentEncryption, "C
 DEFINE_MKX_UINTEGER(KaxContentSigHashAlgo,   0x47e6, 2, KaxContentEncryption, "ContentSigHashAlgo");
 
 KaxContentEncodings::KaxContentEncodings():
-  EbmlMaster(KaxContentEncodings_Context) {
+  EbmlMaster(Context_KaxContentEncodings) {
 }
 
 KaxContentEncoding::KaxContentEncoding():
-  EbmlMaster(KaxContentEncoding_Context) {
+  EbmlMaster(Context_KaxContentEncoding) {
 }
 
 KaxContentCompression::KaxContentCompression():
-  EbmlMaster(KaxContentCompression_Context) {
+  EbmlMaster(Context_KaxContentCompression) {
 }
 
 KaxContentEncryption::KaxContentEncryption():
-  EbmlMaster(KaxContentEncryption_Context) {
+  EbmlMaster(Context_KaxContentEncryption) {
 }
 
 END_LIBMATROSKA_NAMESPACE
diff --git a/src/KaxCuesData.cpp b/src/KaxCuesData.cpp
index 2693152..ba3b0a3 100644
--- a/src/KaxCuesData.cpp
+++ b/src/KaxCuesData.cpp
@@ -89,16 +89,16 @@ DEFINE_MKX_UINTEGER(KaxCueRefCodecState,   0xEB, 1, KaxCueRefTime, "CueRefCodecS
 #endif
 
 KaxCuePoint::KaxCuePoint() 
- :EbmlMaster(KaxCuePoint_Context)
+ :EbmlMaster(Context_KaxCuePoint)
 {}
 
 KaxCueTrackPositions::KaxCueTrackPositions()
- :EbmlMaster(KaxCueTrackPositions_Context)
+ :EbmlMaster(Context_KaxCueTrackPositions)
 {}
 
 #if MATROSKA_VERSION >= 2
 KaxCueReference::KaxCueReference()
- :EbmlMaster(KaxCueReference_Context)
+ :EbmlMaster(Context_KaxCueReference)
 {}
 #endif // MATROSKA_VERSION
 
diff --git a/src/KaxInfoData.cpp b/src/KaxInfoData.cpp
index 53a2f97..7f0f015 100644
--- a/src/KaxInfoData.cpp
+++ b/src/KaxInfoData.cpp
@@ -63,7 +63,7 @@ DEFINE_MKX_DATE     (KaxDateUTC,                    0x4461, 2, KaxInfo, "DateUTC
 DEFINE_MKX_UNISTRING(KaxTitle,                      0x7BA9, 2, KaxInfo, "Title");
 
 KaxChapterTranslate::KaxChapterTranslate()
-	:EbmlMaster(KaxChapterTranslate_Context)
+	:EbmlMaster(Context_KaxChapterTranslate)
 {}
 
 END_LIBMATROSKA_NAMESPACE
diff --git a/src/KaxSeekHead.cpp b/src/KaxSeekHead.cpp
index c402d08..ba157e4 100644
--- a/src/KaxSeekHead.cpp
+++ b/src/KaxSeekHead.cpp
@@ -60,11 +60,11 @@ DEFINE_MKX_BINARY  (KaxSeekID,       0x53AB, 2, KaxSeek, "SeekID");
 DEFINE_MKX_UINTEGER(KaxSeekPosition, 0x53AC, 2, KaxSeek, "SeekPosition");
 
 KaxSeekHead::KaxSeekHead()
-	:EbmlMaster(KaxSeekHead_Context)
+	:EbmlMaster(Context_KaxSeekHead)
 {}
 
 KaxSeek::KaxSeek()
-	:EbmlMaster(KaxSeek_Context)
+	:EbmlMaster(Context_KaxSeek)
 {}
 
 /*!
diff --git a/src/KaxTag.cpp b/src/KaxTag.cpp
index 5967a05..486b3ab 100644
--- a/src/KaxTag.cpp
+++ b/src/KaxTag.cpp
@@ -198,31 +198,31 @@ DEFINE_MKX_UNISTRING(KaxTagString,                 0x4487, 2, KaxTagSimple, "Tag
 DEFINE_MKX_BINARY   (KaxTagBinary,                 0x4485, 2, KaxTagSimple, "TagBinary");
 
 KaxTag::KaxTag()
-	:EbmlMaster(KaxTag_Context)
+	:EbmlMaster(Context_KaxTag)
 {}
 
 KaxTagTargets::KaxTagTargets()
-	:EbmlMaster(KaxTagTargets_Context)
+	:EbmlMaster(Context_KaxTagTargets)
 {}
 
 KaxTagGeneral::KaxTagGeneral()
-	:EbmlMaster(KaxTagGeneral_Context)
+	:EbmlMaster(Context_KaxTagGeneral)
 {}
 
 KaxTagGenres::KaxTagGenres()
-	:EbmlMaster(KaxTagGenres_Context)
+	:EbmlMaster(Context_KaxTagGenres)
 {}
 
 KaxTagAudioSpecific::KaxTagAudioSpecific()
-	:EbmlMaster(KaxTagAudioSpecific_Context)
+	:EbmlMaster(Context_KaxTagAudioSpecific)
 {}
 
 KaxTagImageSpecific::KaxTagImageSpecific()
-	:EbmlMaster(KaxTagImageSpecific_Context)
+	:EbmlMaster(Context_KaxTagImageSpecific)
 {}
 
 KaxTagSimple::KaxTagSimple()
-	:EbmlMaster(KaxTagSimple_Context)
+	:EbmlMaster(Context_KaxTagSimple)
 {}
 
 END_LIBMATROSKA_NAMESPACE
diff --git a/src/KaxTagMulti.cpp b/src/KaxTagMulti.cpp
index d74eb1c..cedfb26 100644
--- a/src/KaxTagMulti.cpp
+++ b/src/KaxTagMulti.cpp
@@ -220,68 +220,68 @@ DEFINE_xxx_MASTER   (KaxTagAttachment,             0x4EC3, 2, KaxTagMultiAttachm
 DEFINE_MKX_UINTEGER (KaxTagAttachmentID,           0x5BA0, 2, KaxTagAttachment, "AttachmentID");
 
 KaxTagMultiComment::KaxTagMultiComment()
-	:EbmlMaster(KaxTagMultiComment_Context)
+	:EbmlMaster(Context_KaxTagMultiComment)
 {}
 
 
 KaxTagMultiCommercial::KaxTagMultiCommercial()
-	:EbmlMaster(KaxTagMultiCommercial_Context)
+	:EbmlMaster(Context_KaxTagMultiCommercial)
 {}
 
 KaxTagCommercial::KaxTagCommercial()
-	:EbmlMaster(KaxTagCommercial_Context)
+	:EbmlMaster(Context_KaxTagCommercial)
 {}
 
 KaxTagMultiPrice::KaxTagMultiPrice()
-	:EbmlMaster(KaxTagMultiPrice_Context)
+	:EbmlMaster(Context_KaxTagMultiPrice)
 {}
 
 KaxTagMultiDate::KaxTagMultiDate()
-	:EbmlMaster(KaxTagMultiDate_Context)
+	:EbmlMaster(Context_KaxTagMultiDate)
 {}
 
 KaxTagDate::KaxTagDate()
-	:EbmlMaster(KaxTagDate_Context)
+	:EbmlMaster(Context_KaxTagDate)
 {}
 
 KaxTagMultiEntity::KaxTagMultiEntity()
-	:EbmlMaster(KaxTagMultiEntity_Context)
+	:EbmlMaster(Context_KaxTagMultiEntity)
 {}
 	
 KaxTagEntity::KaxTagEntity()
-	:EbmlMaster(KaxTagEntity_Context)
+	:EbmlMaster(Context_KaxTagEntity)
 {}
 	
 KaxTagMultiLegal::KaxTagMultiLegal()
-	:EbmlMaster(KaxTagMultiLegal_Context)
+	:EbmlMaster(Context_KaxTagMultiLegal)
 {}
 
 KaxTagLegal::KaxTagLegal()
-	:EbmlMaster(KaxTagLegal_Context)
+	:EbmlMaster(Context_KaxTagLegal)
 {}
 
 KaxTagMultiIdentifier::KaxTagMultiIdentifier()
-	:EbmlMaster(KaxTagMultiIdentifier_Context)
+	:EbmlMaster(Context_KaxTagMultiIdentifier)
 {}
 
 KaxTagIdentifier::KaxTagIdentifier()
-	:EbmlMaster(KaxTagIdentifier_Context)
+	:EbmlMaster(Context_KaxTagIdentifier)
 {}
 
 KaxTagMultiTitle::KaxTagMultiTitle()
-	:EbmlMaster(KaxTagMultiTitle_Context)
+	:EbmlMaster(Context_KaxTagMultiTitle)
 {}
 
 KaxTagTitle::KaxTagTitle()
-	:EbmlMaster(KaxTagTitle_Context)
+	:EbmlMaster(Context_KaxTagTitle)
 {}
 
 KaxTagMultiAttachment::KaxTagMultiAttachment()
-	:EbmlMaster(KaxTagMultiAttachment_Context)
+	:EbmlMaster(Context_KaxTagMultiAttachment)
 {}
 
 KaxTagAttachment::KaxTagAttachment()
-	:EbmlMaster(KaxTagAttachment_Context)
+	:EbmlMaster(Context_KaxTagAttachment)
 {}
 
 END_LIBMATROSKA_NAMESPACE
diff --git a/src/KaxTrackAudio.cpp b/src/KaxTrackAudio.cpp
index b401646..19ba2f5 100644
--- a/src/KaxTrackAudio.cpp
+++ b/src/KaxTrackAudio.cpp
@@ -65,7 +65,7 @@ DEFINE_MKX_BINARY  (KaxAudioPosition,           0x7D7B, 2, KaxTrackAudio, "Audio
 #endif
 
 KaxTrackAudio::KaxTrackAudio()
-	:EbmlMaster(KaxTrackAudio_Context)
+	:EbmlMaster(Context_KaxTrackAudio)
 {}
 
 END_LIBMATROSKA_NAMESPACE
diff --git a/src/KaxTrackEntryData.cpp b/src/KaxTrackEntryData.cpp
index fc337e3..421038c 100644
--- a/src/KaxTrackEntryData.cpp
+++ b/src/KaxTrackEntryData.cpp
@@ -77,7 +77,7 @@ DEFINE_MKX_UINTEGER (KaxCodecDecodeAll,             0xAA, 1, KaxTracks, "CodecDe
 #endif
 
 KaxTrackTranslate::KaxTrackTranslate()
-	:EbmlMaster(KaxTrackTranslate_Context)
+	:EbmlMaster(Context_KaxTrackTranslate)
 {}
 
 END_LIBMATROSKA_NAMESPACE
diff --git a/src/KaxTrackVideo.cpp b/src/KaxTrackVideo.cpp
index 3a23a8e..46a953e 100644
--- a/src/KaxTrackVideo.cpp
+++ b/src/KaxTrackVideo.cpp
@@ -85,7 +85,7 @@ DEFINE_MKX_FLOAT   (KaxVideoGamma,         0x2FB523, 3, KaxTrackVideo, "VideoGam
 #endif
 
 KaxTrackVideo::KaxTrackVideo()
-	:EbmlMaster(KaxTrackVideo_Context)
+	:EbmlMaster(Context_KaxTrackVideo)
 {}
 
 filepos_t KaxVideoFrameRate::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault)