soup: fix soup debug category

Use soup debug category in souploader
for soup plugin element load.

Inititalize properly soup utils category.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2535>

diff --git a/subprojects/gst-plugins-good/ext/soup/gstsoup.c b/subprojects/gst-plugins-good/ext/soup/gstsoup.c
index c993c6c..523f478 100644 (file)
--- a/subprojects/gst-plugins-good/ext/soup/gstsoup.c
+++ b/subprojects/gst-plugins-good/ext/soup/gstsoup.c
@@ -22,10 +22,6 @@
 #include "gstsoupelements.h"
 #include "gstsouploader.h"
 
-GST_DEBUG_CATEGORY (gst_soup_debug);
-
-#define GST_CAT_DEFAULT gst_soup_debug
-
 static gboolean
 plugin_init (GstPlugin * plugin)
 {

diff --git a/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c b/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c
index 7451006..bd1ad35 100644 (file)
--- a/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c
+++ b/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c
@@ -24,6 +24,7 @@
 #include "gstsouputils.h"
 
 GST_DEBUG_CATEGORY (soup_utils_debug);
+#define GST_CAT_DEFAULT soup_utils_debug
 
 gboolean
 soup_element_init (GstPlugin * plugin)

diff --git a/subprojects/gst-plugins-good/ext/soup/gstsouploader.c b/subprojects/gst-plugins-good/ext/soup/gstsouploader.c
index ff123f1..a2b2f85 100644 (file)
--- a/subprojects/gst-plugins-good/ext/soup/gstsouploader.c
+++ b/subprojects/gst-plugins-good/ext/soup/gstsouploader.c
@@ -34,7 +34,7 @@
 GST_DEBUG_CATEGORY (gst_adaptivedemux_soup_debug);
 #define GST_CAT_DEFAULT gst_adaptivedemux_soup_debug
 #else
-GST_DEBUG_CATEGORY_EXTERN (gst_soup_debug);
+GST_DEBUG_CATEGORY (gst_soup_debug);
 #define GST_CAT_DEFAULT gst_soup_debug
 #endif
 
@@ -160,6 +160,8 @@ gst_soup_load_library (void)
 #ifdef BUILDING_ADAPTIVEDEMUX2
   GST_DEBUG_CATEGORY_INIT (gst_adaptivedemux_soup_debug, "adaptivedemux2-soup",
       0, "adaptivedemux2-soup");
+#else
+  GST_DEBUG_CATEGORY_INIT (gst_soup_debug, "soup", 0, "soup");
 #endif
 
 #ifdef HAVE_RTLD_NOLOAD