Second Life viewer sources 1.19.1.0

1 files changed, 27 insertions, 55 deletions

diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index e24cbc7..0366e75 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -37,12 +37,12 @@
 #include "lloverlaybar.h"
 
 #include "audioengine.h"
+#include "llglimmediate.h"
 #include "llagent.h"
 #include "llbutton.h"
 #include "llchatbar.h"
 #include "llfocusmgr.h"
 #include "llimview.h"
-#include "llmediaengine.h"
 #include "llmediaremotectrl.h"
 #include "llpanelaudiovolume.h"
 #include "llparcel.h"
@@ -50,7 +50,10 @@
 #include "llui.h"
 #include "llviewercontrol.h"
 #include "llviewerimagelist.h"
+#include "llviewermedia.h"
 #include "llviewermenu.h"       // handle_reset_view()
+#include "llviewermedia.h"
+#include "llviewerparcelmedia.h"
 #include "llviewerparcelmgr.h"
 #include "llvieweruictrlfactory.h"
 #include "llviewerwindow.h"
@@ -97,7 +100,6 @@ LLOverlayBar::LLOverlayBar()
         :       LLPanel(),
                 mMediaRemote(NULL),
                 mVoiceRemote(NULL),
-                mMediaState(STOPPED),
                 mMusicState(STOPPED)
 {
         setMouseOpaque(FALSE);
@@ -122,7 +124,7 @@ BOOL LLOverlayBar::postBuild()
         childSetAction("Stand Up",onClickStandUp,this);
         childSetVisible("chat_bar", gSavedSettings.getBOOL("ChatVisible"));
 
-        mIsFocusRoot = TRUE;
+        setFocusRoot(TRUE);
         mBuilt = true;
 
         layoutButtons();
@@ -219,7 +221,7 @@ void LLOverlayBar::refresh()
 
         BOOL controls_grabbed = gAgent.anyControlGrabbed();
         button = LLUICtrlFactory::getButtonByName(this, "Release Keys");
-        
+
         if (button && button->getVisible() != controls_grabbed)
         {
                 button->setVisible(controls_grabbed);
@@ -230,7 +232,7 @@ void LLOverlayBar::refresh()
 
         BOOL mouselook_grabbed;
         mouselook_grabbed = gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)
-                                                || gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX);
+                || gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX);
         button = LLUICtrlFactory::getButtonByName(this, "Mouselook");
 
         if (button && button->getVisible() != mouselook_grabbed)
@@ -256,7 +258,6 @@ void LLOverlayBar::refresh()
                 buttons_changed = TRUE;
         }
 
-        enableMediaButtons();
 
         moveChildToBackOfTabGroup(mMediaRemote);
         moveChildToBackOfTabGroup(mVoiceRemote);
@@ -330,7 +331,15 @@ void LLOverlayBar::onClickStandUp(void*)
 ////////////////////////////////////////////////////////////////////////////////
 // static media helpers
 // *TODO: Move this into an audio manager abstraction
-
+//static
+void LLOverlayBar::mediaStop(void*)
+{
+        if (!gOverlayBar)
+        {
+                return;
+        }
+        LLViewerParcelMedia::stop();
+}
 //static
 void LLOverlayBar::toggleMediaPlay(void*)
 {
@@ -339,24 +348,23 @@ void LLOverlayBar::toggleMediaPlay(void*)
                 return;
         }
 
-        if (gOverlayBar->mMediaState != PLAYING)
+        
+        if (LLViewerMedia::isMediaPaused())
+        {
+                LLViewerParcelMedia::start();
+        }
+        else if(LLViewerMedia::isMediaPlaying())
+        {
+                LLViewerParcelMedia::pause();
+        }
+        else
         {
-                gOverlayBar->mMediaState = PLAYING; // desired state
                 LLParcel* parcel = gParcelMgr->getAgentParcel();
                 if (parcel)
                 {
-                        LLString path("");
-                        LLMediaEngine::getInstance()->convertImageAndLoadUrl( true, false, path );
+                        LLViewerParcelMedia::play(parcel);
                 }
         }
-        else
-        {
-                gOverlayBar->mMediaState = PAUSED; // desired state
-                LLMediaEngine::getInstance()->pause();
-        }
-
-        //gOverlayBar->mMediaState = STOPPED; // desired state
-        //LLMediaEngine::getInstance()->stop();
 }
 
 //static
@@ -402,39 +410,3 @@ void LLOverlayBar::toggleMusicPlay(void*)
         }
 }
 
-void LLOverlayBar::enableMediaButtons()
-{
-        if (mMediaRemote)
-        {
-                // Music
-                LLParcel* parcel = gParcelMgr->getAgentParcel();
-                if (parcel 
-                        && gAudiop
-                        && !parcel->getMusicURL().empty()
-                        && gSavedSettings.getBOOL("AudioStreamingMusic"))
-                {
-                        mMediaRemote->childSetEnabled("music_play", TRUE);
-                }
-                else
-                {
-                        mMediaRemote->childSetEnabled("music_play", FALSE);
-                }
-
-                // Media
-                // if there is a url and a texture and media is enabled and available and media streaming is on... (phew!)
-                if (LLMediaEngine::getInstance() 
-                        && LLMediaEngine::getInstance()->getUrl ().length () 
-                        && LLMediaEngine::getInstance()->getImageUUID ().notNull () 
-                        && LLMediaEngine::getInstance()->isEnabled () 
-                        && LLMediaEngine::getInstance()->isAvailable () 
-                        && gSavedSettings.getBOOL ( "AudioStreamingVideo" ) )
-                {
-                        mMediaRemote->childSetEnabled("media_play", TRUE);
-                }
-                else
-                {
-                        mMediaRemote->childSetEnabled("media_play", FALSE);     
-                }
-        }
-}
-