diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llviewermedia.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
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 |