Second Life viewer sources 1.18.1.2

1 files changed, 27 insertions, 140 deletions

diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 4549c3b..0d524b0 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -30,179 +30,66 @@
 
 #include "llmediaremotectrl.h"
 
-#include "llui.h"
-#include "lltextbox.h"
-#include "llbutton.h"
-#include "llfocusmgr.h"
-#include "llmediaengine.h"
-#include "llviewercontrol.h"
+#include "lloverlaybar.h"
 #include "llvieweruictrlfactory.h"
+#include "llpanelaudiovolume.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 //
-LLMediaRemoteCtrl::
-LLMediaRemoteCtrl ( const std::string& name,
-                                        const std::string& label,
-                                        const LLRect& rect,
-                                        const std::string& xml_file ) :
+LLMediaRemoteCtrl::LLMediaRemoteCtrl ( const LLString& name,
+                                                                           const LLString& label,
+                                                                           const LLRect& rect,
+                                                                           const LLString& xml_file ) :
         LLPanel ( name, rect, FALSE )
 {
-        setFollows(FOLLOWS_LEFT | FOLLOWS_TOP);
-        setBackgroundVisible(TRUE);
         setIsChrome(TRUE);
 
         gUICtrlFactory->buildPanel(this, xml_file);
 
-        playButton = LLUICtrlFactory::getButtonByName(this, "play_btn");
-        stopButton = LLUICtrlFactory::getButtonByName(this, "stop_btn");
-        pauseButton = LLUICtrlFactory::getButtonByName(this, "pause_btn");
-        
-        childSetAction("play_btn",onPlayButton,this);
-        childSetAction("stop_btn",onStopButton,this);
-        childSetAction("pause_btn",onPauseButton,this);
-
-        mVolumeSlider = LLViewerUICtrlFactory::getVolumeSliderByName(this, "volume_slider");    
-        
-        childSetCommitCallback("volume_slider", onCommitVolume, this);
-
         mIsFocusRoot = TRUE;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//
-//
-LLMediaRemoteCtrl::
-~LLMediaRemoteCtrl ()
+BOOL LLMediaRemoteCtrl::postBuild()
 {
-}
+        childSetAction("media_play",LLOverlayBar::mediaPlay,this);
+        childSetAction("media_stop",LLOverlayBar::mediaStop,this);
+        childSetAction("media_pause",LLOverlayBar::mediaPause,this);
 
-EWidgetType LLMediaRemoteCtrl::getWidgetType() const
-{
-        return WIDGET_TYPE_MEDIA_REMOTE;
-}
+        childSetAction("music_play",LLOverlayBar::musicPlay,this);
+        childSetAction("music_stop",LLOverlayBar::musicStop,this);
+        childSetAction("music_pause",LLOverlayBar::musicPause,this);
 
-LLString LLMediaRemoteCtrl::getWidgetTag() const
-{
-        return LL_MEDIA_REMOTE_CTRL_TAG;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-//
-void
-LLMediaRemoteCtrl::
-setTransportState ( TransportState transportStateIn, BOOL pauseEnabled )
-{
-        transportState = transportStateIn;
-
-        if ( transportState == Play )
-        {
-                playButton->setVisible ( TRUE );
-                playButton->setEnabled ( pauseEnabled );
-
-                pauseButton->setVisible ( FALSE );
-                pauseButton->setEnabled ( FALSE );
-
-                stopButton->setVisible ( TRUE );
-                stopButton->setEnabled ( TRUE );
-        }
-        else
-        if ( transportState == Pause )
-        {
-                playButton->setVisible ( FALSE );
-                playButton->setEnabled ( FALSE );
-
-                pauseButton->setVisible ( TRUE );
-                pauseButton->setEnabled ( TRUE );
-
-                stopButton->setVisible ( TRUE );
-                stopButton->setEnabled ( TRUE );
-        }
-        else
-        if ( transportState == Stop )
-        {
-                playButton->setVisible ( TRUE );
-                playButton->setEnabled ( TRUE );
-
-                pauseButton->setVisible ( FALSE );
-                pauseButton->setEnabled ( FALSE );
-
-                stopButton->setVisible ( TRUE );
-                stopButton->setEnabled ( FALSE );
-        };
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-//
-LLMediaRemoteCtrl::TransportState
-LLMediaRemoteCtrl::
-getTransportState ()
-{
-        return transportState;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-//
-//
-void
-LLMediaRemoteCtrl::
-setVolume ( F32 volumeIn )
-{
-        mVolumeSlider->setValue ( volumeIn );
+        childSetAction("volume",LLOverlayBar::toggleAudioVolumeFloater,this);
+        
+        return TRUE;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//
-//
-void
-LLMediaRemoteCtrl::
-onCommitVolume ( LLUICtrl* ctrl, void* data )
+LLMediaRemoteCtrl::~LLMediaRemoteCtrl ()
 {
-        LLMediaRemoteCtrl* self = ( LLMediaRemoteCtrl* ) data;
-
-        LLMediaRemoteCtrlEvent event ( self, (F32)self->mVolumeSlider->getValue().asReal() );
-        self->mediaRemoteCtrlEventEmitter.update ( &LLMediaRemoteCtrlObserver::onVolumeChange, event );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 //
-void
-LLMediaRemoteCtrl::
-onPlayButton ( void* data )
+EWidgetType LLMediaRemoteCtrl::getWidgetType() const
 {
-        LLMediaRemoteCtrl* self = ( LLMediaRemoteCtrl* ) data;
-
-        LLMediaRemoteCtrlEvent event ( self, 0.0f );
-        self->mediaRemoteCtrlEventEmitter.update ( &LLMediaRemoteCtrlObserver::onPlayButtonPressed, event );
+        return WIDGET_TYPE_MEDIA_REMOTE;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//
-//
-void
-LLMediaRemoteCtrl::
-onPauseButton ( void* data )
+LLString LLMediaRemoteCtrl::getWidgetTag() const
 {
-        LLMediaRemoteCtrl* self = ( LLMediaRemoteCtrl* ) data;
-
-        LLMediaRemoteCtrlEvent event ( self, 0.0f );
-        self->mediaRemoteCtrlEventEmitter.update ( &LLMediaRemoteCtrlObserver::onPauseButtonPressed, event );
+        return LL_MEDIA_REMOTE_CTRL_TAG;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 //
-void
-LLMediaRemoteCtrl::
-onStopButton ( void* data )
+void LLMediaRemoteCtrl::draw()
 {
-        LLMediaRemoteCtrl* self = ( LLMediaRemoteCtrl* ) data;
-
-        LLMediaRemoteCtrlEvent event ( self, 0.0f );
-        self->mediaRemoteCtrlEventEmitter.update ( &LLMediaRemoteCtrlObserver::onStopButtonPressed, event );
+        LLOverlayBar::enableMusicButtons(this);
+        LLOverlayBar::enableMediaButtons(this);
+        LLPanel::draw();
+        // make volume button reflect of volume floater
+        childSetValue("volume", LLFloaterAudioVolume::instanceVisible(LLSD()));
 }
-