diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-08 05:19:19 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-08 05:19:19 +0000 |
| commit | f26f7e3e29019abf3a10f6925e30baca19eb4e2d (patch) | |
| tree | 071fd0d451b482c9dd8376479b968da4aa099a78 /indra/newview/llviewermedia.h | |
| parent | c5d100a9e4595c0d3bc685e0d6a2972ef228013d (diff) | |
merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 600d7409e2..b3fb2c9031 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -67,6 +67,7 @@ class LLViewerMedia static bool isMediaPaused(); static bool hasMedia(); static bool isActiveMediaTexture(const LLUUID& id); + static bool isMusicPlaying(); static std::string getMediaURL(); static std::string getMimeType(); @@ -74,9 +75,16 @@ class LLViewerMedia static void updateImagesMediaStreams(); + static void toggleMusicPlay(void*); + static void toggleMediaPlay(void*); + static void mediaStop(void*); + private: // Fill in initialization data for LLMediaManager::initClass() static void buildMediaManagerData( LLMediaManagerData* init_data ); + + enum { STOPPED=0, PLAYING=1, PAUSED=2 }; + static S32 mMusicState; }; #endif // LLVIEWERMEDIA_H |