mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 04:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

info: make it possible to remove default log handler before gst_init()

Browse source 
Make sure it's not even added then, so that we never output
anything via the default log handler then.

https://bugzilla.gnome.org/show_bug.cgi?id=751538
This commit is contained in:
Tim-Philipp Müller 2016-02-29 19:04:16 +00:00
parent 9df4bda65d
commit 50888062ba
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/gstinfo.c
View file

@ -253,6 +253,9 @@ LogFuncEntry;
static GMutex __log_func_mutex; static GMutex __log_func_mutex;
static GSList *__log_functions = NULL; static GSList *__log_functions = NULL;
/* whether to add the default log function in gst_init() */
static gboolean add_default_log_func = TRUE;
#define PRETTY_TAGS_DEFAULT TRUE #define PRETTY_TAGS_DEFAULT TRUE
static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; static gboolean pretty_tags = PRETTY_TAGS_DEFAULT;
@ -321,7 +324,8 @@ _priv_gst_debug_init (void)
_GST_CAT_DEBUG = _gst_debug_category_new ("GST_DEBUG", _GST_CAT_DEBUG = _gst_debug_category_new ("GST_DEBUG",
GST_DEBUG_BOLD | GST_DEBUG_FG_YELLOW, "debugging subsystem"); GST_DEBUG_BOLD | GST_DEBUG_FG_YELLOW, "debugging subsystem");
gst_debug_add_log_function (gst_debug_log_default, log_file, NULL); if (add_default_log_func)
gst_debug_add_log_function (gst_debug_log_default, log_file, NULL);
/* FIXME: add descriptions here */ /* FIXME: add descriptions here */
GST_CAT_GST_INIT = _gst_debug_category_new ("GST_INIT", GST_CAT_GST_INIT = _gst_debug_category_new ("GST_INIT",
@ -1265,9 +1269,18 @@ gst_debug_remove_log_function (GstLogFunction func)
removals = removals =
gst_debug_remove_with_compare_func gst_debug_remove_with_compare_func
(gst_debug_compare_log_function_by_func, (gpointer) func); (gst_debug_compare_log_function_by_func, (gpointer) func);
if (gst_is_initialized ())
if (gst_is_initialized ()) {
GST_DEBUG ("removed log function %p %d times from log function list", func, GST_DEBUG ("removed log function %p %d times from log function list", func,
removals); removals);
} else {
/* If the default log function is removed before gst_init() was called,
* set a flag so we don't add it in gst_init() later */
if (func == gst_debug_log_default) {
add_default_log_func = FALSE;
++removals;
}
}
return removals; return removals;
} }