Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for the renamed chapter elements. Patch by Steve Lhomme <steve ! lhomme () free ! fr> with modifications by myself.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-01-03 16:12:11 +00:00
parent e3d1661ee9
commit 1bca324e4f
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/chapters.cpp
View File

@ -530,7 +530,6 @@ fix_mandatory_chapter_elements(EbmlElement *e) {
KaxEditionEntry &ee = *static_cast<KaxEditionEntry *>(e);
GetChild<KaxEditionFlagDefault>(ee);
GetChild<KaxEditionFlagHidden>(ee);
GetChild<KaxEditionProcessed>(ee);
if (FINDFIRST(&ee, KaxEditionUID) == NULL)
*static_cast<EbmlUInteger *>(&GetChild<KaxEditionUID>(ee)) =
create_unique_uint32(UNIQUE_EDITION_IDS);
@ -560,6 +559,17 @@ fix_mandatory_chapter_elements(EbmlElement *e) {
if (FINDFIRST(&d, KaxChapterLanguage) == NULL)
*static_cast<EbmlString *>(&GetChild<KaxChapterLanguage>(d)) = "und";
} else if (dynamic_cast<KaxChapterProcess *>(e) != NULL) {
KaxChapterProcess &p = *static_cast<KaxChapterProcess *>(e);
GetChild<KaxChapterProcessCodecID>(p);
} else if (dynamic_cast<KaxChapterProcessCommand *>(e) != NULL) {
KaxChapterProcessCommand &c = *static_cast<KaxChapterProcessCommand *>(e);
GetChild<KaxChapterProcessTime>(c);
GetChild<KaxChapterProcessData>(c);
}
if (dynamic_cast<EbmlMaster *>(e) != NULL) {

15
src/common/xml_element_mapping.cpp
View File

@ -55,8 +55,7 @@ xml_element_map_init() {
{"EditionEntry", EBMLT_MASTER, 1, 0, 0, no_id, NULL, NULL, NULL},
{"EditionUID", EBMLT_UINT, 2, 0, NO_MAX_VALUE, no_id, NULL, NULL, NULL},
{"EditionFlagHidden", EBMLT_BOOL, 2, 0, 0, no_id, NULL, NULL, NULL},
{"EditionProcessed", EBMLT_UINT, 2, 0, NO_MAX_VALUE, no_id, NULL, NULL,
NULL},
{"EditionFlagOrdered", EBMLT_BOOL, 2, 0, 0, no_id, NULL, NULL, NULL},
{"EditionFlagDefault", EBMLT_BOOL, 2, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterAtom", EBMLT_MASTER, 2, 0, 0, no_id, NULL, NULL, NULL},
@ -65,14 +64,18 @@ xml_element_map_init() {
{"ChapterTimeEnd", EBMLT_TIME, 3, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterFlagHidden", EBMLT_BOOL, 3, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterFlagEnabled", EBMLT_BOOL, 3, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterProcessedPrivate", EBMLT_BINARY, 3, 0, 0, no_id, NULL, NULL,
NULL},
{"ChapterPhysicalEquiv", EBMLT_UINT, 3, 0, NO_MAX_VALUE, no_id, NULL,
NULL, NULL},
{"ChapterProcess", EBMLT_MASTER, 3, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterProcessTime", EBMLT_UINT, 4, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterProcessCommand", EBMLT_BINARY, 4, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterProcessCodecID", EBMLT_UINT, 4, 0, NO_MAX_VALUE, no_id, NULL,
NULL, NULL},
{"ChapterProcessPrivate", EBMLT_BINARY, 4, 0, 0, no_id, NULL, NULL,
NULL},
{"ChapterProcessCommand", EBMLT_MASTER, 4, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterProcessTime", EBMLT_UINT, 5, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterProcessData", EBMLT_BINARY, 5, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterTrack", EBMLT_MASTER, 3, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterTrackNumber", EBMLT_UINT, 4, 0, NO_MAX_VALUE, no_id, NULL, NULL,