drm: remove selecting the card number with --drm-connector

f56043759494dd584c8d82e7890f92fada18e34b deprecated this since the
--drm-device path option was added as a replacement. Drop the card
number selection logic.

1 files changed, 1 insertions, 18 deletions

diff --git a/video/out/drm_common.c b/video/out/drm_common.c
index 929e584d8d..5faf305a6b 100644
--- a/video/out/drm_common.c
+++ b/video/out/drm_common.c
@@ -906,22 +906,6 @@ err:
     drmFreeDevices(devices, card_count);
 }
 
-
-static char *parse_connector_spec(struct vo_drm_state *drm)
-{
-    if (!drm->opts->connector_spec)
-        return NULL;
-    char *dot_ptr = strchr(drm->opts->connector_spec, '.');
-    if (dot_ptr) {
-        MP_WARN(drm, "Warning: Selecting a connector by index with drm-connector "
-                     "is deprecated. Use the drm-device option instead.\n");
-        drm->card_no = strtoul(drm->opts->connector_spec, NULL, 10);
-        return talloc_strdup(drm, dot_ptr + 1);
-    } else {
-        return talloc_strdup(drm, drm->opts->connector_spec);
-    }
-}
-
 static void drm_pflip_cb(int fd, unsigned int msc, unsigned int sec,
                          unsigned int usec, void *data)
 {
@@ -1031,7 +1015,6 @@ bool vo_drm_init(struct vo *vo)
     drm->opts = mp_get_config_group(drm, drm->vo->global, &drm_conf);
 
     drmModeRes *res = NULL;
-    char *connector_name = parse_connector_spec(drm);
     get_primary_device_path(drm);
 
     if (!drm->card_path) {
@@ -1058,7 +1041,7 @@ bool vo_drm_init(struct vo *vo)
         goto err;
     }
 
-    if (!setup_connector(drm, res, connector_name))
+    if (!setup_connector(drm, res, drm->opts->connector_spec))
         goto err;
     if (!setup_crtc(drm, res))
         goto err;