From 9e972ed7d28c33bf612452682f229fa14ef017ea Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 18 Sep 2016 13:38:45 +0200 Subject: options: rename/deprecate --playlist-pos Conflicts with the "playlist-pos" property. They're really a bit too different, and since the --playlist-pos option is relatively new and obscure, just rename it to get this out of the way. --- options/options.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'options') diff --git a/options/options.c b/options/options.c index 29fd14e7f5..2ae0f6ad3b 100644 --- a/options/options.c +++ b/options/options.c @@ -317,7 +317,8 @@ const m_option_t mp_opts[] = { OPT_TIME("ab-loop-a", ab_loop[0], 0, .min = MP_NOPTS_VALUE), OPT_TIME("ab-loop-b", ab_loop[1], 0, .min = MP_NOPTS_VALUE), - OPT_CHOICE_OR_INT("playlist-pos", playlist_pos, 0, 0, INT_MAX, ({"no", -1})), + OPT_CHOICE_OR_INT("playlist-start", playlist_pos, 0, 0, INT_MAX, + ({"auto", -1}, {"no", -1})), OPT_FLAG("pause", pause, M_OPT_FIXED), OPT_CHOICE("keep-open", keep_open, 0, @@ -754,6 +755,7 @@ const m_option_t mp_opts[] = { OPT_REPLACED("input-unix-socket", "input-ipc-server"), OPT_REPLACED("softvol-max", "volume-max"), OPT_REMOVED("bluray-angle", "this didn't do anything for a few releases"), + OPT_REPLACED("playlist-pos", "playlist-start"), {0} }; -- cgit v1.2.3