2 files changed, 18 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3ccf1b3..c13f7ad 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,6 +2,12 @@
 =-                         1.1.0                          -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
+2009-01-29  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Removed spammy gstreamer debug messages.
+
+
 2009-01-27  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/newview/llappviewer.cpp:
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index d889f6f..18afc45 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -248,7 +248,9 @@ static const char* get_gst_state_name(GstState state)
 //static
 gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gpointer data)
 {
+#ifdef LL_GST_REPORT_STATE_CHANGES
         LL_DEBUGS("MediaCallback") << "Got GST message type: " << LLGST_MESSAGE_TYPE_NAME (message) << LL_ENDL;
+#endif
 
         LLMediaImplGStreamer *impl = (LLMediaImplGStreamer*)data;
 
@@ -261,7 +263,9 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                         {
                                 gint percent = 0;
                                 llgst_message_parse_buffering(message, &percent);
+#ifdef LL_GST_REPORT_STATE_CHANGES
                                 LL_DEBUGS("MediaBuffering") << "GST buffering: " << percent << "%%" << LL_ENDL;
+#endif
                                 LLMediaEvent event( impl, percent );
                                 impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event );
                         }
@@ -286,11 +290,15 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                         case GST_STATE_VOID_PENDING:
                                 break;
                         case GST_STATE_NULL:
+#ifdef LL_GST_REPORT_STATE_CHANGES
                                 LL_DEBUGS("MediaImpl") << "State changed to NULL" << LL_ENDL;
+#endif
                                 if (impl->getState() == GST_STATE_PLAYING) 
                                 { // We got stoped by gstremer...
                                     impl->play();
+#ifdef LL_GST_REPORT_STATE_CHANGES
                                     LL_DEBUGS("MediaImpl") << "Trying to restart." << LL_ENDL;
+#endif
                                 }
                                 break;
                         case GST_STATE_READY:
@@ -476,7 +484,9 @@ bool LLMediaImplGStreamer::updateMedia()
 #endif
             || NULL == mPlaybin)
         {
+#ifdef LL_GST_REPORT_STATE_CHANGES
                 LL_DEBUGS("MediaImpl") << "dead media..." << LL_ENDL;
+#endif
                 return false;
         }
 
@@ -528,7 +538,9 @@ bool LLMediaImplGStreamer::updateMedia()
                 GST_OBJECT_LOCK(mVideoSink);
                 if (mVideoSink->retained_frame_ready)
                 {
+#ifdef LL_GST_REPORT_STATE_CHANGES
                         LL_DEBUGS("MediaImpl") <<"NEW FRAME " << LL_ENDL;
+#endif
                         if (mVideoSink->retained_frame_width != getMediaWidth() ||
                             mVideoSink->retained_frame_height != getMediaHeight())
                                 // *TODO: also check for change in format