From e73e69a48037502a7db5754f2f52b3e438e1ba05 Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Mon, 3 Dec 2018 13:56:52 +0100 Subject: [PATCH] Use G_DEFINE_TYPE_WITH_PRIVATE if applicable This gets rid of the strange `do_init` macro and makes the intent a bit more clear. --- gst-libs/gst/vaapi/gstvaapidisplay_drm.c | 7 ++----- gst-libs/gst/vaapi/gstvaapidisplay_wayland.c | 7 ++----- gst-libs/gst/vaapi/gstvaapidisplay_x11.c | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_drm.c b/gst-libs/gst/vaapi/gstvaapidisplay_drm.c index f39b4b74a4..2570754414 100644 --- a/gst-libs/gst/vaapi/gstvaapidisplay_drm.c +++ b/gst-libs/gst/vaapi/gstvaapidisplay_drm.c @@ -41,11 +41,8 @@ #define DEBUG_VAAPI_DISPLAY 1 #include "gstvaapidebug.h" -#define _do_init \ - G_ADD_PRIVATE (GstVaapiDisplayDRM); - -G_DEFINE_TYPE_WITH_CODE (GstVaapiDisplayDRM, gst_vaapi_display_drm, - GST_TYPE_VAAPI_DISPLAY, _do_init); +G_DEFINE_TYPE_WITH_PRIVATE (GstVaapiDisplayDRM, gst_vaapi_display_drm, + GST_TYPE_VAAPI_DISPLAY); typedef enum { diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c b/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c index 4b6fc1cae6..6147cbab23 100644 --- a/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c +++ b/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c @@ -35,11 +35,8 @@ #define DEBUG_VAAPI_DISPLAY 1 #include "gstvaapidebug.h" -#define _do_init \ - G_ADD_PRIVATE (GstVaapiDisplayWayland); - -G_DEFINE_TYPE_WITH_CODE (GstVaapiDisplayWayland, gst_vaapi_display_wayland, - GST_TYPE_VAAPI_DISPLAY, _do_init); +G_DEFINE_TYPE_WITH_PRIVATE (GstVaapiDisplayWayland, gst_vaapi_display_wayland, + GST_TYPE_VAAPI_DISPLAY); static inline const gchar * get_default_display_name (void) diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_x11.c b/gst-libs/gst/vaapi/gstvaapidisplay_x11.c index dbcfee4fe2..f5fa2fcee3 100644 --- a/gst-libs/gst/vaapi/gstvaapidisplay_x11.c +++ b/gst-libs/gst/vaapi/gstvaapidisplay_x11.c @@ -45,11 +45,8 @@ #define DEBUG_VAAPI_DISPLAY 1 #include "gstvaapidebug.h" -#define _do_init \ - G_ADD_PRIVATE (GstVaapiDisplayX11); - -G_DEFINE_TYPE_WITH_CODE (GstVaapiDisplayX11, gst_vaapi_display_x11, - GST_TYPE_VAAPI_DISPLAY, _do_init); +G_DEFINE_TYPE_WITH_PRIVATE (GstVaapiDisplayX11, gst_vaapi_display_x11, + GST_TYPE_VAAPI_DISPLAY); static inline const gchar * get_default_display_name (void)