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

ChapterLink has been renamed to ChapterTranslate.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-01-30 18:01:38 +00:00
parent d54a597c8c
commit be3a33848b
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/xml_element_mapping.cpp
View File

@ -127,12 +127,12 @@ xml_element_map_init() {
{"SegmentFamily", EBMLT_BINARY, 1, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterLink", EBMLT_MASTER, 1, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterLinkEditionUID", EBMLT_UINT, 2, 0, NO_MAX_VALUE, no_id, NULL,
{"ChapterTranslate", EBMLT_MASTER, 1, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterTranslateEditionUID", EBMLT_UINT, 2, 0, NO_MAX_VALUE, no_id, NULL,
NULL, NULL},
{"ChapterLinkCodec", EBMLT_UINT, 2, 0, NO_MAX_VALUE, no_id, NULL, NULL,
NULL},
{"ChapterLinkID", EBMLT_BINARY, 2, 0, 0, no_id, NULL, NULL, NULL},
{"ChapterTranslateCodec", EBMLT_UINT, 2, 0, NO_MAX_VALUE, no_id, NULL,
NULL, NULL},
{"ChapterTranslateID", EBMLT_BINARY, 2, 0, 0, no_id, NULL, NULL, NULL},
{NULL, EBMLT_MASTER, 0, 0, 0, EbmlId((uint32_t)0, 0), NULL, NULL, NULL}
};

37
src/info/mkvinfo.cpp
View File

@ -441,34 +441,35 @@ format_binary(EbmlBinary &bin,
void
def_handle(chapterlink) {
def_handle(chaptertranslate) {
EbmlMaster *m2;
int i2;
show_element(l2, 2, "Chapter Link");
show_element(l2, 2, "Chapter Translate");
m2 = static_cast<EbmlMaster *>(l2);
for (i2 = 0; i2 < m2->ListSize(); i2++) {
l3 = (*m2)[i2];
if (is_id(l3, KaxChapterLinkEditionUID)) {
KaxChapterLinkEditionUID &link_edition_uid =
*static_cast<KaxChapterLinkEditionUID *>(l3);
show_element(l3, 3, "Chapter Link Edition UID: %llu",
uint64(link_edition_uid));
if (is_id(l3, KaxChapterTranslateEditionUID)) {
KaxChapterTranslateEditionUID &translate_edition_uid =
*static_cast<KaxChapterTranslateEditionUID *>(l3);
show_element(l3, 3, "Chapter Translate Edition UID: %llu",
uint64(translate_edition_uid));
} else if (is_id(l3, KaxChapterLinkCodec)) {
KaxChapterLinkCodec &link_codec =
*static_cast<KaxChapterLinkCodec *>(l3);
show_element(l3, 3, "Chapter Link Codec: %llu",
uint64(link_codec));
} else if (is_id(l3, KaxChapterTranslateCodec)) {
KaxChapterTranslateCodec &translate_codec =
*static_cast<KaxChapterTranslateCodec *>(l3);
show_element(l3, 3, "Chapter Translate Codec: %llu",
uint64(translate_codec));
} else if (is_id(l3, KaxChapterLinkID)) {
} else if (is_id(l3, KaxChapterTranslateID)) {
string strc;
KaxChapterLinkID &link_id = *static_cast<KaxChapterLinkID *>(l3);
strc = format_binary(*static_cast<EbmlBinary *>(&link_id));
show_element(l3, 3, "Chapter Link ID: %s", strc.c_str());
KaxChapterTranslateID &translate_id =
*static_cast<KaxChapterTranslateID *>(l3);
strc = format_binary(*static_cast<EbmlBinary *>(&translate_id));
show_element(l3, 3, "Chapter Translate ID: %s", strc.c_str());
}
}
}
@ -541,8 +542,8 @@ def_handle(info) {
show_element(l2, 2, "Family UID:%s", buffer);
delete [] buffer;
} else if (is_id(l2, KaxChapterLink))
handle(chapterlink);
} else if (is_id(l2, KaxChapterTranslate))
handle(chaptertranslate);
else if (is_id(l2, KaxPrevUID)) {
KaxPrevUID &uid = *static_cast<KaxPrevUID *>(l2);

12
src/merge/output_control.cpp
View File

@ -571,13 +571,13 @@ render_headers(mm_io_c *rout) {
}
}
// Set the chapterlink elements
// Set the chaptertranslate elements
if (kax_info_chap != NULL) {
// copy the KaxChapterLink's in the current KaxInfo
KaxChapterLink *link = FINDFIRST(kax_info_chap, KaxChapterLink);
while (link != NULL) {
kax_infos->PushElement(*new KaxChapterLink(*link));
link = FINDNEXT(kax_info_chap, KaxChapterLink, link);
// copy the KaxChapterTranslates in the current KaxInfo
KaxChapterTranslate *tr = FINDFIRST(kax_info_chap, KaxChapterTranslate);
while (tr != NULL) {
kax_infos->PushElement(*new KaxChapterTranslate(*tr));
tr = FINDNEXT(kax_info_chap, KaxChapterTranslate, tr);
}
}