From 1992bb51515b46555e2a75b780dc79d973b7cf3a Mon Sep 17 00:00:00 2001
From: Lionel CHAZALLON <LongChair@hotmail.com>
Date: Sun, 22 Oct 2017 23:59:58 -0700
Subject: video : Move drm options to substruct.

This allows to group them and most of all query the group config when
needed and when we don't have the access to vo.
---
 options/options.c | 6 ++----
 options/options.h | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'options')

diff --git a/options/options.c b/options/options.c
index a79a57f449..8e940be347 100644
--- a/options/options.c
+++ b/options/options.c
@@ -70,6 +70,7 @@ extern const struct m_sub_options stream_dvb_conf;
 extern const struct m_sub_options stream_lavf_conf;
 extern const struct m_sub_options stream_cache_conf;
 extern const struct m_sub_options sws_conf;
+extern const struct m_sub_options drm_conf;
 extern const struct m_sub_options demux_rawaudio_conf;
 extern const struct m_sub_options demux_rawvideo_conf;
 extern const struct m_sub_options demux_lavf_conf;
@@ -179,10 +180,7 @@ static const m_option_t mp_vo_opt_list[] = {
     OPT_STRING("vo-mmcss-profile", mmcss_profile, 0),
 #endif
 #if HAVE_DRM
-    OPT_STRING_VALIDATE("drm-connector", drm_connector_spec,
-                        0, drm_validate_connector_opt),
-    OPT_INT("drm-mode", drm_mode_id, 0),
-    OPT_INT("drm-overlay", drm_overlay_id, 0),
+    OPT_SUBSTRUCT("", drm_opts, drm_conf, 0),
 #endif
     OPT_STRING_VALIDATE("opengl-hwdec-interop", gl_hwdec_interop, 0,
                         ra_hwdec_validate_opt),
diff --git a/options/options.h b/options/options.h
index 008111ade3..0d697a717c 100644
--- a/options/options.h
+++ b/options/options.h
@@ -55,9 +55,7 @@ typedef struct mp_vo_opts {
     // vo_opengl, vo_opengl_cb
     char *gl_hwdec_interop;
     // vo_drm
-    char *drm_connector_spec;
-    int drm_mode_id;
-    int drm_overlay_id;
+    struct drm_opts *drm_opts;
 } mp_vo_opts;
 
 struct mp_cache_opts {
-- 
cgit v1.2.3