diff options
| -rw-r--r-- | DOCS/interface-changes.rst | 1 | ||||
| -rw-r--r-- | DOCS/man/options.rst | 2 | ||||
| -rw-r--r-- | etc/builtin.conf | 2 | ||||
| -rw-r--r-- | options/options.c | 3 | ||||
| -rw-r--r-- | options/options.h | 2 | ||||
| -rw-r--r-- | player/screenshot.c | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 3ef1b9e427..3b0a421a28 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -104,6 +104,7 @@ 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` --- mpv 0.36.0 --- - add `--target-contrast` - Target luminance value is now also applied when ICC profile is used. diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 3aee640800..db34c5f8d3 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -4451,7 +4451,7 @@ Screenshot ``%%`` Replaced with the ``%`` character itself. -``--screenshot-directory=<path>`` +``--screenshot-dir=<path>`` Store screenshots in this directory. This path is joined with the filename generated by ``--screenshot-template``. If the template filename is already absolute, the directory is ignored. diff --git a/etc/builtin.conf b/etc/builtin.conf index 8ea64fdcc8..7bfbaceb02 100644 --- a/etc/builtin.conf +++ b/etc/builtin.conf @@ -16,7 +16,7 @@ player-operation-mode=pseudo-gui terminal=no force-window=yes idle=once -screenshot-directory=~~desktop/ +screenshot-dir=~~desktop/ [libmpv] config=no diff --git a/options/options.c b/options/options.c index 25dc84ad32..e1d01adbd6 100644 --- a/options/options.c +++ b/options/options.c @@ -815,7 +815,7 @@ static const m_option_t mp_opts[] = { {"screenshot", OPT_SUBSTRUCT(screenshot_image_opts, screenshot_conf)}, {"screenshot-template", OPT_STRING(screenshot_template)}, - {"screenshot-directory", OPT_STRING(screenshot_directory), + {"screenshot-dir", OPT_STRING(screenshot_dir), .flags = M_OPT_FILE}, {"screenshot-sw", OPT_BOOL(screenshot_sw)}, @@ -886,6 +886,7 @@ static const m_option_t mp_opts[] = { {"", OPT_SUBSTRUCT(encode_opts, encode_config)}, + {"screenshot-directory", OPT_REPLACED("screenshot-dir")}, {"sub-forced-only", OPT_REPLACED("sub-forced-events-only")}, {0} }; diff --git a/options/options.h b/options/options.h index 3c1e947622..91cc2f85b9 100644 --- a/options/options.h +++ b/options/options.h @@ -293,7 +293,7 @@ typedef struct MPOpts { struct image_writer_opts *screenshot_image_opts; char *screenshot_template; - char *screenshot_directory; + char *screenshot_dir; bool screenshot_sw; struct m_channels audio_output_channels; diff --git a/player/screenshot.c b/player/screenshot.c index 37de982996..1d151a5475 100644 --- a/player/screenshot.c +++ b/player/screenshot.c @@ -295,7 +295,7 @@ static char *gen_fname(struct mp_cmd_ctx *cmd, const char *file_ext) return NULL; } - char *dir = ctx->mpctx->opts->screenshot_directory; + char *dir = ctx->mpctx->opts->screenshot_dir; if (dir && dir[0]) { void *t = fname; dir = mp_get_user_path(t, ctx->mpctx->global, dir); |