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.

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 187fb9d..2b3727a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-02-27  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/newview/llfloaterabout.cpp:
+        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/llui/CMakeLists.txt:
         LLUI's CMakeList needs LLMedia cmake stuff.
 
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)