From e4bc563fd2dcff1059624efb7b948b2886a382ab Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 2 Jul 2017 16:26:41 +0200
Subject: options: change everything again

Fucking bullshit.
---
 video/out/opengl/video.c | 8 ++------
 video/out/opengl/video.h | 1 -
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'video')

diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index 772d988fac..41ddf84722 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -395,9 +395,8 @@ const struct m_sub_options gl_video_conf = {
                    ({"no", BLEND_SUBS_NO},
                     {"yes", BLEND_SUBS_YES},
                     {"video", BLEND_SUBS_VIDEO})),
-        OPT_STRINGLIST("opengl-shaders", user_shaders_old, M_OPT_FILE,
-            .deprecation_message = "use --opengl-shader (1 for each file)"),
-        OPT_PATHLIST("opengl-shader", user_shaders, 0),
+        OPT_PATHLIST("opengl-shaders", user_shaders, 0),
+        OPT_CLI_ALIAS("opengl-shader", "opengl-shaders-append"),
         OPT_FLAG("deband", deband, 0),
         OPT_SUBSTRUCT("deband", deband_opts, deband_conf, 0),
         OPT_FLOAT("sharpen", unsharp, 0),
@@ -1769,7 +1768,6 @@ static void gl_video_setup_hooks(struct gl_video *p)
         });
     }
 
-    pass_hook_user_shaders(p, p->opts.user_shaders_old);
     pass_hook_user_shaders(p, p->opts.user_shaders);
 }
 
@@ -3127,8 +3125,6 @@ static bool check_dumb_mode(struct gl_video *p)
                 return false;
         }
     }
-    if (o->user_shaders_old && o->user_shaders_old[0])
-        return false;
     if (o->user_shaders && o->user_shaders[0])
         return false;
     if (p->use_lut_3d)
diff --git a/video/out/opengl/video.h b/video/out/opengl/video.h
index 8526cecb84..6c41e70b1e 100644
--- a/video/out/opengl/video.h
+++ b/video/out/opengl/video.h
@@ -128,7 +128,6 @@ struct gl_video_opts {
     int interpolation;
     float interpolation_threshold;
     int blend_subs;
-    char **user_shaders_old;
     char **user_shaders;
     int deband;
     struct deband_opts *deband_opts;
-- 
cgit v1.2.3