options: remove some options with .deprecation_message

In both cases, setting these options did nothing other than give you a warning that they may be removed in the future. Remove them now.
mpv-player · Jun 24, 2024 · 8daf406 · 8daf406
1 parent 3257d02
commit 8daf406
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/DOCS/interface-changes/option-removal.txt b/DOCS/interface-changes/option-removal.txt
@@ -5,3 +5,5 @@ remove deprecated `--fps` option alias
 remove deprecated `--cdrom-device` option alias
 remove deprecated `--sub-forced-only` option alias
 remove deprecated `--vo-sixel-exit-clear` option alias
+remove deprecated `--cdda-toc-bias` option
+remove deprecated `--drm-atomic` option
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
@@ -62,7 +62,6 @@ typedef struct cdda_params {
     int paranoia_mode;
     int sector_size;
     int search_overlap;
-    int toc_bias;
     int toc_offset;
     bool skip;
     char *device;
@@ -78,8 +77,6 @@ const struct m_sub_options stream_cdda_conf = {
         {"paranoia", OPT_INT(paranoia_mode), M_RANGE(0, 2)},
         {"sector-size", OPT_INT(sector_size), M_RANGE(1, 100)},
         {"overlap", OPT_INT(search_overlap), M_RANGE(0, 75)},
-        {"toc-bias", OPT_INT(toc_bias),
-            .deprecation_message = "toc-bias is no longer used"},
         {"toc-offset", OPT_INT(toc_offset)},
         {"skip", OPT_BOOL(skip)},
         {"span-a", OPT_INT(span[0])},

diff --git a/video/out/drm_common.c b/video/out/drm_common.c
@@ -81,8 +81,6 @@ const struct m_sub_options drm_conf = {
             .help = drm_connector_opt_help},
         {"drm-mode", OPT_STRING_VALIDATE(mode_spec, drm_validate_mode_opt),
             .help = drm_mode_opt_help},
-        {"drm-atomic", OPT_CHOICE(drm_atomic, {"no", 0}, {"auto", 1}),
-            .deprecation_message = "this option is deprecated: DRM Atomic is required"},
         {"drm-draw-plane", OPT_CHOICE(draw_plane,
             {"primary", DRM_OPTS_PRIMARY_PLANE},
             {"overlay", DRM_OPTS_OVERLAY_PLANE}),
@@ -104,7 +102,6 @@ const struct m_sub_options drm_conf = {
     },
     .defaults = &(const struct drm_opts) {
         .mode_spec = "preferred",
-        .drm_atomic = 1,
         .draw_plane = DRM_OPTS_PRIMARY_PLANE,
         .drmprime_video_plane = DRM_OPTS_OVERLAY_PLANE,
         .drm_format = DRM_OPTS_FORMAT_XRGB8888,