typefind: Fix debug category usage

Only register it in one place and use it everywhere from the header. Also make
sure it doesn't clash with the debug category from core.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/972>

diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index da56455968b775210597a733e9c195954c8e2c67..7635e4dcb916ee27b18bfe1f0066eaf2f94107ab 100644 (file)
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -45,9 +45,6 @@
 
 #include "gsttypefindfunctionsplugin.h"
 
-GST_DEBUG_CATEGORY_STATIC (type_find_debug);
-#define GST_CAT_DEFAULT type_find_debug
-
 /* DataScanCtx: helper for typefind functions that scan through data
  * step-by-step, to avoid doing a peek at each and every offset */
 

diff --git a/gst/typefind/gsttypefindfunctionsplugin.c b/gst/typefind/gsttypefindfunctionsplugin.c
index 94030d1fce7d4fa573da42ec599f0e1c68eb7284..c0e386aa2a28e3fbd68d99e29b24363a43fe78dc 100644 (file)
--- a/gst/typefind/gsttypefindfunctionsplugin.c
+++ b/gst/typefind/gsttypefindfunctionsplugin.c
@@ -30,14 +30,13 @@
 
 #include <gst/gst.h>
 
-GST_DEBUG_CATEGORY_STATIC (type_find_debug);
-#define GST_CAT_DEFAULT type_find_debug
+GST_DEBUG_CATEGORY (type_find_functions_debug);
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
   /* can't initialize this via a struct as caps can't be statically initialized */
-  GST_DEBUG_CATEGORY_INIT (type_find_debug, "typefindfunctions",
+  GST_DEBUG_CATEGORY_INIT (type_find_functions_debug, "typefindfunctions",
       GST_DEBUG_FG_GREEN | GST_DEBUG_BG_RED, "generic type find functions");
   /* note: asx/wax/wmx are XML files, asf doesn't handle them */
   /* must use strings, macros don't accept initializers */

diff --git a/gst/typefind/gsttypefindfunctionsplugin.h b/gst/typefind/gsttypefindfunctionsplugin.h
index 960c9103409bda5a146240400eb2c9be13ad00a0..0dfbc700b00bc13e52a42ed4bb16fed0fe738258 100644 (file)
--- a/gst/typefind/gsttypefindfunctionsplugin.h
+++ b/gst/typefind/gsttypefindfunctionsplugin.h
@@ -29,6 +29,9 @@
 
 #include <gst/gst.h>
 
+GST_DEBUG_CATEGORY_EXTERN (type_find_functions_debug);
+#define GST_CAT_DEFAULT type_find_functions_debug
+
 /*** plugin initialization ***/
 
 /*RIFF type find declaration */

diff --git a/gst/typefind/gsttypefindfunctionsstartwith.c b/gst/typefind/gsttypefindfunctionsstartwith.c
index decf9a88f2b2e6533c146fd9dd5e5d614092dc6f..14092e9cc863ecf5ce5942bfef7d723111cea2ec 100644 (file)
--- a/gst/typefind/gsttypefindfunctionsstartwith.c
+++ b/gst/typefind/gsttypefindfunctionsstartwith.c
@@ -33,9 +33,6 @@
 #include "gsttypefindfunctionsplugin.h"
 #include "gsttypefindfunctionsdata.h"
 
-GST_DEBUG_CATEGORY_STATIC (type_find_debug);
-#define GST_CAT_DEFAULT type_find_debug
-
 static void
 start_with_type_find (GstTypeFind * tf, gpointer private)
 {