livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-7069 Media controls show Play icon even though media is autoplaying

meow-7.2.2
andreykproductengine 2017-01-20 16:10:12 +02:00
parent 178e119724
commit 34246f686e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llviewermedia.cpp
View File

@ -810,8 +810,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
sAnyMediaShowing = true;
}
if (!pimpl->getUsedInUI() && pimpl->hasMedia() && pimpl->isMediaPlaying())
if (!pimpl->getUsedInUI() && pimpl->hasMedia() && (pimpl->isMediaPlaying() || !pimpl->isMediaTimeBased()))
{
// consider visible non-timebased media as playing
sAnyMediaPlaying = true;
}

3
indra/newview/llviewermedia.h
View File

@ -105,10 +105,11 @@ public:
// Is any media currently "showing"? Includes Parcel Media. Does not include media in the UI.
static bool isAnyMediaShowing();
// Shows if any media is playing, counts visible non time based media as playing. Does not include media in the UI.
static bool isAnyMediaPlaying();
// Set all media enabled or disabled, depending on val. Does not include media in the UI.
static void setAllMediaEnabled(bool val);
// Set all media paused or playing, depending on val. Does not include media in the UI.
// Set all media paused(stopped for non time based) or playing, depending on val. Does not include media in the UI.
static void setAllMediaPaused(bool val);
static void updateMedia(void* dummy_arg = NULL);