Second Life viewer sources 1.18.1.2

1 files changed, 29 insertions, 16 deletions

diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 1f15023..de6c0ae 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -45,11 +45,10 @@ class LLUUID;
 class LLFrameTimer;
 class LLStatGraph;
 class LLSlider;
-class LLVolumeSliderCtrl;
+class LLVoiceRemoteCtrl;
 
 class LLOverlayBar
-:       public LLPanel,
-        public LLMediaRemoteCtrlObserver
+:       public LLPanel
 {
 public:
         LLOverlayBar(const std::string& name, const LLRect& rect );
@@ -58,14 +57,16 @@ public:
         virtual EWidgetType getWidgetType() const;
         virtual LLString getWidgetTag() const;
 
-        virtual void reshape(S32 width, S32 height, BOOL called_from_parent);
-
-        void refresh();
+        /*virtual*/ void refresh();
+        /*virtual*/ void draw();
+        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
 
         void layoutButtons();
 
-        /*virtual*/ void draw();
-
+        // helpers for returning desired state
+        BOOL mediaPlaying() { return mMediaState == PLAYING; }
+        BOOL musicPlaying() { return mMusicState == PLAYING; }
+        
         static void onClickIMReceived(void* data);
         static void onClickSetNotBusy(void* data);
         static void onClickReleaseKeys(void* data);
@@ -73,23 +74,35 @@ public:
         static void onClickStandUp(void* data);
         static void onClickResetView(void* data);
 
-        // observer overrides
-        void onVolumeChange ( const LLMediaRemoteCtrlObserver::EventType& eventIn );
-        void onStopButtonPressed ( const LLMediaRemoteCtrlObserver::EventType& eventIn );
-        void onPlayButtonPressed ( const LLMediaRemoteCtrlObserver::EventType& eventIn );
-        void onPauseButtonPressed ( const LLMediaRemoteCtrlObserver::EventType& eventIn );
-
-        LLMediaRemoteCtrl*      getMusicRemoteControl () { return mMusicRemote; };
+        //static media helper functions
+        static void mediaPlay(void*);
+        static void mediaPause(void*);
+        static void mediaStop(void*);
+        
+        static void musicPlay(void*);
+        static void musicPause(void*);
+        static void musicStop(void*);
 
-protected:
+        static void toggleAudioVolumeFloater(void*);
+        
+        static void enableMediaButtons(LLPanel* panel);
+        static void enableMusicButtons(LLPanel* panel);
         
+protected:      
+        static void* createMasterRemote(void* userdata);
         static void* createMusicRemote(void* userdata);
         static void* createMediaRemote(void* userdata);
+        static void* createVoiceRemote(void* userdata);
 
 protected:
+        LLMediaRemoteCtrl*      mMasterRemote;
         LLMediaRemoteCtrl*      mMusicRemote;
         LLMediaRemoteCtrl*      mMediaRemote;
+        LLVoiceRemoteCtrl*      mVoiceRemote;
         BOOL isBuilt;
+        enum { STOPPED=0, PLAYING=1, PAUSED=2 };
+        BOOL mMediaState;
+        BOOL mMusicState;
 };
 
 extern LLOverlayBar* gOverlayBar;