Implemented LLMediaImplGStreamer::gstreamer_log().

3 files changed, 61 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a7ad544..d0f2f6c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-04-02  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Implemented LLMediaImplGStreamer::gstreamer_log().
+        * linden/indra/llmedia/llmediaimplgstreamer.h:
+        Ditto.
+
+
         * linden/indra/newview/llviewercontrol.cpp:
         Implemented handleMediaDebugLevelChanged hook.
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 82b1096..8cbfb60 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -255,6 +255,46 @@ void LLMediaImplGStreamer::set_gst_plugin_path()
 }
 
 
+void LLMediaImplGStreamer::gstreamer_log(GstDebugCategory *category,
+                                         GstDebugLevel level,
+                                         const gchar *file,
+                                         const gchar *function,
+                                         gint line,
+                                         GObject *object,
+                                         GstDebugMessage *message,
+                                         gpointer data)
+{
+        std::stringstream log(std::stringstream::out);
+
+        // Log format example:
+        // 
+        // GST_ELEMENT_PADS: removing pad 'sink' (in gstelement.c:757:gst_element_remove_pad)
+        // 
+        log << gst_debug_category_get_name( category ) << ": "
+            << gst_debug_message_get(message) << " "
+            << "(in " << file << ":" << line << ":" << function << ")";
+
+        switch( level )
+        {
+                case GST_LEVEL_ERROR:
+                        LL_ERRS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                case GST_LEVEL_WARNING:
+                        LL_WARNS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                case GST_LEVEL_DEBUG:
+                        LL_DEBUGS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                case GST_LEVEL_INFO:
+                        LL_INFOS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                default:
+                        // Do nothing.
+                        break;
+        }
+}
+
+
 bool LLMediaImplGStreamer::closedown()
 {
         return true;
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();