From 65c5b9a4f6f76d4e30576856c38fada47d7f502c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Sun, 24 Jun 2018 00:17:26 +0200
Subject: [PATCH] msdk: Update for g_type_class_add_private() deprecation in
 recent GLib

Untested.
---
 sys/msdk/gstmsdkbufferpool.c | 20 +++++++-------------
 sys/msdk/gstmsdkcontext.c    | 18 +++++++-----------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/sys/msdk/gstmsdkbufferpool.c b/sys/msdk/gstmsdkbufferpool.c
index 7dfad05..a18b965 100644
--- a/sys/msdk/gstmsdkbufferpool.c
+++ b/sys/msdk/gstmsdkbufferpool.c
@@ -40,16 +40,6 @@
 GST_DEBUG_CATEGORY_STATIC (gst_debug_msdkbufferpool);
 #define GST_CAT_DEFAULT gst_debug_msdkbufferpool
 
-#define GST_MSDK_BUFFER_POOL_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_MSDK_BUFFER_POOL, \
-      GstMsdkBufferPoolPrivate))
-
-#define gst_msdk_buffer_pool_parent_class parent_class
-G_DEFINE_TYPE_WITH_CODE (GstMsdkBufferPool, gst_msdk_buffer_pool,
-    GST_TYPE_VIDEO_BUFFER_POOL,
-    GST_DEBUG_CATEGORY_INIT (gst_debug_msdkbufferpool, "msdkbufferpool", 0,
-        "MSDK Buffer Pool"));
-
 typedef enum _GstMsdkMemoryType
 {
   GST_MSDK_MEMORY_TYPE_SYSTEM,
@@ -66,6 +56,12 @@ struct _GstMsdkBufferPoolPrivate
   gboolean add_videometa;
 };
 
+#define gst_msdk_buffer_pool_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstMsdkBufferPool, gst_msdk_buffer_pool,
+    GST_TYPE_VIDEO_BUFFER_POOL, G_ADD_PRIVATE (GstMsdkBufferPool)
+    GST_DEBUG_CATEGORY_INIT (gst_debug_msdkbufferpool, "msdkbufferpool", 0,
+        "MSDK Buffer Pool"));
+
 static const gchar **
 gst_msdk_buffer_pool_get_options (GstBufferPool * pool)
 {
@@ -351,7 +347,7 @@ gst_msdk_buffer_pool_finalize (GObject * object)
 static void
 gst_msdk_buffer_pool_init (GstMsdkBufferPool * pool)
 {
-  pool->priv = GST_MSDK_BUFFER_POOL_GET_PRIVATE (pool);
+  pool->priv = gst_msdk_buffer_pool_get_instance_private (pool);
 }
 
 static void
@@ -360,8 +356,6 @@ gst_msdk_buffer_pool_class_init (GstMsdkBufferPoolClass * klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GstBufferPoolClass *pool_class = GST_BUFFER_POOL_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GstMsdkBufferPoolPrivate));
-
   object_class->finalize = gst_msdk_buffer_pool_finalize;
 
   pool_class->get_options = gst_msdk_buffer_pool_get_options;
diff --git a/sys/msdk/gstmsdkcontext.c b/sys/msdk/gstmsdkcontext.c
index a952370..2511bfa 100644
--- a/sys/msdk/gstmsdkcontext.c
+++ b/sys/msdk/gstmsdkcontext.c
@@ -41,15 +41,6 @@
 GST_DEBUG_CATEGORY_STATIC (gst_debug_msdkcontext);
 #define GST_CAT_DEFAULT gst_debug_msdkcontext
 
-#define GST_MSDK_CONTEXT_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_MSDK_CONTEXT, \
-      GstMsdkContextPrivate))
-
-#define gst_msdk_context_parent_class parent_class
-G_DEFINE_TYPE_WITH_CODE (GstMsdkContext, gst_msdk_context, GST_TYPE_OBJECT,
-    GST_DEBUG_CATEGORY_INIT (gst_debug_msdkcontext, "msdkcontext", 0,
-        "MSDK Context"));
-
 struct _GstMsdkContextPrivate
 {
   mfxSession session;
@@ -66,6 +57,12 @@ struct _GstMsdkContextPrivate
 #endif
 };
 
+#define gst_msdk_context_parent_class parent_class
+G_DEFINE_TYPE_WITH_CODE (GstMsdkContext, gst_msdk_context, GST_TYPE_OBJECT,
+    G_ADD_PRIVATE (GstMsdkContext)
+    GST_DEBUG_CATEGORY_INIT (gst_debug_msdkcontext, "msdkcontext", 0,
+        "MSDK Context"));
+
 #ifndef _WIN32
 
 static gint
@@ -208,7 +205,7 @@ failed:
 static void
 gst_msdk_context_init (GstMsdkContext * context)
 {
-  GstMsdkContextPrivate *priv = GST_MSDK_CONTEXT_GET_PRIVATE (context);
+  GstMsdkContextPrivate *priv = gst_msdk_context_get_instance_private (context);
 
   context->priv = priv;
 
@@ -257,7 +254,6 @@ static void
 gst_msdk_context_class_init (GstMsdkContextClass * klass)
 {
   GObjectClass *const g_object_class = G_OBJECT_CLASS (klass);
-  g_type_class_add_private (klass, sizeof (GstMsdkContextPrivate));
 
   g_object_class->finalize = gst_msdk_context_finalize;
 }
-- 
2.7.4