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 e5e8381233f0918b9163b9ae9bd5a2c97560d6df..11b7f69f9d65705097be302cb0ad26bd84cee9fd 100644 (file)
--- 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\r
 #define Context_KaxTrackEntry            KaxTrackEntry_Context\r
 #define Context_KaxTracks                KaxTracks_Context\r
-#define Context_KaxTrackVideo            KaxTrackVideo_Context\r
 #define Context_KaxCluster               KaxCluster_Context\r
-#define Context_KaxBlockMore             KaxBlockMore_Context\r
-#define Context_KaxBlockAdditions        KaxBlockAdditions_Context\r
 #define Context_KaxBlockGroup            KaxBlockGroup_Context\r
-#define Context_KaxTimeSlice             KaxTimeSlice_Context\r
-#define Context_KaxSlices                KaxSlices_Context\r
-#define Context_KaxContentEncoding       KaxContentEncoding_Context\r
-#define Context_KaxContentEncodings      KaxContentEncodings_Context\r
-#define Context_KaxContentCompression    KaxContentCompression_Context\r
-#define Context_KaxContentEncryption     KaxContentEncryption_Context\r
 #define Context_KaxInfo                  KaxInfo_Context\r
-#define Context_KaxChapterTranslate      KaxChapterTranslate_Context\r
-#define Context_KaxTrackAudio            KaxTrackAudio_Context\r
-#define Context_KaxTrackTranslate        KaxTrackTranslate_Context\r
 #define Context_KaxAttached              KaxAttached_Context\r
 #define Context_KaxAttachments           KaxAttachments_Context\r
-#define Context_KaxEditionEntry          KaxEditionEntry_Context\r
 #define Context_KaxChapters              KaxChapters_Context\r
-#define Context_KaxChapterAtom           KaxChapterAtom_Context\r
-#define Context_KaxChapterTrack          KaxChapterTrack_Context\r
-#define Context_KaxChapterDisplay        KaxChapterDisplay_Context\r
-#define Context_KaxChapterProcess        KaxChapterProcess_Context\r
-#define Context_KaxChapterProcessCommand KaxChapterProcessCommand_Context\r
-#define Context_KaxClusterSilentTracks   KaxClusterSilentTracks_Context\r
 #define Context_KaxCues                  KaxCues_Context\r
-#define Context_KaxCuePoint              KaxCuePoint_Context\r
-#define Context_KaxCueTrackPositions     KaxCueTrackPositions_Context\r
-#define Context_KaxCueReference          KaxCueReference_Context\r
-#define Context_KaxSeek                  KaxSeek_Context\r
 #define Context_KaxTags                  KaxTags_Context\r
 #define Context_KaxSeekHead              KaxSeekHead_Context\r
-#define Context_KaxTagGeneral            KaxTagGeneral_Context\r
-#define Context_KaxTagAudioSpecific      KaxTagAudioSpecific_Context\r
-#define Context_KaxTagImageSpecific      KaxTagImageSpecific_Context\r
-#define Context_KaxTagGenres             KaxTagGenres_Context\r
-#define Context_KaxTagTargets            KaxTagTargets_Context\r
 #define Context_KaxTag                   KaxTag_Context\r
-#define Context_KaxTagSimple             KaxTagSimple_Context\r
-#define Context_KaxTagMultiComment       KaxTagMultiComment_Context\r
-#define Context_KaxTagMultiCommercial    KaxTagMultiCommercial_Context\r
 #define Context_KaxTagCommercial         KaxTagCommercial_Context\r
-#define Context_KaxTagMultiPrice         KaxTagMultiPrice_Context\r
-#define Context_KaxTagMultiDate          KaxTagMultiDate_Context\r
-#define Context_KaxTagDate               KaxTagDate_Context\r
-#define Context_KaxTagMultiEntity        KaxTagMultiEntity_Context\r
-#define Context_KaxTagEntity             KaxTagEntity_Context\r
-#define Context_KaxTagMultiLegal         KaxTagMultiLegal_Context\r
-#define Context_KaxTagLegal              KaxTagLegal_Context\r
-#define Context_KaxTagMultiIdentifier    KaxTagMultiIdentifier_Context\r
-#define Context_KaxTagIdentifier         KaxTagIdentifier_Context\r
-#define Context_KaxTagMultiTitle         KaxTagMultiTitle_Context\r
-#define Context_KaxTagTitle              KaxTagTitle_Context\r
-#define Context_KaxTagMultiAttachment    KaxTagMultiAttachment_Context\r
-#define Context_KaxTagAttachment         KaxTagAttachment_Context\r
 \r
 extern const EbmlSemanticContext & MATROSKA_DLL_API GetKaxGlobal_Context();\r
 //extern const EbmlSemanticContext & MATROSKA_DLL_API GetKaxTagsGlobal_Context();\r

diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp
index 078ddf99f7cc008cea0aac15a7e744900621109b..35f96af344d8344ff1e6b6f146d1820683bcf100 100644 (file)
--- a/src/KaxBlock.cpp
+++ b/src/KaxBlock.cpp
@@ -144,17 +144,17 @@ KaxBlockGroup::~KaxBlockGroup()
 }\r
 \r
 KaxBlockGroup::KaxBlockGroup()\r
- :EbmlMaster(KaxBlockGroup_Context)\r
+ :EbmlMaster(Context_KaxBlockGroup)\r
  ,ParentCluster(NULL)\r
  ,ParentTrack(NULL)\r
 {}\r
 \r
 KaxBlockAdditions::KaxBlockAdditions()\r
- :EbmlMaster(KaxBlockAdditions_Context)\r
+ :EbmlMaster(Context_KaxBlockAdditions)\r
 {}\r
 \r
 KaxBlockMore::KaxBlockMore()\r
- :EbmlMaster(KaxBlockMore_Context)\r
+ :EbmlMaster(Context_KaxBlockMore)\r
 {}\r
 \r
 /*!\r

diff --git a/src/KaxBlockData.cpp b/src/KaxBlockData.cpp
index 8236988f8732a9f20de40d284700fb9bcb294051..678fa4cc35f48c3d64729e170c05172ab0d7e6f6 100644 (file)
--- a/src/KaxBlockData.cpp
+++ b/src/KaxBlockData.cpp
@@ -70,11 +70,11 @@ DEFINE_MKX_UINTEGER(KaxReferenceVirtual,  0xFD, 1, KaxBlockGroup, "ReferenceVirt
 \r
 \r
 KaxSlices::KaxSlices()\r
- :EbmlMaster(KaxSlices_Context)\r
+ :EbmlMaster(Context_KaxSlices)\r
 {}\r
 \r
 KaxTimeSlice::KaxTimeSlice()\r
- :EbmlMaster(KaxTimeSlice_Context)\r
+ :EbmlMaster(Context_KaxTimeSlice)\r
 {}\r
 \r
 const KaxBlockBlob & KaxReferenceBlock::RefBlock() const\r

diff --git a/src/KaxChapters.cpp b/src/KaxChapters.cpp
index a44008909cc60d47be2b03108ad2e42bb480883d..b1671180ca416bd214f899177585454b25334f17 100644 (file)
--- a/src/KaxChapters.cpp
+++ b/src/KaxChapters.cpp
@@ -124,31 +124,31 @@ DEFINE_MKX_BINARY   (KaxChapterProcessData,       0x6933, 2, KaxChapterProcessCo
 \r
 \r
 KaxChapters::KaxChapters()\r
- :EbmlMaster(KaxChapters_Context)\r
+ :EbmlMaster(Context_KaxChapters)\r
 {}\r
 \r
 KaxEditionEntry::KaxEditionEntry()\r
-:EbmlMaster(KaxEditionEntry_Context)\r
+:EbmlMaster(Context_KaxEditionEntry)\r
 {}\r
 \r
 KaxChapterAtom::KaxChapterAtom()\r
-:EbmlMaster(KaxChapterAtom_Context)\r
+:EbmlMaster(Context_KaxChapterAtom)\r
 {}\r
 \r
 KaxChapterTrack::KaxChapterTrack()\r
-:EbmlMaster(KaxChapterTrack_Context)\r
+:EbmlMaster(Context_KaxChapterTrack)\r
 {}\r
 \r
 KaxChapterDisplay::KaxChapterDisplay()\r
-:EbmlMaster(KaxChapterDisplay_Context)\r
+:EbmlMaster(Context_KaxChapterDisplay)\r
 {}\r
 \r
 KaxChapterProcess::KaxChapterProcess()\r
-:EbmlMaster(KaxChapterProcess_Context)\r
+:EbmlMaster(Context_KaxChapterProcess)\r
 {}\r
 \r
 KaxChapterProcessCommand::KaxChapterProcessCommand()\r
-:EbmlMaster(KaxChapterProcessCommand_Context)\r
+:EbmlMaster(Context_KaxChapterProcessCommand)\r
 {}\r
 \r
 END_LIBMATROSKA_NAMESPACE\r

diff --git a/src/KaxClusterData.cpp b/src/KaxClusterData.cpp
index 309efaffb5c97eeb2b7686cae7ebead7066ae38b..13cd774eb06482a7a1cc88ae6ff8a76821745919 100644 (file)
--- 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");\r
 \r
 KaxClusterSilentTracks::KaxClusterSilentTracks()\r
-:EbmlMaster(KaxClusterSilentTracks_Context)\r
+:EbmlMaster(Context_KaxClusterSilentTracks)\r
 {}\r
 \r
 END_LIBMATROSKA_NAMESPACE\r

diff --git a/src/KaxContentEncoding.cpp b/src/KaxContentEncoding.cpp
index 0eb67346b541e7cecdacee88f6d11a16308e2630..da6107fa275efb73919bf4c68cc0ce68a9c25012 100644 (file)
--- 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");\r
 \r
 KaxContentEncodings::KaxContentEncodings():\r
-  EbmlMaster(KaxContentEncodings_Context) {\r
+  EbmlMaster(Context_KaxContentEncodings) {\r
 }\r
 \r
 KaxContentEncoding::KaxContentEncoding():\r
-  EbmlMaster(KaxContentEncoding_Context) {\r
+  EbmlMaster(Context_KaxContentEncoding) {\r
 }\r
 \r
 KaxContentCompression::KaxContentCompression():\r
-  EbmlMaster(KaxContentCompression_Context) {\r
+  EbmlMaster(Context_KaxContentCompression) {\r
 }\r
 \r
 KaxContentEncryption::KaxContentEncryption():\r
-  EbmlMaster(KaxContentEncryption_Context) {\r
+  EbmlMaster(Context_KaxContentEncryption) {\r
 }\r
 \r
 END_LIBMATROSKA_NAMESPACE\r

diff --git a/src/KaxCuesData.cpp b/src/KaxCuesData.cpp
index 2693152b054147acaf701c7215fdb5a41893054f..ba3b0a39eadae94437cb5287d1313c4b5083883d 100644 (file)
--- a/src/KaxCuesData.cpp
+++ b/src/KaxCuesData.cpp
@@ -89,16 +89,16 @@ DEFINE_MKX_UINTEGER(KaxCueRefCodecState,   0xEB, 1, KaxCueRefTime, "CueRefCodecS
 #endif\r
 \r
 KaxCuePoint::KaxCuePoint() \r
- :EbmlMaster(KaxCuePoint_Context)\r
+ :EbmlMaster(Context_KaxCuePoint)\r
 {}\r
 \r
 KaxCueTrackPositions::KaxCueTrackPositions()\r
- :EbmlMaster(KaxCueTrackPositions_Context)\r
+ :EbmlMaster(Context_KaxCueTrackPositions)\r
 {}\r
 \r
 #if MATROSKA_VERSION >= 2\r
 KaxCueReference::KaxCueReference()\r
- :EbmlMaster(KaxCueReference_Context)\r
+ :EbmlMaster(Context_KaxCueReference)\r
 {}\r
 #endif // MATROSKA_VERSION\r
 \r

diff --git a/src/KaxInfoData.cpp b/src/KaxInfoData.cpp
index 53a2f972517515bedce8f41679eed09287edd474..7f0f0151a01f53f795d671b47c4a96f7c659ac6c 100644 (file)
--- 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");\r
 \r
 KaxChapterTranslate::KaxChapterTranslate()\r
-       :EbmlMaster(KaxChapterTranslate_Context)\r
+       :EbmlMaster(Context_KaxChapterTranslate)\r
 {}\r
 \r
 END_LIBMATROSKA_NAMESPACE\r

diff --git a/src/KaxSeekHead.cpp b/src/KaxSeekHead.cpp
index c402d088d1f946707775e4ce7cf02eb88df62359..ba157e46ac92417464668f5b3080dc0d11e60af8 100644 (file)
--- 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");\r
 \r
 KaxSeekHead::KaxSeekHead()\r
-       :EbmlMaster(KaxSeekHead_Context)\r
+       :EbmlMaster(Context_KaxSeekHead)\r
 {}\r
 \r
 KaxSeek::KaxSeek()\r
-       :EbmlMaster(KaxSeek_Context)\r
+       :EbmlMaster(Context_KaxSeek)\r
 {}\r
 \r
 /*!\r

diff --git a/src/KaxTag.cpp b/src/KaxTag.cpp
index 5967a0554035558d66becf156033aefcdcfae7af..486b3ab753f166028ac46906f688601bf593e9e2 100644 (file)
--- 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");\r
 \r
 KaxTag::KaxTag()\r
-       :EbmlMaster(KaxTag_Context)\r
+       :EbmlMaster(Context_KaxTag)\r
 {}\r
 \r
 KaxTagTargets::KaxTagTargets()\r
-       :EbmlMaster(KaxTagTargets_Context)\r
+       :EbmlMaster(Context_KaxTagTargets)\r
 {}\r
 \r
 KaxTagGeneral::KaxTagGeneral()\r
-       :EbmlMaster(KaxTagGeneral_Context)\r
+       :EbmlMaster(Context_KaxTagGeneral)\r
 {}\r
 \r
 KaxTagGenres::KaxTagGenres()\r
-       :EbmlMaster(KaxTagGenres_Context)\r
+       :EbmlMaster(Context_KaxTagGenres)\r
 {}\r
 \r
 KaxTagAudioSpecific::KaxTagAudioSpecific()\r
-       :EbmlMaster(KaxTagAudioSpecific_Context)\r
+       :EbmlMaster(Context_KaxTagAudioSpecific)\r
 {}\r
 \r
 KaxTagImageSpecific::KaxTagImageSpecific()\r
-       :EbmlMaster(KaxTagImageSpecific_Context)\r
+       :EbmlMaster(Context_KaxTagImageSpecific)\r
 {}\r
 \r
 KaxTagSimple::KaxTagSimple()\r
-       :EbmlMaster(KaxTagSimple_Context)\r
+       :EbmlMaster(Context_KaxTagSimple)\r
 {}\r
 \r
 END_LIBMATROSKA_NAMESPACE\r

diff --git a/src/KaxTagMulti.cpp b/src/KaxTagMulti.cpp
index d74eb1c692e8c6ce959ee11dc81784ef9bac40d4..cedfb26181cf773c1df56429bc41ad05f0a52c3e 100644 (file)
--- 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");\r
 \r
 KaxTagMultiComment::KaxTagMultiComment()\r
-       :EbmlMaster(KaxTagMultiComment_Context)\r
+       :EbmlMaster(Context_KaxTagMultiComment)\r
 {}\r
 \r
 \r
 KaxTagMultiCommercial::KaxTagMultiCommercial()\r
-       :EbmlMaster(KaxTagMultiCommercial_Context)\r
+       :EbmlMaster(Context_KaxTagMultiCommercial)\r
 {}\r
 \r
 KaxTagCommercial::KaxTagCommercial()\r
-       :EbmlMaster(KaxTagCommercial_Context)\r
+       :EbmlMaster(Context_KaxTagCommercial)\r
 {}\r
 \r
 KaxTagMultiPrice::KaxTagMultiPrice()\r
-       :EbmlMaster(KaxTagMultiPrice_Context)\r
+       :EbmlMaster(Context_KaxTagMultiPrice)\r
 {}\r
 \r
 KaxTagMultiDate::KaxTagMultiDate()\r
-       :EbmlMaster(KaxTagMultiDate_Context)\r
+       :EbmlMaster(Context_KaxTagMultiDate)\r
 {}\r
 \r
 KaxTagDate::KaxTagDate()\r
-       :EbmlMaster(KaxTagDate_Context)\r
+       :EbmlMaster(Context_KaxTagDate)\r
 {}\r
 \r
 KaxTagMultiEntity::KaxTagMultiEntity()\r
-       :EbmlMaster(KaxTagMultiEntity_Context)\r
+       :EbmlMaster(Context_KaxTagMultiEntity)\r
 {}\r
        \r
 KaxTagEntity::KaxTagEntity()\r
-       :EbmlMaster(KaxTagEntity_Context)\r
+       :EbmlMaster(Context_KaxTagEntity)\r
 {}\r
        \r
 KaxTagMultiLegal::KaxTagMultiLegal()\r
-       :EbmlMaster(KaxTagMultiLegal_Context)\r
+       :EbmlMaster(Context_KaxTagMultiLegal)\r
 {}\r
 \r
 KaxTagLegal::KaxTagLegal()\r
-       :EbmlMaster(KaxTagLegal_Context)\r
+       :EbmlMaster(Context_KaxTagLegal)\r
 {}\r
 \r
 KaxTagMultiIdentifier::KaxTagMultiIdentifier()\r
-       :EbmlMaster(KaxTagMultiIdentifier_Context)\r
+       :EbmlMaster(Context_KaxTagMultiIdentifier)\r
 {}\r
 \r
 KaxTagIdentifier::KaxTagIdentifier()\r
-       :EbmlMaster(KaxTagIdentifier_Context)\r
+       :EbmlMaster(Context_KaxTagIdentifier)\r
 {}\r
 \r
 KaxTagMultiTitle::KaxTagMultiTitle()\r
-       :EbmlMaster(KaxTagMultiTitle_Context)\r
+       :EbmlMaster(Context_KaxTagMultiTitle)\r
 {}\r
 \r
 KaxTagTitle::KaxTagTitle()\r
-       :EbmlMaster(KaxTagTitle_Context)\r
+       :EbmlMaster(Context_KaxTagTitle)\r
 {}\r
 \r
 KaxTagMultiAttachment::KaxTagMultiAttachment()\r
-       :EbmlMaster(KaxTagMultiAttachment_Context)\r
+       :EbmlMaster(Context_KaxTagMultiAttachment)\r
 {}\r
 \r
 KaxTagAttachment::KaxTagAttachment()\r
-       :EbmlMaster(KaxTagAttachment_Context)\r
+       :EbmlMaster(Context_KaxTagAttachment)\r
 {}\r
 \r
 END_LIBMATROSKA_NAMESPACE\r

diff --git a/src/KaxTrackAudio.cpp b/src/KaxTrackAudio.cpp
index b40164652f602aed7b63634d9bb1abdfbb8997e9..19ba2f5590da44e0d6e03d8f1a51fbaae52bc8cf 100644 (file)
--- a/src/KaxTrackAudio.cpp
+++ b/src/KaxTrackAudio.cpp
@@ -65,7 +65,7 @@ DEFINE_MKX_BINARY  (KaxAudioPosition,           0x7D7B, 2, KaxTrackAudio, "Audio
 #endif\r
 \r
 KaxTrackAudio::KaxTrackAudio()\r
-       :EbmlMaster(KaxTrackAudio_Context)\r
+       :EbmlMaster(Context_KaxTrackAudio)\r
 {}\r
 \r
 END_LIBMATROSKA_NAMESPACE\r

diff --git a/src/KaxTrackEntryData.cpp b/src/KaxTrackEntryData.cpp
index fc337e3fdf4761ce2f2df53c3585ef2d38c8b399..421038cb8cdb8572b19ab8763639e637c8a65596 100644 (file)
--- a/src/KaxTrackEntryData.cpp
+++ b/src/KaxTrackEntryData.cpp
@@ -77,7 +77,7 @@ DEFINE_MKX_UINTEGER (KaxCodecDecodeAll,             0xAA, 1, KaxTracks, "CodecDe
 #endif\r
 \r
 KaxTrackTranslate::KaxTrackTranslate()\r
-       :EbmlMaster(KaxTrackTranslate_Context)\r
+       :EbmlMaster(Context_KaxTrackTranslate)\r
 {}\r
 \r
 END_LIBMATROSKA_NAMESPACE\r

diff --git a/src/KaxTrackVideo.cpp b/src/KaxTrackVideo.cpp
index 3a23a8eed1e33fc0fc1f7602d1b82114b8936a50..46a953ee6ec307c776a1230c6565b6d04914bbad 100644 (file)
--- a/src/KaxTrackVideo.cpp
+++ b/src/KaxTrackVideo.cpp
@@ -85,7 +85,7 @@ DEFINE_MKX_FLOAT   (KaxVideoGamma,         0x2FB523, 3, KaxTrackVideo, "VideoGam
 #endif\r
 \r
 KaxTrackVideo::KaxTrackVideo()\r
-       :EbmlMaster(KaxTrackVideo_Context)\r
+       :EbmlMaster(Context_KaxTrackVideo)\r
 {}\r
 \r
 filepos_t KaxVideoFrameRate::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault)\r