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

Merged 2033

Browse Source
This commit is contained in:
Moritz Bunkus 2004-08-22 18:20:02 +00:00
parent b7fb69f2f3
commit 06872f2bda
6 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2004-08-22 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge, mkvinfo, mkvextract: new feature: Added support for
the 'TargetType' tag element (which I meant to add before the
0.9.5 release...).
* mkvmerge: bug fix: The MP3 handling was broken on weird and rare
occasions when reading MP3 from a Matroska file.

1
src/common/tagparser.h
View File

@ -117,6 +117,7 @@ using namespace libmatroska;
#define E_TagLanguage 85
#define E_DefaultLanguage 86
#define E_EditionUID 87
#define E_TargetType 88
// MAX: 81

2
src/common/tagparser_end.cpp
View File

@ -369,6 +369,8 @@ end_level3(parser_data_t *pdata,
el_get_uint(pdata, pdata->chapter_uid);
else if (!strcmp(name, "EditionUID"))
el_get_uint(pdata, pdata->edition_uid);
else if (!strcmp(name, "TargetType"))
el_get_string(pdata, &GetChild<KaxTagTargetType>(*pdata->targets));
} else if (parent == E_General) {
if (!strcmp(name, "Subject"))

4
src/common/tagparser_start.cpp
View File

@ -248,6 +248,10 @@ start_level3(parser_data_t *pdata,
*pdata->edition_uid);
pdata->parents->push_back(E_EditionUID);
} else if (!strcmp(name, "TargetType")) {
check_instances(pdata->targets, KaxTagTargetType);
pdata->parents->push_back(E_TargetType);
} else
tperror_nochild();

6
src/common/tagwriter.cpp
View File

@ -370,6 +370,12 @@ handle_level3(EbmlElement *e) {
else if (is_id(e, KaxTagChapterUID))
pr_ui("ChapterUID");
else if (is_id(e, KaxTagEditionUID))
pr_ui("EditionUID");
else if (is_id(e, KaxTagTargetType))
pr_s("TargetType");
else if (is_id(e, KaxTagSubject))
pr_us("Subject");

4
src/mkvinfo.cpp
View File

@ -1880,6 +1880,10 @@ def_handle(tag_targets) {
KaxTagEditionUID &editionuid = *static_cast<KaxTagEditionUID *>(l4);
show_element(l4, 4, "Edition UID: %llu", uint64(editionuid));
} else if (is_id(l4, KaxTagTargetType)) {
KaxTagTargetType &ttype = *static_cast<KaxTagTargetType *>(l4);
show_element(l4, 4, "Target type: %s", string(ttype).c_str());
} else if (!is_global(es, l4, 4) &&
!parse_multicomment(es, l4, 4))
show_unknown_element(l4, 4);