mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

dtls: Update for g_type_class_add_private() deprecation in recent GLib

Browse source
This commit is contained in:
Tim-Philipp Müller 2018-06-24 00:17:26 +02:00
parent 6f46792f0f
commit 3c6f642fa6
3 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/dtls/gstdtlsagent.c
View file

@ -42,10 +42,6 @@
GST_DEBUG_CATEGORY_STATIC (gst_dtls_agent_debug); GST_DEBUG_CATEGORY_STATIC (gst_dtls_agent_debug);
#define GST_CAT_DEFAULT gst_dtls_agent_debug #define GST_CAT_DEFAULT gst_dtls_agent_debug
G_DEFINE_TYPE (GstDtlsAgent, gst_dtls_agent, G_TYPE_OBJECT);
#define GST_DTLS_AGENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), GST_TYPE_DTLS_AGENT, GstDtlsAgentPrivate))
enum enum
{ {
PROP_0, PROP_0,
@ -62,6 +58,8 @@ struct _GstDtlsAgentPrivate
GstDtlsCertificate *certificate; GstDtlsCertificate *certificate;
}; };
G_DEFINE_TYPE_WITH_PRIVATE (GstDtlsAgent, gst_dtls_agent, G_TYPE_OBJECT);
static void gst_dtls_agent_finalize (GObject * gobject); static void gst_dtls_agent_finalize (GObject * gobject);
static void gst_dtls_agent_set_property (GObject *, guint prop_id, static void gst_dtls_agent_set_property (GObject *, guint prop_id,
const GValue *, GParamSpec *); const GValue *, GParamSpec *);
@ -151,8 +149,6 @@ gst_dtls_agent_class_init (GstDtlsAgentClass * klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (GstDtlsAgentPrivate));
gobject_class->set_property = gst_dtls_agent_set_property; gobject_class->set_property = gst_dtls_agent_set_property;
gobject_class->finalize = gst_dtls_agent_finalize; gobject_class->finalize = gst_dtls_agent_finalize;
@ -171,7 +167,7 @@ gst_dtls_agent_class_init (GstDtlsAgentClass * klass)
static void static void
gst_dtls_agent_init (GstDtlsAgent * self) gst_dtls_agent_init (GstDtlsAgent * self)
{ {
GstDtlsAgentPrivate *priv = GST_DTLS_AGENT_GET_PRIVATE (self); GstDtlsAgentPrivate *priv = gst_dtls_agent_get_instance_private (self);
self->priv = priv; self->priv = priv;
ERR_clear_error (); ERR_clear_error ();

18
ext/dtls/gstdtlscertificate.c
View file

@ -50,12 +50,6 @@
GST_DEBUG_CATEGORY_STATIC (gst_dtls_certificate_debug); GST_DEBUG_CATEGORY_STATIC (gst_dtls_certificate_debug);
#define GST_CAT_DEFAULT gst_dtls_certificate_debug #define GST_CAT_DEFAULT gst_dtls_certificate_debug
G_DEFINE_TYPE_WITH_CODE (GstDtlsCertificate, gst_dtls_certificate,
G_TYPE_OBJECT, GST_DEBUG_CATEGORY_INIT (gst_dtls_certificate_debug,
"dtlscertificate", 0, "DTLS Certificate"));
#define GST_DTLS_CERTIFICATE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), GST_TYPE_DTLS_CERTIFICATE, GstDtlsCertificatePrivate))
enum enum
{ {
PROP_0, PROP_0,
@ -75,6 +69,11 @@ struct _GstDtlsCertificatePrivate
gchar *pem; gchar *pem;
}; };
G_DEFINE_TYPE_WITH_CODE (GstDtlsCertificate, gst_dtls_certificate,
G_TYPE_OBJECT, G_ADD_PRIVATE (GstDtlsCertificate)
GST_DEBUG_CATEGORY_INIT (gst_dtls_certificate_debug,
"dtlscertificate", 0, "DTLS Certificate"));
static void gst_dtls_certificate_finalize (GObject * gobject); static void gst_dtls_certificate_finalize (GObject * gobject);
static void gst_dtls_certificate_set_property (GObject *, guint prop_id, static void gst_dtls_certificate_set_property (GObject *, guint prop_id,
const GValue *, GParamSpec *); const GValue *, GParamSpec *);
@ -89,8 +88,6 @@ gst_dtls_certificate_class_init (GstDtlsCertificateClass * klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (GstDtlsCertificatePrivate));
gobject_class->set_property = gst_dtls_certificate_set_property; gobject_class->set_property = gst_dtls_certificate_set_property;
gobject_class->get_property = gst_dtls_certificate_get_property; gobject_class->get_property = gst_dtls_certificate_get_property;
@ -111,8 +108,9 @@ gst_dtls_certificate_class_init (GstDtlsCertificateClass * klass)
static void static void
gst_dtls_certificate_init (GstDtlsCertificate * self) gst_dtls_certificate_init (GstDtlsCertificate * self)
{ {
GstDtlsCertificatePrivate *priv = GST_DTLS_CERTIFICATE_GET_PRIVATE (self); GstDtlsCertificatePrivate *priv;
self->priv = priv;
self->priv = priv = gst_dtls_certificate_get_instance_private (self);
priv->x509 = NULL; priv->x509 = NULL;
priv->private_key = NULL; priv->private_key = NULL;

17
ext/dtls/gstdtlsconnection.c
View file

@ -46,11 +46,6 @@
GST_DEBUG_CATEGORY_STATIC (gst_dtls_connection_debug); GST_DEBUG_CATEGORY_STATIC (gst_dtls_connection_debug);
#define GST_CAT_DEFAULT gst_dtls_connection_debug #define GST_CAT_DEFAULT gst_dtls_connection_debug
G_DEFINE_TYPE_WITH_CODE (GstDtlsConnection, gst_dtls_connection, G_TYPE_OBJECT,
GST_DEBUG_CATEGORY_INIT (gst_dtls_connection_debug, "dtlsconnection", 0,
"DTLS Connection"));
#define GST_DTLS_CONNECTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), GST_TYPE_DTLS_CONNECTION, GstDtlsConnectionPrivate))
#define SRTP_KEY_LEN 16 #define SRTP_KEY_LEN 16
#define SRTP_SALT_LEN 14 #define SRTP_SALT_LEN 14
@ -99,6 +94,11 @@ struct _GstDtlsConnectionPrivate
GThreadPool *thread_pool; GThreadPool *thread_pool;
}; };
G_DEFINE_TYPE_WITH_CODE (GstDtlsConnection, gst_dtls_connection, G_TYPE_OBJECT,
G_ADD_PRIVATE (GstDtlsConnection)
GST_DEBUG_CATEGORY_INIT (gst_dtls_connection_debug, "dtlsconnection", 0,
"DTLS Connection"));
static void gst_dtls_connection_finalize (GObject * gobject); static void gst_dtls_connection_finalize (GObject * gobject);
static void gst_dtls_connection_set_property (GObject *, guint prop_id, static void gst_dtls_connection_set_property (GObject *, guint prop_id,
const GValue *, GParamSpec *); const GValue *, GParamSpec *);
@ -121,8 +121,6 @@ gst_dtls_connection_class_init (GstDtlsConnectionClass * klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (GstDtlsConnectionPrivate));
gobject_class->set_property = gst_dtls_connection_set_property; gobject_class->set_property = gst_dtls_connection_set_property;
connection_ex_index = connection_ex_index =
@ -163,8 +161,9 @@ gst_dtls_connection_class_init (GstDtlsConnectionClass * klass)
static void static void
gst_dtls_connection_init (GstDtlsConnection * self) gst_dtls_connection_init (GstDtlsConnection * self)
{ {
GstDtlsConnectionPrivate *priv = GST_DTLS_CONNECTION_GET_PRIVATE (self); GstDtlsConnectionPrivate *priv;
self->priv = priv;
self->priv = priv = gst_dtls_connection_get_instance_private (self);
priv->ssl = NULL; priv->ssl = NULL;
priv->bio = NULL; priv->bio = NULL;