From 09bf69afdb9e3d8b1410d82a30f23728d9af2ee7 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 9 Jan 2014 21:23:19 +0100 Subject: options: don't reset pause mode when switching to next file This basically reverts the default as set by commit 812798c5. This seems to be a matter of taste, but personally I think keeping the pause setting is better. --- DOCS/man/en/options.rst | 6 +++--- options/options.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index e49460ae02..835decf5e7 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1845,7 +1845,7 @@ OPTIONS behavior is the opposite of MPlayer's, which tries to reset all settings when starting next file.) - Default: ``--reset-on-next-file=pause`` (only the pause mode is reset). + Default: Do not reset anything. This can be changed with this option. It accepts a list of options, and mpv will reset the value of these options on playback start to the initial @@ -1860,13 +1860,13 @@ OPTIONS .. admonition:: Examples + - ``--reset-on-next-file=pause`` + Reset pause mode when switching to the next file. - ``--reset-on-next-file=fullscreen,speed`` Reset fullscreen and playback speed settings if they were changed during playback. - ``--reset-on-next-file=all`` Try to reset all settings that were changed during playback. - - ``--reset-on-next-file=""`` - Do not reset pause mode. ``--right-alt-gr``, ``--no-right-alt-gr`` (Cocoa and Windows only) diff --git a/options/options.c b/options/options.c index d52672cde1..ca07c3d3a1 100644 --- a/options/options.c +++ b/options/options.c @@ -651,7 +651,6 @@ const m_option_t mp_opts[] = { const struct MPOpts mp_default_opts = { .msg_color = 1, - .reset_options = (char **)(const char *[]){"pause", NULL}, .audio_driver_list = NULL, .audio_decoders = "-spdif:*", // never select spdif by default .video_decoders = NULL, -- cgit v1.2.3