Add option -noordered-chapters.

This commit is contained in:
Uoti Urpala 2009-04-08 02:37:27 +03:00
parent 2d91b19956
commit 96daf7ed5e
5 changed files with 16 additions and 0 deletions

View File

@ -1071,6 +1071,11 @@ Turns off LIRC support.
.B \-nomouseinput
Disable mouse button press/\:release input (mozplayerxp's context menu relies
on this option).
.TP
.B \-noorderedchapters
Disable support for Matroska ordered chapters.
MPlayer will not load or search for video segments from other files,
and will also ignore any chapter order specified for the main file.
.
.TP
.B \-rtc (RTC only)

View File

@ -311,6 +311,9 @@ const m_option_t mplayer_opts[]={
OPT_INTRANGE("loop", loop_times, 0, -1, 10000),
{"playlist", NULL, CONF_TYPE_STRING, 0, 0, 0, NULL},
OPT_FLAG_ON("ordered-chapters", ordered_chapters, 0),
OPT_FLAG_OFF("noordered-chapters", ordered_chapters, 0),
// a-v sync stuff:
OPT_FLAG_ON("correct-pts", user_correct_pts, 0),
OPT_FLAG_OFF("nocorrect-pts", user_correct_pts, 0),

View File

@ -20,6 +20,7 @@ void set_default_mplayer_options(struct MPOpts *opts)
.osd_level = 1,
.osd_duration = 1000,
.loop_times = -1,
.ordered_chapters = 1,
.user_correct_pts = -1,
.key_fifo_size = 7,
.doubleclick_time = 300,

View File

@ -2730,6 +2730,12 @@ static int find_ordered_chapter_sources(struct MPContext *mpctx,
static void build_ordered_chapter_timeline(struct MPContext *mpctx)
{
if (!mpctx->opts.ordered_chapters) {
mp_msg(MSGT_CPLAYER, MSGL_INFO, "File uses ordered chapters, but "
"you have disabled support for them. Ignoring.\n");
return;
}
mp_msg(MSGT_CPLAYER, MSGL_INFO, "File uses ordered chapters, will build "
"edit timeline.\n");

View File

@ -28,6 +28,7 @@ typedef struct MPOpts {
int osd_level;
int osd_duration;
int loop_times;
int ordered_chapters;
int correct_pts;
int user_correct_pts;
int key_fifo_size;