From 9f06d36d95b5bd37a0732d3e131bd816577f4cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 16 Mar 2015 17:49:58 +0000 Subject: [PATCH] dtls: make sure we actually log into the right debug category GST_DTLS_USE_GST_LOG is not defined anywhere, so we'd just log into the default category by accident. We use the gst logging system unconditionally now, so might just as well remove this #if #else. --- ext/dtls/gstdtlsagent.c | 7 ++----- ext/dtls/gstdtlscertificate.c | 7 ++----- ext/dtls/gstdtlsconnection.c | 6 +----- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ext/dtls/gstdtlsagent.c b/ext/dtls/gstdtlsagent.c index b52505819a..837ef30b02 100644 --- a/ext/dtls/gstdtlsagent.c +++ b/ext/dtls/gstdtlsagent.c @@ -39,15 +39,12 @@ #include #include -#if GST_DTLS_USE_GST_LOG 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_WITH_CODE (GstDtlsAgent, gst_dtls_agent, G_TYPE_OBJECT, GST_DEBUG_CATEGORY_INIT (gst_dtls_agent_debug, "dtlsagent", 0, "DTLS Agent")); -#else -G_DEFINE_TYPE (GstDtlsAgent, gst_dtls_agent, G_TYPE_OBJECT); -#endif #define GST_DTLS_AGENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), GST_TYPE_DTLS_AGENT, GstDtlsAgentPrivate)) diff --git a/ext/dtls/gstdtlscertificate.c b/ext/dtls/gstdtlscertificate.c index 3d368f2bae..e37494f0d7 100644 --- a/ext/dtls/gstdtlscertificate.c +++ b/ext/dtls/gstdtlscertificate.c @@ -40,15 +40,12 @@ #include -#if GST_DTLS_USE_GST_LOG 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")); -#else -G_DEFINE_TYPE (GstDtlsCertificate, gst_dtls_certificate, G_TYPE_OBJECT); -#endif #define GST_DTLS_CERTIFICATE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), GST_TYPE_DTLS_CERTIFICATE, GstDtlsCertificatePrivate)) diff --git a/ext/dtls/gstdtlsconnection.c b/ext/dtls/gstdtlsconnection.c index ffa93394ff..c84e9f20a4 100644 --- a/ext/dtls/gstdtlsconnection.c +++ b/ext/dtls/gstdtlsconnection.c @@ -42,15 +42,11 @@ #include #include -#if GST_DTLS_USE_GST_LOG 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")); -#else -G_DEFINE_TYPE (GstDtlsConnection, gst_dtls_connection, G_TYPE_OBJECT); -#endif #define GST_DTLS_CONNECTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), GST_TYPE_DTLS_CONNECTION, GstDtlsConnectionPrivate))