Commit db508087 authored by Steve Lhomme's avatar Steve Lhomme

libebml2: rename EBML_MasterMandatory() to EBML_MasterAddMandatory()

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/foundation_src@601 a6f86f6d-0131-4f8e-9e7b-e335508773d5
parent 0e214a8b
......@@ -260,7 +260,7 @@ EBML_DLL ebml_element *EBML_MasterAddElt(ebml_master *Element, const ebml_contex
EBML_DLL size_t EBML_MasterCount(const ebml_master *Element);
EBML_DLL void EBML_MasterClear(ebml_master *Element); // clear the list (the children and not freed)
EBML_DLL void EBML_MasterErase(ebml_master *Element);
EBML_DLL void EBML_MasterMandatory(ebml_master *Element, bool_t SetDefault); // add the mandatory elements
EBML_DLL void EBML_MasterAddMandatory(ebml_master *Element, bool_t SetDefault); // add the mandatory elements
EBML_DLL bool_t EBML_MasterCheckMandatory(const ebml_master *Element, bool_t SetDefault);
EBML_DLL void EBML_MasterSort(ebml_master *Element, arraycmp Cmp, const void* CmpParam);
EBML_DLL bool_t EBML_MasterUseChecksum(ebml_master *Element, bool_t Use);
......
......@@ -230,7 +230,7 @@ static filepos_t UpdateDataSize(ebml_master *Element, bool_t bWithDefault, bool_
return INHERITED(Element,ebml_element_vmt,EBML_MASTER_CLASS)->UpdateDataSize(Element, bWithDefault, bForceRender);
}
void EBML_MasterMandatory(ebml_master *Element, bool_t SetDefault)
void EBML_MasterAddMandatory(ebml_master *Element, bool_t SetDefault)
{
const ebml_semantic *i;
for (i=Element->Base.Context->Semantic;i->eClass;++i)
......@@ -243,7 +243,7 @@ void EBML_MasterMandatory(ebml_master *Element, bool_t SetDefault)
static void PostCreate(ebml_master *Element)
{
INHERITED(Element,ebml_element_vmt,EBML_MASTER_CLASS)->PostCreate(Element);
EBML_MasterMandatory(Element,1); // TODO: should it force the default value ?
EBML_MasterAddMandatory(Element,1); // TODO: should it force the default value ?
}
static err_t ReadData(ebml_master *Element, stream *Input, const ebml_parser_context *ParserContext, bool_t AllowDummyElt, int Scope, size_t DepthCheckCRC)
......
......@@ -1255,7 +1255,7 @@ err_t MATROSKA_CuePointUpdate(matroska_cuepoint *Cue, ebml_element *Segment)
assert(Cue->SegInfo);
assert(Segment); // we need the segment location
EBML_MasterErase((ebml_master*)Cue);
EBML_MasterMandatory((ebml_master*)Cue,1);
EBML_MasterAddMandatory((ebml_master*)Cue,1);
TimecodeElt = EBML_MasterGetChild((ebml_master*)Cue,&MATROSKA_ContextCueTime);
if (!TimecodeElt)
return ERR_OUT_OF_MEMORY;
......
......@@ -169,7 +169,7 @@ static void ReduceSize(ebml_element *Element)
ebml_element *i, *j;
const ebml_semantic *s;
if (Element->Context->Id!=MATROSKA_ContextClusterBlockGroup.Id)
EBML_MasterMandatory((ebml_master*)Element,1);
EBML_MasterAddMandatory((ebml_master*)Element,1);
if (Unsafe)
EBML_MasterUseChecksum((ebml_master*)Element,0);
......
CON mkvalidator
{
PROJECT_NAME "mkvalidator"
PROJECT_VERSION 0.2.4
PROJECT_VERSION 0.3.0
PROJECT_VENDOR "Matroska Foundation"
USE matroska2
SOURCE mkvalidator.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment