diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-10-15 11:00:52 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-10-25 16:16:37 +0000 |
| commit | 36de0d784fe803b39445717293a3ca7a54ba0f51 (patch) | |
| tree | ceff3deafa00d5f359d18c0f05e2190e949756cc | |
| parent | 1370ecfc1b9b477aecc552355a0ac5f8555e51ae (diff) | |
| download | mpv-36de0d784fe803b39445717293a3ca7a54ba0f51.tar.bz2 mpv-36de0d784fe803b39445717293a3ca7a54ba0f51.tar.xz | |
options: rename --watch-later-directory to --watch-later-dir
Same logic as the previous commit.
| -rw-r--r-- | DOCS/interface-changes.rst | 1 | ||||
| -rw-r--r-- | DOCS/man/options.rst | 2 | ||||
| -rw-r--r-- | options/options.c | 3 | ||||
| -rw-r--r-- | options/options.h | 2 | ||||
| -rw-r--r-- | player/configfiles.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 3b0a421a28..41425ea1b2 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -105,6 +105,7 @@ Interface changes - 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` --- 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 db34c5f8d3..32a2b8893d 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -1030,7 +1030,7 @@ Watch Later See `RESUMING PLAYBACK`_. -``--watch-later-directory=<path>`` +``--watch-later-dir=<path>`` The directory in which to store the "watch later" temporary files. If this option is unset, the files will be stored in a subdirectory diff --git a/options/options.c b/options/options.c index e1d01adbd6..17e03025d2 100644 --- a/options/options.c +++ b/options/options.c @@ -754,7 +754,7 @@ static const m_option_t mp_opts[] = { OPT_BOOL(write_filename_in_watch_later_config)}, {"ignore-path-in-watch-later-config", OPT_BOOL(ignore_path_in_watch_later_config)}, - {"watch-later-directory", OPT_STRING(watch_later_directory), + {"watch-later-dir", OPT_STRING(watch_later_dir), .flags = M_OPT_FILE}, {"watch-later-options", OPT_STRINGLIST(watch_later_options)}, @@ -888,6 +888,7 @@ static const m_option_t mp_opts[] = { {"screenshot-directory", OPT_REPLACED("screenshot-dir")}, {"sub-forced-only", OPT_REPLACED("sub-forced-events-only")}, + {"watch-later-directory", OPT_REPLACED("watch-later-dir")}, {0} }; diff --git a/options/options.h b/options/options.h index 91cc2f85b9..6adae372cf 100644 --- a/options/options.h +++ b/options/options.h @@ -261,7 +261,7 @@ typedef struct MPOpts { bool position_save_on_quit; bool write_filename_in_watch_later_config; bool ignore_path_in_watch_later_config; - char *watch_later_directory; + char *watch_later_dir; char **watch_later_options; bool pause; int keep_open; diff --git a/player/configfiles.c b/player/configfiles.c index e5cff5355a..9441638264 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -194,7 +194,7 @@ static bool copy_mtime(const char *f1, const char *f2) static char *mp_get_playback_resume_dir(struct MPContext *mpctx) { - char *wl_dir = mpctx->opts->watch_later_directory; + char *wl_dir = mpctx->opts->watch_later_dir; if (wl_dir && wl_dir[0]) { wl_dir = mp_get_user_path(mpctx, mpctx->global, wl_dir); } else { |