summaryrefslogtreecommitdiffstats
path: root/options/options.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-07-02 16:26:41 +0200
committerwm4 <wm4@nowhere>2017-07-02 16:29:45 +0200
commite4bc563fd2dcff1059624efb7b948b2886a382ab (patch)
tree272d96d980aca685e92083f3097c7eed418e4860 /options/options.c
parentd24f4587a7cb85e559b06d7a191bb28bbdbf52ad (diff)
downloadmpv-e4bc563fd2dcff1059624efb7b948b2886a382ab.tar.bz2
mpv-e4bc563fd2dcff1059624efb7b948b2886a382ab.tar.xz
options: change everything again
Fucking bullshit.
Diffstat (limited to 'options/options.c')
-rw-r--r--options/options.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/options/options.c b/options/options.c
index db63efa9d2..2b9a630bc9 100644
--- a/options/options.c
+++ b/options/options.c
@@ -289,7 +289,8 @@ const m_option_t mp_opts[] = {
OPT_STRINGLIST("reset-on-next-file", reset_options, 0),
#if HAVE_LUA || HAVE_JAVASCRIPT
- OPT_PATHLIST("script", script_files, M_OPT_FIXED),
+ OPT_PATHLIST("scripts", script_files, M_OPT_FIXED),
+ OPT_CLI_ALIAS("script", "scripts-append"),
OPT_KEYVALUELIST("script-opts", script_opts, 0),
OPT_FLAG("load-scripts", auto_load_scripts, 0),
#endif
@@ -375,7 +376,8 @@ const m_option_t mp_opts[] = {
#endif
// demuxer.c - select audio/sub file/demuxer
- OPT_PATHLIST("audio-file", audio_files, 0),
+ OPT_PATHLIST("audio-files", audio_files, 0),
+ OPT_CLI_ALIAS("audio-file", "audio-files-append"),
OPT_STRING("demuxer", demuxer_name, 0),
OPT_STRING("audio-demuxer", audio_demuxer_name, 0),
OPT_STRING("sub-demuxer", sub_demuxer_name, 0),
@@ -459,10 +461,12 @@ const m_option_t mp_opts[] = {
// ------------------------- subtitles options --------------------
- OPT_PATHLIST("sub-file", sub_name, 0),
- OPT_PATHLIST("sub-file-path", sub_paths, 0),
- OPT_PATHLIST("audio-file-path", audiofile_paths, 0),
- OPT_PATHLIST("external-file", external_files, 0),
+ OPT_PATHLIST("sub-files", sub_name, 0),
+ OPT_CLI_ALIAS("sub-file", "sub-files-append"),
+ OPT_PATHLIST("sub-file-paths", sub_paths, 0),
+ OPT_PATHLIST("audio-file-paths", audiofile_paths, 0),
+ OPT_PATHLIST("external-files", external_files, 0),
+ OPT_CLI_ALIAS("external-file", "external-file-append"),
OPT_FLAG("autoload-files", autoload_files, 0),
OPT_FLOAT("sub-delay", sub_delay, UPDATE_OSD),
OPT_FLOAT("sub-fps", sub_fps, UPDATE_OSD),
@@ -832,10 +836,7 @@ const m_option_t mp_opts[] = {
OPT_REMOVED("fs-black-out-screens", NULL),
OPT_REPLACED_MSG("loop", "loop-playlist", "--loop will be changed to map to"
" --loop-file in future releases."),
- OPT_REPLACED_MSG("sub-paths", "sub-file-path",
- "passing multiple paths works differently now"),
- OPT_REPLACED_MSG("audio-file-paths", "audio-file-path",
- "passing multiple paths works differently now"),
+ OPT_REPLACED("sub-paths", "sub-file-paths"),
{0}
};