From: Thomas V. S. <tho...@pd...> - 2004-06-03 16:51:03
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Fri Jun 04 2004 02:51:02 EST Log message: add GST_DEBUG detection Modified files: . : ChangeLog gst : gst.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.564&r2=1.565 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.c.diff?r1=1.135&r2=1.136 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.564 retrieving revision 1.565 diff -u -d -r1.564 -r1.565 --- a/ChangeLog 3 Jun 2004 13:18:31 -0000 1.564 +++ b/ChangeLog 3 Jun 2004 16:50:49 -0000 1.565 @@ -1,3 +1,9 @@ +2004-06-03 Thomas Vander Stichele <thomas at apestaart dot org> + + * gst/gst.c: (parse_debug_list), (gst_init_check_with_popt_table): + check GST_DEBUG environment variable which is parsed the same way + as --gst-debug= 2004-05-28 Stephane Loeuillet <ste...@ti...> * gst/elements : gstaggregator.c gstfakesink.c gstfakesrc.c Index: gst.c RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v retrieving revision 1.135 retrieving revision 1.136 diff -u -d -r1.135 -r1.136 --- a/gst.c 29 Apr 2004 01:44:13 -0000 1.135 +++ b/gst.c 3 Jun 2004 16:50:50 -0000 1.136 @@ -99,6 +99,37 @@ ARG_REGISTRY }; +static void +parse_debug_list (const gchar * list) +{ + gchar **split; + gchar **walk; + g_return_if_fail (list != NULL); + walk = split = g_strsplit (list, ",", 0); + while (walk[0]) { + gchar **values = g_strsplit (walk[0], ":", 2); + if (values[0] && values[1]) { + gint level = 0; + g_strstrip (values[0]); + g_strstrip (values[1]); + level = strtol (values[1], NULL, 0); + if (level >= 0 && level < GST_LEVEL_COUNT) { + GST_DEBUG ("setting debugging to level %d for name \"%s\"", + level, values[0]); + gst_debug_set_threshold_for_name (values[0], level); + } + } + g_strfreev (values); + walk++; + } + g_strfreev (split); +} #ifndef NUL #define NUL '\0' #endif @@ -281,6 +312,8 @@ poptContext context; gint nextopt; GstPoptOption *options; + const gchar *gst_debug_env = NULL; GstPoptOption options_with[] = { {NULL, NUL, POPT_ARG_INCLUDE_TABLE, poptHelpOptions, 0, "Help options:", NULL}, @@ -325,6 +358,11 @@ context = poptGetContext ("GStreamer", *argc, (const char **) *argv, options, 0); + /* check for GST_DEBUG environment variable */ + gst_debug_env = g_getenv ("GST_DEBUG"); + if (gst_debug_env) + parse_debug_list (gst_debug_env); while ((nextopt = poptGetNextOpt (context)) > 0) { /* we only check for failures here, actual work is done in callbacks */ if (_gst_initialization_failure) @@ -365,36 +403,6 @@ } static void -parse_debug_list (const gchar * list) -{ - gchar **split; - gchar **walk; - - g_return_if_fail (list != NULL); - walk = split = g_strsplit (list, ",", 0); - while (walk[0]) { - gchar **values = g_strsplit (walk[0], ":", 2); - if (values[0] && values[1]) { - gint level = 0; - g_strstrip (values[0]); - g_strstrip (values[1]); - level = strtol (values[1], NULL, 0); - if (level >= 0 && level < GST_LEVEL_COUNT) { - GST_DEBUG ("setting debugging to level %d for name \"%s\"", - level, values[0]); - gst_debug_set_threshold_for_name (values[0], level); - } - } - g_strfreev (values); - walk++; - } - g_strfreev (split); -} -static void load_plugin_func (gpointer data, gpointer user_data) { GstPlugin *plugin; |