diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-10-28 17:34:03 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-10-28 17:34:03 -0700 |
| commit | 8ae2f388b69105b81c49483bdae443aabfa9e26e (patch) | |
| tree | 4f2d334e61ce08a05023bffd832d40aa570e16a4 /indra/llplugin/llpluginclassmediaowner.h | |
| parent | 437449044583d50c8cad694e65e5a4a23a55d768 (diff) | |
Fixes for DEV-41791 and DEV-41920.
Reworked some of the autoplay logic in LLViewerMediaImpl to try and make it more consistent when media is unloaded and reloaded by the performance manager.
LLViewerMediaImpl will now keep track of the media state and current time of media that it unloads for performance reasons, and attempt to restore playing or paused media to the same playhead time and state (playing or paused) when it reloads.
Added "done" status that time-based media plugins can use to indicate that they've reached the end of the media and stopped.
Added logging of priority transitions, for use in debugging issues with the peformance manager.
Diffstat (limited to 'indra/llplugin/llpluginclassmediaowner.h')
| -rw-r--r-- | indra/llplugin/llpluginclassmediaowner.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h index 4690f09172..c798af29ca 100644 --- a/indra/llplugin/llpluginclassmediaowner.h +++ b/indra/llplugin/llpluginclassmediaowner.h @@ -70,7 +70,8 @@ public: MEDIA_ERROR, // navigation/preroll failed MEDIA_PLAYING, // playing (only for time-based media) MEDIA_PAUSED, // paused (only for time-based media) - + MEDIA_DONE // finished playing (only for time-based media) + } EMediaStatus; virtual ~LLPluginClassMediaOwner() {}; |