options: remove ancient option fallbacks/deprecation

We've got an ungodly amount of OPT_REPLACED and OPT_REMOVED sitting
around in the code. This is harmless, but the vast majority of these are
ancient. 26f4f18c0629998a9b91e94722d166866d8b80a3 is the last commit
that touched the majority of these and of course that only changed how
options were declared so all of this stuff was deprecated even before
that. No use in keeping these, so just delete them all. As an aside,
there was actually a cocoa_opts but it had only a single option which
was replaced by something else and empty otherwise. So that entire thing
was just simply removed. OPT_REPLACED/OPT_REMOVED declarations that were
added in 0.35 or later were kept as is.

1 files changed, 0 insertions, 120 deletions

diff --git a/options/options.c b/options/options.c
index c3977136b4..f930aaa6e0 100644
--- a/options/options.c
+++ b/options/options.c
@@ -91,7 +91,6 @@ extern const struct m_sub_options spirv_conf;
 extern const struct m_sub_options d3d11_conf;
 extern const struct m_sub_options d3d11va_conf;
 extern const struct m_sub_options angle_conf;
-extern const struct m_sub_options cocoa_conf;
 extern const struct m_sub_options macos_conf;
 extern const struct m_sub_options wayland_conf;
 extern const struct m_sub_options vaapi_conf;
@@ -826,10 +825,6 @@ static const m_option_t mp_opts[] = {
     {"", OPT_SUBSTRUCT(angle_opts, angle_conf)},
 #endif
 
-#if HAVE_GL_COCOA
-    {"", OPT_SUBSTRUCT(cocoa_opts, cocoa_conf)},
-#endif
-
 #if HAVE_COCOA
     {"", OPT_SUBSTRUCT(macos_opts, macos_conf)},
 #endif
@@ -864,122 +859,7 @@ static const m_option_t mp_opts[] = {
 
     {"", OPT_SUBSTRUCT(encode_opts, encode_config)},
 
-    {"a52drc", OPT_REMOVED("use --ad-lavc-ac3drc=level")},
-    {"afm", OPT_REMOVED("use --ad=...")},
-    {"aspect", OPT_REPLACED("video-aspect-override")},
-    {"ass-bottom-margin", OPT_REMOVED("use --vf=sub=bottom:top")},
-    {"ass", OPT_REPLACED("sub-ass")},
-    {"audiofile", OPT_REPLACED("audio-file")},
-    {"benchmark", OPT_REMOVED("use --untimed (no stats)")},
-    {"capture", OPT_REMOVED(NULL)},
-    {"stream-capture", OPT_REMOVED(NULL)},
-    {"channels", OPT_REMOVED("use --audio-channels (changed semantics)")},
-    {"cursor-autohide-delay", OPT_REPLACED("cursor-autohide")},
-    {"delay", OPT_REPLACED("audio-delay")},
-    {"dumpstream", OPT_REMOVED("use --stream-dump=<filename>")},
-    {"dvdangle", OPT_REPLACED("dvd-angle")},
-    {"endpos", OPT_REPLACED("length")},
-    {"font", OPT_REPLACED("osd-font")},
     {"sub-forced-only", OPT_REPLACED("sub-forced-events-only")},
-    {"forcedsubsonly", OPT_REPLACED("sub-forced-only")},
-    {"format", OPT_REPLACED("audio-format")},
-    {"hardframedrop", OPT_REMOVED(NULL)},
-    {"identify", OPT_REMOVED("use TOOLS/mpv_identify.sh")},
-    {"lavdopts", OPT_REMOVED("use --vd-lavc-...")},
-    {"lavfdopts", OPT_REMOVED("use --demuxer-lavf-...")},
-    {"lua", OPT_REPLACED("script")},
-    {"lua-opts", OPT_REPLACED("script-opts")},
-    {"mixer-channel", OPT_REMOVED("use AO suboptions (alsa, oss)")},
-    {"mixer", OPT_REMOVED("use AO suboptions (alsa, oss)")},
-    {"mouse-movements", OPT_REPLACED("input-cursor")},
-    {"msgcolor", OPT_REPLACED("msg-color")},
-    {"msglevel", OPT_REMOVED("use --msg-level (changed semantics)")},
-    {"msgmodule", OPT_REPLACED("msg-module")},
-    {"name", OPT_REPLACED("x11-name")},
-    {"noar", OPT_REPLACED("no-input-appleremote")},
-    {"noautosub", OPT_REPLACED("no-sub-auto")},
-    {"noconsolecontrols", OPT_REPLACED("no-input-terminal")},
-    {"nosound", OPT_REPLACED("no-audio")},
-    {"osdlevel", OPT_REPLACED("osd-level")},
-    {"panscanrange", OPT_REMOVED("use --video-zoom, --video-pan-x/y")},
-    {"playing-msg", OPT_REPLACED("term-playing-msg")},
-    {"pp", OPT_REMOVED(NULL)},
-    {"pphelp", OPT_REMOVED(NULL)},
-    {"rawaudio", OPT_REMOVED("use --demuxer-rawaudio-...")},
-    {"rawvideo", OPT_REMOVED("use --demuxer-rawvideo-...")},
-    {"spugauss", OPT_REPLACED("sub-gauss")},
-    {"srate", OPT_REPLACED("audio-samplerate")},
-    {"ss", OPT_REPLACED("start")},
-    {"stop-xscreensaver", OPT_REPLACED("stop-screensaver")},
-    {"sub-fuzziness", OPT_REPLACED("sub-auto")},
-    {"subcp", OPT_REPLACED("sub-codepage")},
-    {"subdelay", OPT_REPLACED("sub-delay")},
-    {"subfile", OPT_REPLACED("sub-file")},
-    {"subfont-text-scale", OPT_REPLACED("sub-scale")},
-    {"subfont", OPT_REPLACED("sub-text-font")},
-    {"subfps", OPT_REPLACED("sub-fps")},
-    {"subpos", OPT_REPLACED("sub-pos")},
-    {"tvscan", OPT_REPLACED("tv-scan")},
-    {"use-filename-title", OPT_REMOVED("use --title='${filename}'")},
-    {"vc", OPT_REMOVED("use --vd=..., --hwdec=...")},
-    {"vobsub", OPT_REMOVED("use --sub-file (pass the .idx file)")},
-    {"xineramascreen", OPT_REMOVED("use --screen (different values)")},
-    {"xy", OPT_REMOVED("use --autofit")},
-    {"zoom", OPT_REMOVED("Inverse available as ``--video-unscaled")},
-    {"media-keys", OPT_REPLACED("input-media-keys")},
-    {"right-alt-gr", OPT_REPLACED("input-right-alt-gr")},
-    {"autosub", OPT_REPLACED("sub-auto")},
-    {"autosub-match", OPT_REPLACED("sub-auto")},
-    {"status-msg", OPT_REPLACED("term-status-msg")},
-    {"idx", OPT_REPLACED("index")},
-    {"forceidx", OPT_REPLACED("index")},
-    {"cache-pause-below", OPT_REMOVED("for 'no', use --no-cache-pause")},
-    {"no-cache-pause-below", OPT_REMOVED("use --no-cache-pause")},
-    {"volstep", OPT_REMOVED("edit input.conf directly instead")},
-    {"fixed-vo", OPT_REMOVED("--fixed-vo=yes is now the default")},
-    {"mkv-subtitle-preroll", OPT_REPLACED("demuxer-mkv-subtitle-preroll")},
-    {"ass-use-margins", OPT_REPLACED("sub-use-margins")},
-    {"media-title", OPT_REPLACED("force-media-title")},
-    {"input-unix-socket", OPT_REPLACED("input-ipc-server")},
-    {"softvol-max", OPT_REPLACED("volume-max")},
-    {"bluray-angle", OPT_REMOVED("this didn't do anything for a few releases")},
-    {"sub-text-font", OPT_REPLACED("sub-font")},
-    {"sub-text-font-size", OPT_REPLACED("sub-font-size")},
-    {"sub-text-color", OPT_REPLACED("sub-color")},
-    {"sub-text-border-color", OPT_REPLACED("sub-border-color")},
-    {"sub-text-shadow-color", OPT_REPLACED("sub-shadow-color")},
-    {"sub-text-back-color", OPT_REPLACED("sub-back-color")},
-    {"sub-text-border-size", OPT_REPLACED("sub-border-size")},
-    {"sub-text-shadow-offset", OPT_REPLACED("sub-shadow-offset")},
-    {"sub-text-spacing", OPT_REPLACED("sub-spacing")},
-    {"sub-text-margin-x", OPT_REPLACED("sub-margin-x")},
-    {"sub-text-margin-y", OPT_REPLACED("sub-margin-y")},
-    {"sub-text-align-x", OPT_REPLACED("sub-align-x")},
-    {"sub-text-align-y", OPT_REPLACED("sub-align-y")},
-    {"sub-text-blur", OPT_REPLACED("sub-blur")},
-    {"sub-text-bold", OPT_REPLACED("sub-bold")},
-    {"sub-text-italic", OPT_REPLACED("sub-italic")},
-    {"ass-line-spacing", OPT_REPLACED("sub-ass-line-spacing")},
-    {"ass-force-margins", OPT_REPLACED("sub-ass-force-margins")},
-    {"ass-vsfilter-aspect-compat", OPT_REPLACED("sub-ass-vsfilter-aspect-compat")},
-    {"ass-vsfilter-color-compat", OPT_REPLACED("sub-ass-vsfilter-color-compat")},
-    {"ass-vsfilter-blur-compat", OPT_REPLACED("sub-ass-vsfilter-blur-compat")},
-    {"ass-force-style", OPT_REPLACED("sub-ass-force-style")},
-    {"ass-styles", OPT_REPLACED("sub-ass-styles")},
-    {"ass-hinting", OPT_REPLACED("sub-ass-hinting")},
-    {"ass-shaper", OPT_REPLACED("sub-ass-shaper")},
-    {"ass-style-override", OPT_REPLACED("sub-ass-style-override")},
-    {"ass-scale-with-window", OPT_REPLACED("sub-ass-scale-with-window")},
-    {"sub-ass-style-override", OPT_REPLACED("sub-ass-override")},
-    {"fs-black-out-screens", OPT_REMOVED(NULL)},
-    {"sub-paths", OPT_REPLACED("sub-file-paths")},
-    {"heartbeat-cmd", OPT_REMOVED("use Lua scripting instead")},
-    {"no-ometadata", OPT_REMOVED("use --no-ocopy-metadata")},
-    {"video-stereo-mode", OPT_REMOVED("removed, try --vf=stereo3d")},
-    {"chapter", OPT_REMOVED("use '--start=#123' '--end=#124' (for chapter 123)")},
-    {"video-aspect", OPT_REPLACED("video-aspect-override")},
-    {"display-fps", OPT_REPLACED("override-display-fps")},
-
     {0}
 };