Imprudence style gstreamer plugin (remove llgst, syms and such)

4 files changed, 30 insertions, 56 deletions

diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index e903df7..e713e22 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -43,7 +43,7 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llchatbar.h"
-#include "llfloaterchat.h"
+//#include "llfloaterchat.h"
 #include "llfocusmgr.h"
 #include "llimview.h"
 #include "llmediaremotectrl.h"
@@ -75,60 +75,10 @@ LLOverlayBar *gOverlayBar = NULL;
 
 extern S32 MENU_BAR_HEIGHT;
 
-//awfixme
-/*
-class LLTitleObserver
-        :       public LLMediaObserver
-{
-public:
-        void init(std::string url);
-        *//*virtual*//* void onMediaTitleChange(const EventType& event_in);
-private:
-        LLMediaBase* mMediaSource;
-};
-
-static LLTitleObserver sTitleObserver;
-
-static LLRegisterWidget<LLMediaRemoteCtrl> r("media_remote");
-
-void LLTitleObserver::init(std::string url)
-{
-
-        if (!gAudiop)
-        {
-                return;
-        }
-
-        mMediaSource = gAudiop->getStreamMedia(); // LLViewerMedia::getSource();
-
-        if ( mMediaSource )
-        {
-                mMediaSource->addObserver(this);
-        }
-}
-
-//virtual
-void LLTitleObserver::onMediaTitleChange(const EventType& event_in)
-{
-        if ( !gSavedSettings.getBOOL("ShowStreamTitle") )
-        {
-                return;
-        }
-
-        LLChat chat;
-        //TODO: set this in XUI
-        std::string playing_msg = "Playing: " + event_in.getStringValue();
-        chat.mText = playing_msg;
-        LLFloaterChat::addChat(chat, FALSE, FALSE);
-}
-*/
-
 //
 // Functions
 //
 
-
-
 void* LLOverlayBar::createMediaRemote(void* userdata)
 {
         LLOverlayBar *self = (LLOverlayBar*)userdata;   
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 237a967..64a2308 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -39,7 +39,7 @@
 #else
 #       include <sys/stat.h>            // mkdir()
 #endif
-
+#include "llpluginclassmediaowner.h"
 #include "llviewermedia_streamingaudio.h"
 #include "llaudioengine.h"
 
diff --git a/linden/indra/newview/llviewermedia_streamingaudio.cpp b/linden/indra/newview/llviewermedia_streamingaudio.cpp
index 06946da..575dbc8 100644
--- a/linden/indra/newview/llviewermedia_streamingaudio.cpp
+++ b/linden/indra/newview/llviewermedia_streamingaudio.cpp
@@ -36,6 +36,7 @@
 #include "linden_common.h"
 #include "llpluginclassmedia.h"
 #include "llviewermedia.h"
+#include "llviewercontrol.h"
 
 #include "llviewermedia_streamingaudio.h"
 
@@ -43,6 +44,8 @@
 #include "llvfs.h"
 #include "lldir.h"
 
+#include "llchat.h"
+#include "llfloaterchat.h"
 
 LLStreamingAudio_MediaPlugins::LLStreamingAudio_MediaPlugins() :
         mMediaPlugin(NULL),
@@ -153,9 +156,26 @@ std::string LLStreamingAudio_MediaPlugins::getURL()
         return mURL;
 }
 
+void LLStreamingAudio_MediaPlugins::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
+{
+        if (event == MEDIA_EVENT_NAME_CHANGED)
+        {
+                std::string title = self->getMediaName();
+                if (!title.empty() && gSavedSettings.getBOOL("ShowStreamTitle"))
+                {
+                        //llinfos << "Playing: " << title << llendl;
+                        LLChat chat;
+                        //TODO: set this in XUI
+                        std::string playing_msg = "Playing: " + title;
+                        chat.mText = playing_msg;
+                        LLFloaterChat::addChat(chat, FALSE, FALSE);
+                }
+        }
+}
+
 LLPluginClassMedia* LLStreamingAudio_MediaPlugins::initializeMedia(const std::string& media_type)
 {
-        LLPluginClassMediaOwner* owner = NULL;
+        LLPluginClassMediaOwner* owner = this;
         S32 default_size = 1; // audio-only - be minimal, doesn't matter
         LLPluginClassMedia* media_source = LLViewerMediaImpl::newSourceFromMediaType(media_type, owner, default_size, default_size);
 
diff --git a/linden/indra/newview/llviewermedia_streamingaudio.h b/linden/indra/newview/llviewermedia_streamingaudio.h
index 270bab7..816e213 100644
--- a/linden/indra/newview/llviewermedia_streamingaudio.h
+++ b/linden/indra/newview/llviewermedia_streamingaudio.h
@@ -36,12 +36,13 @@
 
 
 #include "stdtypes.h" // from llcommon
-
 #include "llstreamingaudio.h"
 
 class LLPluginClassMedia;
 
-class LLStreamingAudio_MediaPlugins : public LLStreamingAudioInterface
+class LLStreamingAudio_MediaPlugins :
+        public LLStreamingAudioInterface,
+        public LLPluginClassMediaOwner
 {
  public:
         LLStreamingAudio_MediaPlugins();
@@ -56,14 +57,17 @@ class LLStreamingAudio_MediaPlugins : public LLStreamingAudioInterface
         /*virtual*/ F32 getGain();
         /*virtual*/ std::string getURL();
 
+        // inherited from LLPluginClassMediaOwner
+        /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+
 private:
         LLPluginClassMedia* initializeMedia(const std::string& media_type);
 
         LLPluginClassMedia *mMediaPlugin;
-
         std::string mURL;
         F32 mGain;
 };
 
 
+
 #endif //LL_VIEWERMEDIA_STREAMINGAUDIO_H