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

gstreamer: define G_LOG_DOMAIN for all libraries

Browse source 
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>
This commit is contained in:
Tim-Philipp Müller 2021-10-01 15:29:36 +01:00 committed by GStreamer Marge Bot
parent fbf02b6802
commit 16e7048d82
7 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subprojects/gstreamer/gst/gst.c
View file

@ -168,8 +168,6 @@ static gboolean parse_goption_arg (const gchar * s_opt,
GSList *_priv_gst_preload_plugins = NULL; GSList *_priv_gst_preload_plugins = NULL;
const gchar g_log_domain_gstreamer[] = "GStreamer";
static void static void
debug_log_handler (const gchar * log_domain, debug_log_handler (const gchar * log_domain,
GLogLevelFlags log_level, const gchar * message, gpointer user_data) 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; 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_mini_object_initialize ();
_priv_gst_quarks_initialize (); _priv_gst_quarks_initialize ();

4
subprojects/gstreamer/gst/gst_private.h
View file

@ -29,10 +29,6 @@
# endif # endif
#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 <glib.h>
#include <stdlib.h> #include <stdlib.h>

2
subprojects/gstreamer/gst/meson.build
View file

@ -223,7 +223,7 @@ subdir('printf')
libgst_c_args = gst_c_args + [ libgst_c_args = gst_c_args + [
'-D_GNU_SOURCE', '-D_GNU_SOURCE',
'-DG_LOG_DOMAIN=g_log_domain_gstreamer', '-DG_LOG_DOMAIN="GStreamer"',
'-DGST_DISABLE_DEPRECATED', '-DGST_DISABLE_DEPRECATED',
] ]

2
subprojects/gstreamer/libs/gst/base/meson.build
View file

@ -40,7 +40,7 @@ gst_base_headers = files(
gst_base = library('gstbase-@0@'.format(apiversion), gst_base = library('gstbase-@0@'.format(apiversion),
gst_base_sources, 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, version : libversion,
soversion : soversion, soversion : soversion,
darwin_versions : osxversion, darwin_versions : osxversion,

2
subprojects/gstreamer/libs/gst/check/meson.build
View file

@ -38,7 +38,7 @@ configure_file(input : 'libcheck/check.h.in',
gst_check = library('gstcheck-@0@'.format(apiversion), gst_check = library('gstcheck-@0@'.format(apiversion),
gst_check_sources, 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, version : libversion,
soversion : soversion, soversion : soversion,
darwin_versions : osxversion, darwin_versions : osxversion,

2
subprojects/gstreamer/libs/gst/controller/meson.build
View file

@ -39,7 +39,7 @@ gstcontroller_h = controller_enums[1]
gst_controller_gen_sources = [gstcontroller_h] gst_controller_gen_sources = [gstcontroller_h]
gst_controller = library('gstcontroller-@0@'.format(apiversion), gst_controller = library('gstcontroller-@0@'.format(apiversion),
gst_controller_sources, gstcontroller_h, gstcontroller_c, 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, install : true,
version : libversion, version : libversion,
soversion : soversion, soversion : soversion,

2
subprojects/gstreamer/libs/gst/net/meson.build
View file

@ -26,7 +26,7 @@ install_headers(gst_net_headers, subdir : 'gstreamer-1.0/gst/net/')
gst_net_gen_sources = [] gst_net_gen_sources = []
gst_net = library('gstnet-@0@'.format(apiversion), gst_net = library('gstnet-@0@'.format(apiversion),
gst_net_sources, 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], include_directories : [configinc, libsinc],
version : libversion, version : libversion,
soversion : soversion, soversion : soversion,