3 files changed, 7 insertions, 42 deletions

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 18afc45..b90d6e8 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -43,10 +43,6 @@ extern "C" {
 
 #include "llmediaimplgstreamervidplug.h"
 
-#ifdef LL_GST_SOUNDSINK
-#include "llmediaimplgstreamersndplug.h"
-#endif // LL_GST_SOUNDSINK
-
 #include "llmediaimplgstreamer_syms.h"
 
 #include "llerror.h"
@@ -77,9 +73,6 @@ LLMediaImplGStreamer () :
         mPlaybin ( NULL ),
         mVideoSink ( NULL ),
         mState( GST_STATE_NULL )
-#ifdef LL_GST_SOUNDSINK
-        ,mAudioSink ( NULL )
-#endif // LL_GST_SOUNDSINK
 {
         LL_DEBUGS("MediaManager") << "constructing media..." << LL_ENDL;
         mVolume = -1.0; // XXX Hack to make the vould change happend first time
@@ -115,21 +108,6 @@ LLMediaImplGStreamer () :
                 }
 
                 g_object_set(mPlaybin, "video-sink", mVideoSink, NULL);
-
-#ifdef LL_GST_SOUNDSINK
-                LL_DEBUGS("MediaManager") << "extrenal audio sink..." << LL_ENDL;
-                // instantiate and connect a custom audio sink
-                mAudioSink =
-                        GST_SLSOUND(llgst_element_factory_make ("private-slsound", "slsound"));
-                if (!mAudioSink)
-                {
-                        LL_WARN("MediaImpl") << "Could not instantiate private-slsound element." << LL_ENDL;
-                        // todo: cleanup.
-                        return; // error
-                }
-
-                g_object_set(mPlaybin, "audio-sink", mAudioSink, NULL);
-#endif
         }
 }
 
@@ -412,9 +390,6 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
             << LL_ENDL;
 
         if (NULL == mPump
-#ifdef LL_GST_SOUNDSINK
-            || NULL == mAudioSink
-#endif
             || NULL == mPlaybin)
         {
                 return false;
@@ -479,9 +454,6 @@ bool LLMediaImplGStreamer::updateMedia()
         
         // sanity check
         if (NULL == mPump
-#ifdef LL_GST_SOUNDSINK
-            || NULL == mAudioSink
-#endif
             || NULL == mPlaybin)
         {
 #ifdef LL_GST_REPORT_STATE_CHANGES
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 4b9353b..5b493ad 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -31,7 +31,7 @@
  */
 
 // header guard
-///#ifndef llmediaimplgstreamer_h
+#ifndef llmediaimplgstreamer_h
 #define llmediaimplgstreamer_h
 
 #include "llmediaimplcommon.h"
@@ -42,14 +42,12 @@
 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 "llmediaimplgstreamervidplug.h"
-#ifdef LL_GST_SOUNDSINK
-#include "llmediaimplgstreamersndplug.h"
-#endif // LL_GST_SOUNDSINK
 
 class LLMediaManagerData;
 class LLMediaImplMaker;
@@ -100,9 +98,6 @@ class LLMediaImplGStreamer:
                 GstElement *mPlaybin;
                 GstSLVideo *mVideoSink;
                 GstState mState;
-#ifdef LL_GST_SOUNDSINK
-                GstSLSound *mAudioSink;
-#endif // LL_GST_SOUNDSINK
                 GstState getState() const { return mState; }
 };
 
@@ -132,4 +127,4 @@ public:
 
 ///#endif // LL_GSTREAMER_ENABLED
 
-///#endif // llmediaimplgstreamer_h
+#endif // llmediaimplgstreamer_h
diff --git a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
index 892c50d..c95ef36 100644
--- a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
@@ -68,10 +68,8 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE (
     GST_STATIC_CAPS (SLV_ALLCAPS)
     );
 
-GST_BOILERPLATE (GstSLVideo, 
-                                 gst_slvideo, 
-                                 GstVideoSink, 
-                                 GST_TYPE_VIDEO_SINK);
+GST_BOILERPLATE (GstSLVideo, gst_slvideo, GstVideoSink,
+    GST_TYPE_VIDEO_SINK);
 
 static void gst_slvideo_set_property (GObject * object, guint prop_id,
                                       const GValue * value,