options: remove deprecated sub-option handling for --vo and --ao

Long planned. Leads to some sanity.

There still are some rather gross things. Especially g_groups is ugly,
and a hack that can hopefully be removed. (There is a plan for it, but
whether it's implemented depends on how much energy is left.)

2 files changed, 0 insertions, 90 deletions

diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index 498d89259e..3bd67c29fe 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -428,95 +428,6 @@ const struct m_sub_options gl_video_conf = {
     .change_flags = UPDATE_RENDERER,
 };
 
-#define LEGACY_SCALER_OPTS(n)                \
-    OPT_SUBOPT_LEGACY(n, n),                           \
-    OPT_SUBOPT_LEGACY(n"-param1", n"-param1"),         \
-    OPT_SUBOPT_LEGACY(n"-param2", n"-param2"),         \
-    OPT_SUBOPT_LEGACY(n"-blur",   n"-blur"),           \
-    OPT_SUBOPT_LEGACY(n"-wparam", n"-wparam"),         \
-    OPT_SUBOPT_LEGACY(n"-clamp",  n"-clamp"),          \
-    OPT_SUBOPT_LEGACY(n"-radius", n"-radius"),         \
-    OPT_SUBOPT_LEGACY(n"-antiring", n"-antiring"),     \
-    OPT_SUBOPT_LEGACY(n"-window", n"-window")
-
-const struct m_sub_options gl_video_conf_legacy = {
-    .opts = (const m_option_t[]) {
-        OPT_SUBOPT_LEGACY("dumb-mode", "opengl-dumb-mode"),
-        OPT_SUBOPT_LEGACY("gamma", "opengl-gamma"),
-        OPT_SUBOPT_LEGACY("gamma-auto", "gamma-auto"),
-        OPT_SUBOPT_LEGACY("target-prim", "target-prim"),
-        OPT_SUBOPT_LEGACY("target-trc", "target-trc"),
-        OPT_SUBOPT_LEGACY("target-brightness", "target-brightness"),
-        OPT_SUBOPT_LEGACY("hdr-tone-mapping", "hdr-tone-mapping"),
-        OPT_SUBOPT_LEGACY("tone-mapping-param", "tone-mapping-param"),
-        OPT_SUBOPT_LEGACY("pbo", "opengl-pbo"),
-        LEGACY_SCALER_OPTS("scale"),
-        LEGACY_SCALER_OPTS("dscale"),
-        LEGACY_SCALER_OPTS("cscale"),
-        LEGACY_SCALER_OPTS("tscale"),
-        OPT_SUBOPT_LEGACY("scaler-lut-size", "scaler-lut-size"),
-        OPT_SUBOPT_LEGACY("scaler-resizes-only", "scaler-resizes-only"),
-        OPT_SUBOPT_LEGACY("linear-scaling", "linear-scaling"),
-        OPT_SUBOPT_LEGACY("correct-downscaling", "correct-downscaling"),
-        OPT_SUBOPT_LEGACY("sigmoid-upscaling", "sigmoid-upscaling"),
-        OPT_SUBOPT_LEGACY("sigmoid-center", "sigmoid-center"),
-        OPT_SUBOPT_LEGACY("sigmoid-slope", "sigmoid-slope"),
-        OPT_SUBOPT_LEGACY("fbo-format", "opengl-fbo-format"),
-        OPT_SUBOPT_LEGACY("dither-depth", "dither-depth"),
-        OPT_SUBOPT_LEGACY("dither", "dither"),
-        OPT_SUBOPT_LEGACY("dither-size-fruit", "dither-size-fruit"),
-        OPT_SUBOPT_LEGACY("temporal-dither", "temporal-dither"),
-        OPT_SUBOPT_LEGACY("temporal-dither-period", "temporal-dither-period"),
-        OPT_SUBOPT_LEGACY("alpha", "alpha"),
-        OPT_SUBOPT_LEGACY("rectangle-textures", "opengl-rectangle-textures"),
-        OPT_SUBOPT_LEGACY("background", "background"),
-        OPT_SUBOPT_LEGACY("interpolation", "interpolation"),
-        OPT_SUBOPT_LEGACY("interpolation-threshold", "interpolation-threshold"),
-        OPT_SUBOPT_LEGACY("blend-subtitles", "blend-subtitles"),
-        OPT_SUBOPT_LEGACY("user-shaders", "opengl-shaders"),
-        OPT_SUBOPT_LEGACY("deband", "deband"),
-        OPT_SUBOPT_LEGACY("deband-iterations", "deband-iterations"),
-        OPT_SUBOPT_LEGACY("deband-threshold", "deband-threshold"),
-        OPT_SUBOPT_LEGACY("deband-range", "deband-range"),
-        OPT_SUBOPT_LEGACY("deband-grain", "deband-grain"),
-        OPT_SUBOPT_LEGACY("sharpen", "sharpen"),
-        OPT_SUBOPT_LEGACY("icc-profile", "icc-profile"),
-        OPT_SUBOPT_LEGACY("icc-profile-auto", "icc-profile-auto"),
-        OPT_SUBOPT_LEGACY("icc-cache-dir", "icc-cache-dir"),
-        OPT_SUBOPT_LEGACY("icc-intent", "icc-intent"),
-        OPT_SUBOPT_LEGACY("icc-contrast", "icc-contrast"),
-        OPT_SUBOPT_LEGACY("3dlut-size", "icc-3dlut-size"),
-
-        OPT_REMOVED("approx-gamma", "this is always enabled now"),
-        OPT_REMOVED("cscale-down", "chroma is never downscaled"),
-        OPT_REMOVED("scale-sep", "this is set automatically whenever sane"),
-        OPT_REMOVED("indirect", "this is set automatically whenever sane"),
-        OPT_REMOVED("srgb", "use target-prim=bt709:target-trc=srgb instead"),
-        OPT_REMOVED("source-shader", "use :deband to enable debanding"),
-        OPT_REMOVED("prescale-luma", "use opengl-shaders for prescaling"),
-        OPT_REMOVED("scale-shader", "use opengl-shaders instead"),
-        OPT_REMOVED("pre-shaders", "use opengl-shaders instead"),
-        OPT_REMOVED("post-shaders", "use opengl-shaders instead"),
-
-        OPT_SUBOPT_LEGACY("lscale", "scale"),
-        OPT_SUBOPT_LEGACY("lscale-down", "scale-down"),
-        OPT_SUBOPT_LEGACY("lparam1", "scale-param1"),
-        OPT_SUBOPT_LEGACY("lparam2", "scale-param2"),
-        OPT_SUBOPT_LEGACY("lradius", "scale-radius"),
-        OPT_SUBOPT_LEGACY("lantiring", "scale-antiring"),
-        OPT_SUBOPT_LEGACY("cparam1", "cscale-param1"),
-        OPT_SUBOPT_LEGACY("cparam2", "cscale-param2"),
-        OPT_SUBOPT_LEGACY("cradius", "cscale-radius"),
-        OPT_SUBOPT_LEGACY("cantiring", "cscale-antiring"),
-        OPT_SUBOPT_LEGACY("smoothmotion", "interpolation"),
-        OPT_SUBOPT_LEGACY("smoothmotion-threshold", "tscale-param1"),
-        OPT_SUBOPT_LEGACY("scale-down", "dscale"),
-        OPT_SUBOPT_LEGACY("fancy-downscaling", "correct-downscaling"),
-
-        {0}
-    },
-};
-
 static void uninit_rendering(struct gl_video *p);
 static void uninit_scaler(struct gl_video *p, struct scaler *scaler);
 static void check_gl_features(struct gl_video *p);
diff --git a/video/out/opengl/video.h b/video/out/opengl/video.h
index 54b7022f27..3b5f452bf4 100644
--- a/video/out/opengl/video.h
+++ b/video/out/opengl/video.h
@@ -137,7 +137,6 @@ struct gl_video_opts {
 };
 
 extern const struct m_sub_options gl_video_conf;
-extern const struct m_sub_options gl_video_conf_legacy;
 
 struct gl_video;
 struct vo_frame;