From 1d64c72eed35a4b386dfeab6e88963e644fa5100 Mon Sep 17 00:00:00 2001
From: unknown
Date: Fri, 9 Jan 2009 10:39:27 -0700
Subject: minor gstreamer tweak

---
 linden/indra/llmedia/llmediaimplgstreamer.cpp | 8 ++++----
 linden/indra/llmedia/llmediaimplgstreamer.h   | 7 ++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index f4ff8c2..6fdaf43 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -230,7 +230,7 @@ bool LLMediaImplGStreamer::closedown()
 ///////////////////////////////////////////////////////////////////////////////
 //
 //#define LL_GST_REPORT_STATE_CHANGES
-///#ifdef LL_GST_REPORT_STATE_CHANGES
+#ifdef LL_GST_REPORT_STATE_CHANGES
 static const char* get_gst_state_name(GstState state)
 {
 	switch (state) 
@@ -243,7 +243,7 @@ static const char* get_gst_state_name(GstState state)
 	}
 	return "(unknown)";
 }
-///#endif // LL_GST_REPORT_STATE_CHANGES
+#endif // LL_GST_REPORT_STATE_CHANGES
 
 //static
 gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gpointer data)
@@ -276,10 +276,10 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
 						&old_state,
 						&new_state,
 						&pending_state);
-///#ifdef LL_GST_REPORT_STATE_CHANGES
+#ifdef LL_GST_REPORT_STATE_CHANGES
 		// not generally very useful, and rather spammy.
 		LL_DEBUGS("MediaState") << "GST state change (old,<new>,pending): "<< get_gst_state_name(old_state) << ",<" << get_gst_state_name(new_state) << ">," << get_gst_state_name(pending_state) << LL_ENDL;
-///#endif // LL_GST_REPORT_STATE_CHANGES
+#endif // LL_GST_REPORT_STATE_CHANGES
 
 			switch (new_state) 
 			{
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 6deb3f4..4b9353b 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -42,12 +42,9 @@
 extern "C" {
 #include <stdio.h>
 #include <gst/gst.h>
-
-#include "apr_pools.h"
-#include "apr_dso.h"
+#include <apr_pools.h>
+#include <apr_dso.h>
 }
-//#include <glib-object.h>
-//#include <gmain.h>
 
 #include "llmediaimplgstreamervidplug.h"
 #ifdef LL_GST_SOUNDSINK
-- 
cgit v1.1