summaryrefslogtreecommitdiff
path: root/indra/newview/lloverlaybar.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lloverlaybar.h')
-rw-r--r--indra/newview/lloverlaybar.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/lloverlaybar.h b/indra/newview/lloverlaybar.h
index 90886e1c72..90ab8d057a 100644
--- a/indra/newview/lloverlaybar.h
+++ b/indra/newview/lloverlaybar.h
@@ -67,7 +67,6 @@ public:
void layoutButtons();
// helpers for returning desired state
- BOOL mediaPlaying() { return mMediaState == PLAYING; }
BOOL musicPlaying() { return mMusicState == PLAYING; }
static void onClickIMReceived(void* data);
@@ -79,7 +78,14 @@ public:
//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*);
+
+ static void toggleAudioVolumeFloater(void*);
protected:
static void* createMediaRemote(void* userdata);
@@ -93,8 +99,7 @@ protected:
LLVoiceRemoteCtrl* mVoiceRemote;
bool mBuilt; // dialog constructed yet?
enum { STOPPED=0, PLAYING=1, PAUSED=2 };
- BOOL mMediaState;
- BOOL mMusicState;
+ S32 mMusicState;
};
extern LLOverlayBar* gOverlayBar;