diff --git a/ChangeLog b/ChangeLog index 87bf15683..cb001a577 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-06-22 Moritz Bunkus + * Modified the verbosity levels for mkvinfo: The seek head subentries + and cue subentries will only be shown at level 2 to make the + output easier to read. + * The language and default track settings are now kept again if not overridden when reading from Matroska files. diff --git a/mkvinfo.1 b/mkvinfo.1 index 80a48bdb0..a5d589cb1 100644 --- a/mkvinfo.1 +++ b/mkvinfo.1 @@ -33,14 +33,17 @@ and print more information about the current file. level 0 will print only the track headers it finds and their types. \fBmkvinfo\fR will exit as soon as the headers are parsed completely (more technical: -as soon as the first cluster is encountered). +as soon as the first cluster is encountered). In this level the seek head +entries and the cues will not be displayed - even if they're located in +front of the track informatio. .TP level 1 -will also print all Matroska elements ancountered for the complete file. +will also print all Matroska elements ancountered for the complete file but +the seek head entries and the cue entries. .TP level 2 -will also print the file position at which each Matroska element can be -found at. +will also print the seek head entries, the cue entries and the file position +at which each Matroska element can be found at. .LP .SH AUTHOR .I mkvinfo diff --git a/mkvinfo.cpp b/mkvinfo.cpp index 392a1882f..5962230d2 100644 --- a/mkvinfo.cpp +++ b/mkvinfo.cpp @@ -682,7 +682,10 @@ bool process_file(const char *file_name) { } } // while (l2 != NULL) - } else if (EbmlId(*l1) == KaxSeekHead::ClassInfos.GlobalId) { + } else if ((EbmlId(*l1) == KaxSeekHead::ClassInfos.GlobalId) && + (verbose < 2) && !use_gui) + show_element(l1, 1, "Seek head (subentries will be skipped)"); + else if (EbmlId(*l1) == KaxSeekHead::ClassInfos.GlobalId) { show_element(l1, 1, "Seek head"); l2 = es->FindNextElement(l1->Generic().Context, upper_lvl_el, @@ -874,7 +877,10 @@ bool process_file(const char *file_name) { } } // while (l2 != NULL) - } else if (EbmlId(*l1) == KaxCues::ClassInfos.GlobalId) { + } else if ((EbmlId(*l1) == KaxCues::ClassInfos.GlobalId) && + (verbose < 2)) + show_element(l1, 1, "Cues (subentries will be skipped)"); + else if (EbmlId(*l1) == KaxCues::ClassInfos.GlobalId) { show_element(l1, 1, "Cues"); l2 = es->FindNextElement(l1->Generic().Context, upper_lvl_el,