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

Renamed a couple of command line options to have a more consistent command line interface.

Browse Source 
The old versions are still supported but not mentioned in the
documentation anymore.
This commit is contained in:
Moritz Bunkus 2009-05-31 18:21:40 +02:00
parent b129c3fcfa
commit feb085d055
6 changed files with 1960 additions and 1887 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
doc/mkvmerge.1
View File

@ -244,51 +244,51 @@ If splitting is not used then both do the same.
.LP
Options that can be used for each input file:
.TP
\fB\-a\fR, \fB\-\-atracks\fR <\fIn\fR,\fIm\fR,...>
\fB\-a\fR, \fB\-\-audio\-tracks\fR <\fIn\fR,\fIm\fR,...>
Copy the audio tracks \fIn\fR, \fIm\fR etc. The numbers are track IDs which
can be obtained with the \fB\-\-identify\fR switch. They're \fBnot\fR simply
the track numbers (see section \fBTRACK IDS\fR). Default: copy all audio
tracks.
.TP
\fB\-d\fR, \fB\-\-vtracks\fR <\fIn\fR,\fIm\fR,...>
\fB\-d\fR, \fB\-\-video\-tracks\fR <\fIn\fR,\fIm\fR,...>
Copy the video tracks \fIn\fR, \fIm\fR etc. The numbers are track IDs which
can be obtained with the \fB\-\-identify\fR switch (see
section \fBTRACK IDS\fR). They're \fBnot\fR simply
the track numbers. Default: copy all video tracks.
.TP
\fB\-s\fR, \fB\-\-stracks\fR <\fIn\fR,\fIm\fR,...>
\fB\-s\fR, \fB\-\-subtitle\-tracks\fR <\fIn\fR,\fIm\fR,...>
Copy the subtitle tracks \fIn\fR, \fIm\fR etc. The numbers are track IDs which
can be obtained with the \fB\-\-identify\fR switch (see
section \fBTRACK IDS\fR). They're \fBnot\fR simply
the track numbers. Default: copy all subtitle tracks.
.TP
\fB\-b\fR, \fB\-\-btracks\fR <\fIn\fR,\fIm\fR,...>
\fB\-b\fR, \fB\-\-button\-tracks\fR <\fIn\fR,\fIm\fR,...>
Copy the button tracks \fIn\fR, \fIm\fR etc.
The numbers are track IDs which can be obtained with the \fB\-\-identify\fR
switch (see section \fBTRACK IDS\fR).
They're \fBnot\fR simply the track numbers.
Default: copy all button tracks.
.TP
\fB\-A\fR, \fB\-\-noaudio\fR
\fB\-A\fR, \fB\-\-no-audio\fR
Don't copy any audio track from this file.
.TP
\fB\-D\fR, \fB\-\-novideo\fR
\fB\-D\fR, \fB\-\-no-video\fR
Don't copy any video track from this file.
.TP
\fB\-S\fR, \fB\-\-nosubs\fR
\fB\-S\fR, \fB\-\-no-subtitles\fR
Don't copy any subtitle track from this file.
.TP
\fB\-B\fR, \fB\-\-nobuttons\fR
\fB\-B\fR, \fB\-\-no-buttons\fR
Don't copy any button track from this file.
.TP
\fB\-\-no\-chapters\fR
If the source is a Matroska file then don't copy chapters from it.
Don't copy chapters from this file.
.TP
\fB\-\-no\-attachments\fR
If the source is a Matroska file then don't copy attachments from it.
Don't copy attachments from this file.
.TP
\fB\-\-no\-tags\fR
If the source is a Matroska file then don't copy tags from it.
Don't copy global tags from this file.
.TP
\fB\-y\fR, \fB\-\-sync\fR <\fITID\fR:\fId\fR[,\fIo\fR[/\fIp\fR]]>
Adjust the timecodes of the track with the id \fITID\fR by \fId\fR

905
po/de.po
View File

File diff suppressed because it is too large Load Diff

908
po/ja.po
View File

File diff suppressed because it is too large Load Diff

988
po/zh_CN.po
View File

File diff suppressed because it is too large Load Diff

988
po/zh_TW.po
View File

File diff suppressed because it is too large Load Diff

36
src/merge/mkvmerge.cpp
View File

@ -189,18 +189,22 @@ set_usage() {
" firsts Matroska file written.\n");
usage_text += "\n";
usage_text += Y(" Options for each input file:\n");
usage_text += Y(" -a, --atracks <n,m,...> Copy audio tracks n,m etc. Default: copy all\n"
usage_text += Y(" -a, --audio-tracks <n,m,...>\n"
" Copy audio tracks n,m etc. Default: copy all\n"
" audio tracks.\n");
usage_text += Y(" -A, --noaudio Don't copy any audio track from this file.\n");
usage_text += Y(" -d, --vtracks <n,m,...> Copy video tracks n,m etc. Default: copy all\n"
usage_text += Y(" -A, --no-audio Don't copy any audio track from this file.\n");
usage_text += Y(" -d, --video-tracks <n,m,...>\n"
" Copy video tracks n,m etc. Default: copy all\n"
" video tracks.\n");
usage_text += Y(" -D, --novideo Don't copy any video track from this file.\n");
usage_text += Y(" -s, --stracks <n,m,...> Copy subtitle tracks n,m etc. Default: copy\n"
usage_text += Y(" -D, --no-video Don't copy any video track from this file.\n");
usage_text += Y(" -s, --subtitle-tracks <n,m,...>\n"
" Copy subtitle tracks n,m etc. Default: copy\n"
" all subtitle tracks.\n");
usage_text += Y(" -S, --nosubs Don't copy any text track from this file.\n");
usage_text += Y(" -b, --btracks <n,m,...> Copy buttons tracks n,m etc. Default: copy\n"
usage_text += Y(" -S, --no-subtitles Don't copy any subtitle track from this file.\n");
usage_text += Y(" -b, --button-tracks <n,m,...>\n"
" Copy buttons tracks n,m etc. Default: copy\n"
" all buttons tracks.\n");
usage_text += Y(" -B, --nobuttons Don't copy any buttons track from this file.\n");
usage_text += Y(" -B, --no-buttons Don't copy any buttons track from this file.\n");
usage_text += Y(" -m, --attachments <n[:all|first],m[:all|first],...>\n"
" Copy the attachments with the IDs n, m etc to\n"
" all or only the first output file. Default: copy\n"
@ -1835,40 +1839,40 @@ parse_args(std::vector<std::string> args) {
}
// Options that apply to the next input file only.
else if ((this_arg == "-A") || (this_arg == "--noaudio"))
else if ((this_arg == "-A") || (this_arg == "--noaudio") || (this_arg == "--no-audio"))
ti->no_audio = true;
else if ((this_arg == "-D") || (this_arg == "--novideo"))
else if ((this_arg == "-D") || (this_arg == "--novideo") || (this_arg == "--no-video"))
ti->no_video = true;
else if ((this_arg == "-S") || (this_arg == "--nosubs"))
else if ((this_arg == "-S") || (this_arg == "--nosubs") || (this_arg == "--no-subs") || (this_arg == "--no-subtitles"))
ti->no_subs = true;
else if ((this_arg == "-B") || (this_arg == "--nobuttons"))
else if ((this_arg == "-B") || (this_arg == "--nobuttons") || (this_args == "--no-buttons"))
ti->no_buttons = true;
else if ((this_arg == "-a") || (this_arg == "--atracks")) {
else if ((this_arg == "-a") || (this_arg == "--atracks") || (this_arg == "--audio-tracks")) {
if (no_next_arg)
mxerror(boost::format(Y("'%1%' lacks the track number(s).\n")) % this_arg);
parse_arg_tracks(next_arg, ti->atracks, this_arg);
sit++;
} else if ((this_arg == "-d") || (this_arg == "--vtracks")) {
} else if ((this_arg == "-d") || (this_arg == "--vtracks") || (this_arg == "--video-tracks")) {
if (no_next_arg)
mxerror(boost::format(Y("'%1%' lacks the track number(s).\n")) % this_arg);
parse_arg_tracks(next_arg, ti->vtracks, this_arg);
sit++;
} else if ((this_arg == "-s") || (this_arg == "--stracks")) {
} else if ((this_arg == "-s") || (this_arg == "--stracks") || (this_arg == "--sub-tracks") || (this_arg == "--subtitle-tracks")) {
if (no_next_arg)
mxerror(boost::format(Y("'%1%' lacks the track number(s).\n")) % this_arg);
parse_arg_tracks(next_arg, ti->stracks, this_arg);
sit++;
} else if ((this_arg == "-b") || (this_arg == "--btracks")) {
} else if ((this_arg == "-b") || (this_arg == "--btracks") || (this_arg == "--button-tracks")) {
if (no_next_arg)
mxerror(boost::format(Y("'%1%' lacks the track number(s).\n")) % this_arg);