summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2023-10-29 15:47:06 -0500
committerDudemanguy <random342@airmail.cc>2023-10-30 16:46:32 +0000
commit991e2a599c464e3c27d0447fb8198ac44731574a (patch)
treebae83f55df81b85248f4dc9487f1d4b880b234b8
parent612faed85654d1a20e6959ca9e0ce2fc34d38790 (diff)
downloadmpv-991e2a599c464e3c27d0447fb8198ac44731574a.tar.bz2
mpv-991e2a599c464e3c27d0447fb8198ac44731574a.tar.xz
options: make --screenshot-directory/--watch-later-directory aliases
By popular demand I guess.
-rw-r--r--DOCS/interface-changes.rst4
-rw-r--r--DOCS/man/options.rst4
-rw-r--r--options/options.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index be331cb6c6..dffb4f9647 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -104,8 +104,8 @@ Interface changes
- rename `--fps` to `--container-fps-override`
- rename `--override-display-fps` to `--display-fps-override`
- rename `--sub-ass-force-style` to `--sub-ass-style-overrides`
- - rename `--screenshot-directory` to `--screenshot-dir`
- - rename `--watch-later-directory` to `--watch-later-dir`
+ - alias `--screenshot-directory` to `--screenshot-dir`
+ - alias `--watch-later-directory` to `--watch-later-dir`
- rename `--play-dir` to `--play-direction`
- `--js-memory-report` is now used for enabling memory reporting for javascript
scripts
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index a9acd6cff9..a1dc8e392c 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1047,6 +1047,8 @@ Watch Later
``--watch-later-dir=<path>``
The directory in which to store the "watch later" temporary files.
+ ``--watch-later-directory`` is an alias for ``--watch-later-dir``.
+
If this option is unset, the files will be stored in a subdirectory
named "watch_later" underneath the local state directory
(usually ``~/.local/state/mpv/``).
@@ -4470,6 +4472,8 @@ Screenshot
generated by ``--screenshot-template``. If the template filename is already
absolute, the directory is ignored.
+ ``--screenshot-directory`` is an alias for ``--screenshot-dir``.
+
If the directory does not exist, it is created on the first screenshot. If
it is not a directory, an error is generated when trying to write a
screenshot.
diff --git a/options/options.c b/options/options.c
index d842db2acb..c98930e6c6 100644
--- a/options/options.c
+++ b/options/options.c
@@ -759,6 +759,7 @@ static const m_option_t mp_opts[] = {
OPT_BOOL(ignore_path_in_watch_later_config)},
{"watch-later-dir", OPT_STRING(watch_later_dir),
.flags = M_OPT_FILE},
+ {"watch-later-directory", OPT_ALIAS("watch-later-dir")},
{"watch-later-options", OPT_STRINGLIST(watch_later_options)},
{"ordered-chapters", OPT_BOOL(ordered_chapters)},
@@ -820,6 +821,7 @@ static const m_option_t mp_opts[] = {
{"screenshot-template", OPT_STRING(screenshot_template)},
{"screenshot-dir", OPT_STRING(screenshot_dir),
.flags = M_OPT_FILE},
+ {"screenshot-directory", OPT_ALIAS("screenshot-dir")},
{"screenshot-sw", OPT_BOOL(screenshot_sw)},
{"", OPT_SUBSTRUCT(resample_opts, resample_conf)},
@@ -890,9 +892,7 @@ static const m_option_t mp_opts[] = {
{"", OPT_SUBSTRUCT(encode_opts, encode_config)},
{"play-dir", OPT_REPLACED("play-direction")},
- {"screenshot-directory", OPT_REPLACED("screenshot-dir")},
{"sub-forced-only", OPT_REPLACED("sub-forced-events-only")},
- {"watch-later-directory", OPT_REPLACED("watch-later-dir")},
{0}
};