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

DRTVWR-493 Converted LLViewerParcelMediaAutoPlay to singleton

meow-7.2.2
andreykproductengine 2019-08-13 20:47:02 +03:00
parent 24a0601a50
commit 82f259b133
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llviewerparcelmedia.cpp
View File

@ -52,7 +52,6 @@ mMediaParcelLocalID(0)
LLMessageSystem* msg = gMessageSystem;
msg->setHandlerFunc("ParcelMediaCommandMessage", parcelMediaCommandMessageHandler );
msg->setHandlerFunc("ParcelMediaUpdate", parcelMediaUpdateHandler );
LLViewerParcelMediaAutoPlay::initClass();
}
LLViewerParcelMedia::~LLViewerParcelMedia()

21
indra/newview/llviewerparcelmediaautoplay.cpp
View File

@ -51,29 +51,10 @@ LLViewerParcelMediaAutoPlay::LLViewerParcelMediaAutoPlay() :
{
}
static LLViewerParcelMediaAutoPlay *sAutoPlay = NULL;
// static
void LLViewerParcelMediaAutoPlay::initClass()
{
if (!sAutoPlay)
sAutoPlay = new LLViewerParcelMediaAutoPlay;
}
// static
void LLViewerParcelMediaAutoPlay::cleanupClass()
{
if (sAutoPlay)
delete sAutoPlay;
}
// static
void LLViewerParcelMediaAutoPlay::playStarted()
{
if (sAutoPlay)
{
sAutoPlay->mPlayed = TRUE;
}
LLSingleton<LLViewerParcelMediaAutoPlay>::getInstance()->mPlayed = TRUE;
}
BOOL LLViewerParcelMediaAutoPlay::tick()

8
indra/newview/llviewerparcelmediaautoplay.h
View File

@ -31,13 +31,11 @@
#include "lluuid.h"
// timer to automatically play media
class LLViewerParcelMediaAutoPlay : LLEventTimer
class LLViewerParcelMediaAutoPlay : LLEventTimer, public LLSingleton<LLViewerParcelMediaAutoPlay>
{
public:
LLViewerParcelMediaAutoPlay();
LLSINGLETON(LLViewerParcelMediaAutoPlay);
public:
virtual BOOL tick();
static void initClass();
static void cleanupClass();
static void playStarted();
private: