aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lloverlaybar.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:34 -0500
committerJacek Antonelli2008-08-15 23:45:34 -0500
commitcd17687f01420952712a500107e0f93e7ab8d5f8 (patch)
treece48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/lloverlaybar.h
parentSecond Life viewer sources 1.19.0.5 (diff)
downloadmeta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/lloverlaybar.h')
-rw-r--r--linden/indra/newview/lloverlaybar.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index c4bf2cf..136c4e7 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -67,7 +67,6 @@ public:
67 void layoutButtons(); 67 void layoutButtons();
68 68
69 // helpers for returning desired state 69 // helpers for returning desired state
70 BOOL mediaPlaying() { return mMediaState == PLAYING; }
71 BOOL musicPlaying() { return mMusicState == PLAYING; } 70 BOOL musicPlaying() { return mMusicState == PLAYING; }
72 71
73 static void onClickIMReceived(void* data); 72 static void onClickIMReceived(void* data);
@@ -80,6 +79,11 @@ public:
80 //static media helper functions 79 //static media helper functions
81 static void toggleMediaPlay(void*); 80 static void toggleMediaPlay(void*);
82 static void toggleMusicPlay(void*); 81 static void toggleMusicPlay(void*);
82 static void musicPause(void*);
83 static void musicStop(void*);
84 static void mediaStop(void*);
85
86 static void toggleAudioVolumeFloater(void*);
83 87
84protected: 88protected:
85 static void* createMediaRemote(void* userdata); 89 static void* createMediaRemote(void* userdata);
@@ -93,8 +97,7 @@ protected:
93 LLVoiceRemoteCtrl* mVoiceRemote; 97 LLVoiceRemoteCtrl* mVoiceRemote;
94 bool mBuilt; // dialog constructed yet? 98 bool mBuilt; // dialog constructed yet?
95 enum { STOPPED=0, PLAYING=1, PAUSED=2 }; 99 enum { STOPPED=0, PLAYING=1, PAUSED=2 };
96 BOOL mMediaState; 100 S32 mMusicState;
97 BOOL mMusicState;
98}; 101};
99 102
100extern LLOverlayBar* gOverlayBar; 103extern LLOverlayBar* gOverlayBar;