From 659dc5224e2f4b6ce90b4f739cc015befc098c12 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Tue, 1 Dec 2009 15:38:09 -0800 Subject: DEV-42989: Adjust media priority based on app minimization and focus Review #49 This change adjusts each media's priority based on whether the viewer is minimized (media priority becomes HIDDEN) or unfocused (media priority becomes LOW). However, due to the fact that updateMedia() was no longer being called when minimized, I moved its call out of LLViewerTextureList::updateImages() (a seemingly odd place anyway) and into its own idle callback. --- indra/newview/llviewermedia.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llviewermedia.h') diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index ac12112ed4..c29bd6dbd6 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -99,6 +99,7 @@ class LLViewerMedia static void updateMedia(); static bool isMusicPlaying(); + static void initClass(); static void cleanupClass(); static void toggleMusicPlay(void*); -- cgit v1.2.3 From f4e40360e5f3dfd644564e59c65d7935e5f402ee Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Tue, 1 Dec 2009 16:55:35 -0800 Subject: Fix for EXT-2892/DEV-43568 (if a face is set to show multiple texture repeats, only one of the repeats is interactive) Added LLViewerMediaImpl::scaleTextureCoords() function to encapsulate the code that maps from texture coordinates to media coordinates. Made scaleTextureCoords() wrap the texture coordinate to the range [0.0, 1.0) before converting to media coordinates. --- indra/newview/llviewermedia.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llviewermedia.h') diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index ac12112ed4..e2d159304f 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -185,6 +185,7 @@ public: void setHomeURL(const std::string& home_url) { mHomeURL = home_url; }; std::string getMimeType() { return mMimeType; } void scaleMouse(S32 *mouse_x, S32 *mouse_y); + void scaleTextureCoords(const LLVector2& texture_coords, S32 *x, S32 *y); void update(); void updateImagesMediaStreams(); -- cgit v1.2.3 From 4c3d08b665800608b4597ec28cf84cfde5e65f88 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Wed, 2 Dec 2009 12:16:49 -0800 Subject: Minor changes from review feedback get rid of thunk function --- indra/newview/llviewermedia.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewermedia.h') diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 8acb485daf..24e7154805 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -96,7 +96,7 @@ class LLViewerMedia static bool textureHasMedia(const LLUUID& texture_id); static void setVolume(F32 volume); - static void updateMedia(); + static void updateMedia(void* dummy_arg = NULL); static bool isMusicPlaying(); static void initClass(); -- cgit v1.2.3 From 44d5fcb7765a78d8e148f0a3cd0a23f13d8db3d1 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Wed, 2 Dec 2009 17:34:27 -0800 Subject: Changed the behavior of LLViewerMediaImpl::setDisabled() to interact more predictably with auto-play. Disabling and re-enabling media should work much more like teleporting away and teleporting back -- media will respect the auto-play flag when reloading, instead of returning to its previous load state. --- indra/newview/llviewermedia.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewermedia.h') diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 24e7154805..713eb2710b 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -202,7 +202,7 @@ public: bool isMediaFailed() const { return mMediaSourceFailed; }; void resetPreviousMediaState(); - void setDisabled(bool disabled) { mIsDisabled = disabled; }; + void setDisabled(bool disabled); bool isMediaDisabled() const { return mIsDisabled; }; // returns true if this instance should not be loaded (disabled, muted object, crashed, etc.) @@ -346,6 +346,8 @@ public: S32 mProximity; F64 mProximityDistance; LLMimeDiscoveryResponder *mMimeTypeProbe; + bool mMediaAutoPlay; + std::string mMediaEntryURL; private: BOOL mIsUpdated ; -- cgit v1.2.3