diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-14 01:45:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-14 01:45:59 +0000 |
| commit | 98fd90ddd6595f2ee7e626c14117f51def621ec5 (patch) | |
| tree | 9a9caf8bffa53b753fe850f445bd133195e9bb03 /indra/newview/lloverlaybar.h | |
| parent | 89d938efe371645756240da72f4c359c36985060 (diff) | |
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media
Sam made me do it.
Diffstat (limited to 'indra/newview/lloverlaybar.h')
| -rw-r--r-- | indra/newview/lloverlaybar.h | 11 |
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; |