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. --- player/command.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'player') diff --git a/player/command.c b/player/command.c index 013e303ffe..877e0e7e5a 100644 --- a/player/command.c +++ b/player/command.c @@ -280,10 +280,9 @@ int mp_on_set_option(void *ctx, struct m_config_option *co, void *data, int flag // OK, is handled separately: playlist // OK, does not conflict on low level: audio-file, sub-file, external-file static const char *const no_property[] = { - "playlist-pos", // checks playlist bounds, "no" choice missing "volume", // restricts to --volume-max "demuxer", "idle", "length", "audio-samplerate", "audio-channels", - "audio-format", "fps", "cache", // different semantics + "audio-format", "fps", "cache", "playlist-pos", // different semantics NULL }; -- cgit v1.2.3