From 5a0e76234c4a910cfdc3cba19109de5d94435360 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 27 Feb 2009 23:58:57 -0600
Subject: Get gstreamer reference from media manager.

Eliminates the need to include llmediaimplgstreamer.h,
which causes problems on Linux due to name clash between
libxml2 and expat's XMLCALLs.
---
 linden/indra/newview/llfloaterabout.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index aeca4b5..be1c254 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -42,7 +42,6 @@
 #include "llcurl.h"
 #include "llimagej2c.h"
 #include "audioengine.h"
-#include "llmediaimplgstreamer.h"
 
 #include "llviewertexteditor.h"
 #include "llviewercontrol.h"
@@ -209,14 +208,13 @@ LLFloaterAbout::LLFloaterAbout()
 	LLMediaManager *mgr = LLMediaManager::getInstance();
 	if (mgr)
 	{
-		LLMediaBase *gstreamer = new LLMediaImplGStreamer();
+		LLMediaBase *gstreamer = mgr->createSourceFromMimeType("http", "audio/mpeg");
 		if (gstreamer)
 		{
 			support.append("GStreamer Version: ");
 			support.append( gstreamer->getVersion() );
 			support.append("\n");
 		} 
-		delete gstreamer;
 
 		LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html");
 		if (media_source)
-- 
cgit v1.1