summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-04-28 22:05:07 +0200
committerwm4 <wm4@nowhere>2015-04-28 22:05:07 +0200
commit9795216d8a07bea3c2492c1ec236f863cc1d2d9b (patch)
tree31b96c20e57953f383d52cd7705d2e9664384294
parent0c0c8cd44e42791b80e7de33b653aa9143865bbb (diff)
downloadmpv-9795216d8a07bea3c2492c1ec236f863cc1d2d9b.tar.bz2
mpv-9795216d8a07bea3c2492c1ec236f863cc1d2d9b.tar.xz
command: change the default action for rescan_external_files
Now the rescan_external_files command will by default reselect the audio and subtitle streams. This should be more intuitive. Client API users and Lua scripts might break, but can be fixed in a backward-compatible way by setting the mode explicitly.
-rw-r--r--DOCS/man/input.rst10
-rw-r--r--input/cmd_list.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 640796fe5e..29b2033bc6 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -405,14 +405,14 @@ List of Input Commands
The ``mode`` argument is one of the following:
- <keep-selection> (default)
- Do not change current track selections.
-
- <reselect>
- Select the default audio and video streams, which typically selects
+ <reselect> (default)
+ Select the default audio and subtitle streams, which typically selects
external files with highest preference. (The implementation is not
perfect, and could be improved on request.)
+ <keep-selection>
+ Do not change current track selections.
+
Input Commands that are Possibly Subject to Change
--------------------------------------------------
diff --git a/input/cmd_list.c b/input/cmd_list.c
index acd8ae72a1..e1c471a932 100644
--- a/input/cmd_list.c
+++ b/input/cmd_list.c
@@ -210,7 +210,7 @@ const struct mp_cmd_def mp_cmds[] = {
{ MP_CMD_AUDIO_RELOAD, "audio_reload", { OARG_INT(-1) } },
{ MP_CMD_RESCAN_EXTERNAL_FILES, "rescan_external_files", {
- OARG_CHOICE(0, ({"keep-selection", 0},
+ OARG_CHOICE(1, ({"keep-selection", 0},
{"reselect", 1})),
}},