From fba927de415d1541b242cc628b3ff3c09cec46bd Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 22 Sep 2017 11:31:03 +0200 Subject: options: properly handle deprecated options with CLI actions We want e.g. --opengl-shaders-append=foo to resolve to the new option, all while printing an option name. --opengl-shader is a similar case. These options are special, because they apply "actions" on actual options by specifying a suffix. So the alias/deprecation handling has to be part of resolving the actual option from prefix and suffix. --- video/out/gpu/video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video') diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c index 476dae14a8..004a4c7a21 100644 --- a/video/out/gpu/video.c +++ b/video/out/gpu/video.c @@ -410,7 +410,7 @@ const struct m_sub_options gl_video_conf = { OPT_STRING("gpu-shader-cache-dir", shader_cache_dir, 0), OPT_REPLACED("hdr-tone-mapping", "tone-mapping"), OPT_REPLACED("opengl-shaders", "glsl-shaders"), - OPT_CLI_ALIAS("opengl-shader", "glsl-shaders-append"), + OPT_REPLACED("opengl-shader", "glsl-shader"), OPT_REPLACED("opengl-shader-cache-dir", "gpu-shader-cache-dir"), OPT_REPLACED("opengl-tex-pad-x", "gpu-tex-pad-x"), OPT_REPLACED("opengl-tex-pad-y", "gpu-tex-pad-y"), -- cgit v1.2.3