1 files changed, 5 insertions, 55 deletions

diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 14ae3ff..1b60eee 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -38,12 +38,12 @@
 #include "lloverlaybar.h"
 
 #include "aoremotectrl.h"
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llrender.h"
 #include "llagent.h"
 #include "llbutton.h"
 #include "llchatbar.h"
-#include "llfloaterchat.h"
+//#include "llfloaterchat.h"
 #include "llfocusmgr.h"
 #include "llimview.h"
 #include "llmediaremotectrl.h"
@@ -63,7 +63,7 @@
 #include "llvoiceclient.h"
 #include "llvoavatar.h"
 #include "llvoiceremotectrl.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 #include "llwindlightremotectrl.h"
 #include "llselectmgr.h"
 
@@ -75,59 +75,10 @@ LLOverlayBar *gOverlayBar = NULL;
 
 extern S32 MENU_BAR_HEIGHT;
 
-
-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;   
@@ -448,11 +399,11 @@ void LLOverlayBar::toggleMediaPlay(void*)
         }
 
         
-        if (LLViewerMedia::isMediaPaused())
+        if (LLViewerParcelMedia::getStatus() == LLViewerMediaImpl::MEDIA_PAUSED)
         {
                 LLViewerParcelMedia::start();
         }
-        else if(LLViewerMedia::isMediaPlaying())
+        else if(LLViewerParcelMedia::getStatus() == LLViewerMediaImpl::MEDIA_PLAYING)
         {
                 LLViewerParcelMedia::pause();
         }
@@ -493,7 +444,6 @@ void LLOverlayBar::toggleMusicPlay(void*)
         //                      if ( gAudiop->isInternetStreamPlaying() == 0 )
                                 {
                                         gAudiop->startInternetStream(parcel->getMusicURL());
-                                        sTitleObserver.init(parcel->getMusicURL());
                                 }
                         }
                 }