generic-library/matroska
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no need to rename contexts that are not exported

Browse Source 
git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@72 a6f86f6d-0131-4f8e-9e7b-e335508773d5
This commit is contained in:
Steve Lhomme 2010-04-05 16:36:03 +00:00
parent 9b665806d7
commit 4071a63a5d
14 changed files with 49 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
matroska/KaxContexts.h
View File

@ -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();

6
src/KaxBlock.cpp
View File

@ -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)
{}
/*!

4
src/KaxBlockData.cpp
View File

@ -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

14
src/KaxChapters.cpp
View File

@ -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

2
src/KaxClusterData.cpp
View File

@ -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

8
src/KaxContentEncoding.cpp
View File

@ -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

6
src/KaxCuesData.cpp
View File

@ -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

2
src/KaxInfoData.cpp
View File

@ -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

4
src/KaxSeekHead.cpp
View File

@ -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)
{}
/*!

14
src/KaxTag.cpp
View File

@ -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

32
src/KaxTagMulti.cpp
View File

@ -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

2
src/KaxTrackAudio.cpp
View File

@ -65,7 +65,7 @@ DEFINE_MKX_BINARY (KaxAudioPosition, 0x7D7B, 2, KaxTrackAudio, "Audio
#endif
KaxTrackAudio::KaxTrackAudio()
:EbmlMaster(KaxTrackAudio_Context)
:EbmlMaster(Context_KaxTrackAudio)
{}
END_LIBMATROSKA_NAMESPACE

2
src/KaxTrackEntryData.cpp
View File

@ -77,7 +77,7 @@ DEFINE_MKX_UINTEGER (KaxCodecDecodeAll, 0xAA, 1, KaxTracks, "CodecDe
#endif
KaxTrackTranslate::KaxTrackTranslate()
:EbmlMaster(KaxTrackTranslate_Context)
:EbmlMaster(Context_KaxTrackTranslate)
{}
END_LIBMATROSKA_NAMESPACE

2
src/KaxTrackVideo.cpp
View File

@ -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)