From 494ac4e3a86cfc1ef8a0a2c455701fa6b1ca9992 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Thu, 28 Sep 2017 17:45:00 +0200
Subject: [PATCH] libs: display: remove display_type from display info

Since it's no required to pass the display type in the display info,
the structure member is removed.

https://bugzilla.gnome.org/show_bug.cgi?id=782212
---
 gst-libs/gst/vaapi/gstvaapidisplay.c         | 3 ---
 gst-libs/gst/vaapi/gstvaapidisplay.h         | 1 -
 gst-libs/gst/vaapi/gstvaapidisplay_drm.c     | 1 -
 gst-libs/gst/vaapi/gstvaapidisplay_wayland.c | 1 -
 gst-libs/gst/vaapi/gstvaapidisplay_x11.c     | 2 --
 5 files changed, 8 deletions(-)

diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.c b/gst-libs/gst/vaapi/gstvaapidisplay.c
index ba5e550..30abf91 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.c
@@ -839,7 +839,6 @@ gst_vaapi_display_create_unlocked (GstVaapiDisplay * display,
       GST_VAAPI_DISPLAY_GET_CLASS (display);
   GstVaapiDisplayInfo info = {
     .display = display,
-    .display_type = klass->display_type,
   };
 
   switch (init_type) {
@@ -847,7 +846,6 @@ gst_vaapi_display_create_unlocked (GstVaapiDisplay * display,
       GstVaapiDisplayInfo *p_info = data;
 
       info.va_display = p_info->va_display;
-      info.display_type = p_info->display_type;
       priv->display = p_info->va_display;
       priv->use_foreign_display = TRUE;
 
@@ -1166,7 +1164,6 @@ gst_vaapi_display_new_with_display (VADisplay va_display)
 {
   GstVaapiDisplayInfo info = {
     .va_display = va_display,
-    .display_type = GST_VAAPI_DISPLAY_TYPE_ANY,
   };
 
   return gst_vaapi_display_new (g_object_new (GST_TYPE_VAAPI_DISPLAY, NULL),
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.h b/gst-libs/gst/vaapi/gstvaapidisplay.h
index 8eba5fb..01a2859 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.h
@@ -127,7 +127,6 @@ gst_vaapi_display_type_is_compatible (GstVaapiDisplayType type1,
 struct _GstVaapiDisplayInfo
 {
   GstVaapiDisplay *display;
-  GstVaapiDisplayType display_type;
   gchar *display_name;
   VADisplay va_display;
   gpointer native_display;
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_drm.c b/gst-libs/gst/vaapi/gstvaapidisplay_drm.c
index a129cce..95becdb 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_drm.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_drm.c
@@ -311,7 +311,6 @@ gst_vaapi_display_drm_get_display_info (GstVaapiDisplay * display,
     info->va_display = vaGetDisplayDRM (priv->drm_device);
     if (!info->va_display)
       return FALSE;
-    info->display_type = GST_VAAPI_DISPLAY_TYPE_DRM;
   }
   return TRUE;
 }
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c b/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c
index 951e030..13d40a2 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c
@@ -239,7 +239,6 @@ gst_vaapi_display_wayland_get_display_info (GstVaapiDisplay * display,
     info->va_display = vaGetDisplayWl (priv->wl_display);
     if (!info->va_display)
       return FALSE;
-    info->display_type = GST_VAAPI_DISPLAY_TYPE_WAYLAND;
   }
   return TRUE;
 }
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_x11.c b/gst-libs/gst/vaapi/gstvaapidisplay_x11.c
index ee36009..7131fe8 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_x11.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_x11.c
@@ -225,7 +225,6 @@ gst_vaapi_display_x11_get_display_info (GstVaapiDisplay * display,
     info->va_display = vaGetDisplay (priv->x11_display);
     if (!info->va_display)
       return FALSE;
-    info->display_type = GST_VAAPI_DISPLAY_TYPE_X11;
   }
   return TRUE;
 }
@@ -380,7 +379,6 @@ gst_vaapi_display_x11_new_with_va_display (VADisplay va_display,
   GstVaapiDisplayInfo info = {
     .va_display = va_display,
     .native_display = x11_display,
-    .display_type = GST_VAAPI_DISPLAY_TYPE_X11,
   };
 
   g_return_val_if_fail (x11_display, NULL);
-- 
2.7.4