From e4792e0768162d07b45f8ed19002f7a13c3bebb4 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 1 Apr 2009 23:47:05 -0500
Subject: Implemented LLMediaImplGstreamer::setDebugLevel().

---
 linden/indra/llmedia/llmediaimplgstreamer.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linden/indra/llmedia/llmediaimplgstreamer.h')

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 2918416..282da08 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -69,6 +69,8 @@ class LLMediaImplGStreamer:
 		// Sets GST_PLUGIN_PATH env var for GStreamer.
 		static void set_gst_plugin_path();
 
+		/* virtual */ bool setDebugLevel( LLMediaBase::EDebugLevel level );
+
 		/* virtual */ std::string getVersion();
 		/* virtual */ bool navigateTo( const std::string url );
 		/* virtual */ bool updateMedia();
-- 
cgit v1.1


From 33e649ca1bca260de474842d30d3bf8178e61be4 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 2 Apr 2009 02:29:46 -0500
Subject: Implemented LLMediaImplGStreamer::gstreamer_log().

---
 linden/indra/llmedia/llmediaimplgstreamer.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'linden/indra/llmedia/llmediaimplgstreamer.h')

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 282da08..37eaf53 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -71,6 +71,21 @@ class LLMediaImplGStreamer:
 
 		/* virtual */ bool setDebugLevel( LLMediaBase::EDebugLevel level );
 
+		// Function given to GStreamer for handling debug messages
+		static void gstreamer_log(GstDebugCategory *category,
+		                          GstDebugLevel level,
+		                          const gchar *file,
+		                          const gchar *function,
+		                          gint line,
+		                          GObject *object,
+		                          GstDebugMessage *message,
+		                          gpointer data)
+#if __GNUC__
+		                          // recommended by the gstreamer docs
+		                          G_GNUC_NO_INSTRUMENT
+#endif
+		                          ;
+
 		/* virtual */ std::string getVersion();
 		/* virtual */ bool navigateTo( const std::string url );
 		/* virtual */ bool updateMedia();
-- 
cgit v1.1