gstreamer: define G_LOG_DOMAIN for all libraries

And get rid of weird way the define was done for core.

Fixes #634

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

diff --git a/subprojects/gstreamer/gst/gst.c b/subprojects/gstreamer/gst/gst.c
index 6ea42e0..7f2e993 100644 (file)
--- a/subprojects/gstreamer/gst/gst.c
+++ b/subprojects/gstreamer/gst/gst.c
@@ -168,8 +168,6 @@ static gboolean parse_goption_arg (const gchar * s_opt,
 
 GSList *_priv_gst_preload_plugins = NULL;
 
-const gchar g_log_domain_gstreamer[] = "GStreamer";
-
 static void
 debug_log_handler (const gchar * log_domain,
     GLogLevelFlags log_level, const gchar * message, gpointer user_data)
@@ -678,7 +676,8 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data,
   }
 
   llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL;
-  g_log_set_handler (g_log_domain_gstreamer, llf, debug_log_handler, NULL);
+  /* TODO: should we also set up a handler for the other gst libs/domains? */
+  g_log_set_handler (G_LOG_DOMAIN, llf, debug_log_handler, NULL);
 
   _priv_gst_mini_object_initialize ();
   _priv_gst_quarks_initialize ();

diff --git a/subprojects/gstreamer/gst/gst_private.h b/subprojects/gstreamer/gst/gst_private.h
index 739981a..3addaa7 100644 (file)
--- a/subprojects/gstreamer/gst/gst_private.h
+++ b/subprojects/gstreamer/gst/gst_private.h
@@ -29,10 +29,6 @@
 # endif
 #endif
 
-/* This needs to be before glib.h, since it might be used in inline
- * functions */
-extern const char             g_log_domain_gstreamer[];
-
 #include <glib.h>
 
 #include <stdlib.h>

diff --git a/subprojects/gstreamer/gst/meson.build b/subprojects/gstreamer/gst/meson.build
index 220ed43..b2afe7c 100644 (file)
--- a/subprojects/gstreamer/gst/meson.build
+++ b/subprojects/gstreamer/gst/meson.build
@@ -223,7 +223,7 @@ subdir('printf')
 
 libgst_c_args = gst_c_args + [
   '-D_GNU_SOURCE',
-  '-DG_LOG_DOMAIN=g_log_domain_gstreamer',
+  '-DG_LOG_DOMAIN="GStreamer"',
   '-DGST_DISABLE_DEPRECATED',
 ]
 

diff --git a/subprojects/gstreamer/libs/gst/base/meson.build b/subprojects/gstreamer/libs/gst/base/meson.build
index a354635..04ebd52 100644 (file)
--- a/subprojects/gstreamer/libs/gst/base/meson.build
+++ b/subprojects/gstreamer/libs/gst/base/meson.build
@@ -40,7 +40,7 @@ gst_base_headers = files(
 
 gst_base = library('gstbase-@0@'.format(apiversion),
   gst_base_sources,
-  c_args : gst_c_args + ['-DBUILDING_GST_BASE'],
+  c_args : gst_c_args + ['-DBUILDING_GST_BASE', '-DG_LOG_DOMAIN="GStreamer-Base"'],
   version : libversion,
   soversion : soversion,
   darwin_versions : osxversion,

diff --git a/subprojects/gstreamer/libs/gst/check/meson.build b/subprojects/gstreamer/libs/gst/check/meson.build
index 0984a08..22cd3be 100644 (file)
--- a/subprojects/gstreamer/libs/gst/check/meson.build
+++ b/subprojects/gstreamer/libs/gst/check/meson.build
@@ -38,7 +38,7 @@ configure_file(input : 'libcheck/check.h.in',
 
 gst_check = library('gstcheck-@0@'.format(apiversion),
   gst_check_sources,
-  c_args : gst_c_args + ['-UG_DISABLE_ASSERT', '-DBUILDING_GST_CHECK'],
+  c_args : gst_c_args + ['-UG_DISABLE_ASSERT', '-DBUILDING_GST_CHECK', '-DG_LOG_DOMAIN="GStreamer-Check"'],
   version : libversion,
   soversion : soversion,
   darwin_versions : osxversion,

diff --git a/subprojects/gstreamer/libs/gst/controller/meson.build b/subprojects/gstreamer/libs/gst/controller/meson.build
index 24c8792..57f22e8 100644 (file)
--- a/subprojects/gstreamer/libs/gst/controller/meson.build
+++ b/subprojects/gstreamer/libs/gst/controller/meson.build
@@ -39,7 +39,7 @@ gstcontroller_h = controller_enums[1]
 gst_controller_gen_sources = [gstcontroller_h]
 gst_controller = library('gstcontroller-@0@'.format(apiversion),
   gst_controller_sources, gstcontroller_h, gstcontroller_c,
-  c_args : gst_c_args + ['-DBUILDING_GST_CONTROLLER'],
+  c_args : gst_c_args + ['-DBUILDING_GST_CONTROLLER', '-DG_LOG_DOMAIN="GStreamer-Controller"'],
   install : true,
   version : libversion,
   soversion : soversion,

diff --git a/subprojects/gstreamer/libs/gst/net/meson.build b/subprojects/gstreamer/libs/gst/net/meson.build
index 343df53..a884d26 100644 (file)
--- a/subprojects/gstreamer/libs/gst/net/meson.build
+++ b/subprojects/gstreamer/libs/gst/net/meson.build
@@ -26,7 +26,7 @@ install_headers(gst_net_headers, subdir : 'gstreamer-1.0/gst/net/')
 gst_net_gen_sources = []
 gst_net = library('gstnet-@0@'.format(apiversion),
   gst_net_sources,
-  c_args : gst_c_args + ['-DBUILDING_GST_NET'],
+  c_args : gst_c_args + ['-DBUILDING_GST_NET', '-DG_LOG_DOMAIN="GStreamer-Net"'],
   include_directories : [configinc, libsinc],
   version : libversion,
   soversion : soversion,