[gst-cvs] gstreamer: gstdebug: compete stubs. Fixes #579177.

Stefan Kost ensonic at kemper.freedesktop.org
Fri Apr 17 05:08:19 PDT 2009


Module: gstreamer
Branch: master
Commit: 581ccbb5813873edfc5d0e2e35d7683d17fca971
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=581ccbb5813873edfc5d0e2e35d7683d17fca971

Author: Stefan Kost <ensonic at users.sf.net>
Date:   Thu Apr 16 22:26:00 2009 +0300

gstdebug: compete stubs. Fixes #579177.

Avoid defines when including gstinfo.h ourself and complete stubs. Sync stub
returns with the defines.

---

 gst/gstinfo.c |  118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gst/gstinfo.h |    8 +++-
 2 files changed, 124 insertions(+), 2 deletions(-)

diff --git a/gst/gstinfo.c b/gst/gstinfo.c
index 6d50478..97d5171 100644
--- a/gst/gstinfo.c
+++ b/gst/gstinfo.c
@@ -1565,6 +1565,12 @@ gst_debug_log_valist (GstDebugCategory * category, GstDebugLevel level,
 {
 }
 
+const gchar *
+gst_debug_message_get (GstDebugMessage * message)
+{
+  return "";
+}
+
 void
 gst_debug_log_default (GstDebugCategory * category, GstDebugLevel level,
     const gchar * file, const gchar * function, gint line,
@@ -1572,6 +1578,17 @@ gst_debug_log_default (GstDebugCategory * category, GstDebugLevel level,
 {
 }
 
+G_CONST_RETURN gchar *
+gst_debug_level_get_name (GstDebugLevel level)
+{
+  return "NONE";
+}
+
+void
+gst_debug_add_log_function (GstLogFunction func, gpointer data)
+{
+}
+
 guint
 gst_debug_remove_log_function (GstLogFunction func)
 {
@@ -1584,6 +1601,107 @@ gst_debug_remove_log_function_by_data (gpointer data)
   return 0;
 }
 
+void
+gst_debug_set_active (gboolean active)
+{
+}
+
+gboolean
+gst_debug_is_active (void)
+{
+  return FALSE;
+}
+
+void
+gst_debug_set_colored (gboolean colored)
+{
+}
+
+gboolean
+gst_debug_is_colored (void)
+{
+  return FALSE;
+}
+
+void
+gst_debug_set_default_threshold (GstDebugLevel level)
+{
+}
+
+GstDebugLevel
+gst_debug_get_default_threshold (void)
+{
+  return GST_LEVEL_NONE;
+}
+
+void
+gst_debug_set_threshold_for_name (const gchar * name, GstDebugLevel level)
+{
+}
+
+void
+gst_debug_unset_threshold_for_name (const gchar * name)
+{
+}
+
+void
+gst_debug_category_free (GstDebugCategory * category)
+{
+}
+
+void
+gst_debug_category_set_threshold (GstDebugCategory * category,
+    GstDebugLevel level)
+{
+}
+
+void
+gst_debug_category_reset_threshold (GstDebugCategory * category)
+{
+}
+
+GstDebugLevel
+gst_debug_category_get_threshold (GstDebugCategory * category)
+{
+  return GST_LEVEL_NONE;
+}
+
+G_CONST_RETURN gchar *
+gst_debug_category_get_name (GstDebugCategory * category)
+{
+  return "";
+}
+
+guint
+gst_debug_category_get_color (GstDebugCategory * category)
+{
+  return 0;
+}
+
+G_CONST_RETURN gchar *
+gst_debug_category_get_description (GstDebugCategory * category)
+{
+  return "";
+}
+
+GSList *
+gst_debug_get_all_categories (void)
+{
+  return NULL;
+}
+
+gchar *
+gst_debug_construct_term_color (guint colorinfo)
+{
+  return g_strdup ("00");
+}
+
+gint
+gst_debug_construct_win_color (guint colorinfo)
+{
+  return 0;
+}
+
 gboolean
 _priv_gst_in_valgrind (void)
 {
diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 37a4a3b..a58b807 100644
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -1089,7 +1089,9 @@ G_CONST_RETURN gchar *
 #else /* GST_DISABLE_GST_DEBUG */
 
 
-#if !defined(GST_INFO_C) && defined(__GNUC__) && __GNUC__ >= 3
+#ifndef GST_INFO_C
+
+#if defined(__GNUC__) && __GNUC__ >= 3
 #  pragma GCC poison gst_debug_log
 #  pragma GCC poison gst_debug_log_valist
 #  pragma GCC poison _gst_debug_category_new
@@ -1101,7 +1103,7 @@ G_CONST_RETURN gchar *
 #define gst_debug_get_default_threshold()		(GST_LEVEL_NONE)
 
 #define gst_debug_level_get_name(level)				("NONE")
-#define gst_debug_message_get(message)  			("NONE")
+#define gst_debug_message_get(message)  			("")
 #define gst_debug_add_log_function(func,data)		/* NOP */
 guint gst_debug_remove_log_function (GstLogFunction func);
 guint gst_debug_remove_log_function_by_data (gpointer data);
@@ -1133,6 +1135,8 @@ guint gst_debug_remove_log_function_by_data (gpointer data);
 #define gst_debug_construct_term_color(colorinfo)	(g_strdup ("00"))
 #define gst_debug_construct_win_color(colorinfo)	(0)
 
+#endif /* !GST_INFO_C */
+
 #ifdef G_HAVE_ISO_VARARGS
 
 #define GST_CAT_LEVEL_LOG(cat,level,...)		/* NOP */





More information about the Gstreamer-commits mailing list