1 files changed, 2 insertions, 35 deletions

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 18afc45..bae8ad9 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
         }
 }
 
@@ -210,9 +188,6 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
                 
                 // Init our custom plugins - only really need do this once.
                 gst_slvideo_init_class();
-#if 0
-                gst_slsound_init_class();
-#endif
 
                 done_init = true;
         }
@@ -360,7 +335,6 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                 }
                 case GST_MESSAGE_TAG: 
                 {
-#if 0
                 GstTagList *tag_list;
                 gchar *title;
                 gchar *artist;
@@ -370,10 +344,9 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                 gboolean hazArtist = llgst_tag_list_get_string(tag_list,
                         GST_TAG_ARTIST, &artist);
                 if(hazTitle) 
-                    LL_INFOS("MediaInfo") << "Title is " << title << LL_ENDL;
+                        LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
                 if(hazArtist) 
-                    LL_INFOS("MediaInfo") << "Artist is " << artist << LL_ENDL;
-#endif
+                        LL_INFOS("MediaInfo") << "Artist: " << artist << LL_ENDL;
                         break;
                 }
                 case GST_MESSAGE_EOS:
@@ -412,9 +385,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 +449,6 @@ bool LLMediaImplGStreamer::updateMedia()
         
         // sanity check
         if (NULL == mPump
-#ifdef LL_GST_SOUNDSINK
-            || NULL == mAudioSink
-#endif
             || NULL == mPlaybin)
         {
 #ifdef LL_GST_REPORT_STATE_CHANGES