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

STORM-1812 / subtask STORM-1861 Media auto-play is off - but music stream starts to play anyway when teleport fails

master
Jonathan Yap 2012-05-18 16:36:11 -04:00
parent 502e89971f
commit 031c3bbcc4
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llvieweraudio.cpp
View File

@ -49,7 +49,8 @@ LLViewerAudio::LLViewerAudio() :
mFadeState(FADE_IDLE),
mFadeTime(),
mIdleListnerActive(false),
mForcedTeleportFade(false)
mForcedTeleportFade(false),
mWasPlaying(false)
{
mTeleportFailedConnection = LLViewerParcelMgr::getInstance()->
setTeleportFailedCallback(boost::bind(&LLViewerAudio::onTeleportFailed, this));
@ -250,7 +251,7 @@ F32 LLViewerAudio::getFadeVolume()
void LLViewerAudio::onTeleportFailed()
{
if (gAudiop)
if (gAudiop && mWasPlaying)
{
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if (parcel)
@ -259,11 +260,12 @@ void LLViewerAudio::onTeleportFailed()
llinfos << "Teleport failed -- resetting music stream" << llendl;
}
}
mWasPlaying = false;
}
void LLViewerAudio::onTeleportFinished(const LLVector3d& pos, const bool& local)
{
if (gAudiop && local)
if (gAudiop && local && mWasPlaying)
{
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if (parcel)
@ -271,6 +273,7 @@ void LLViewerAudio::onTeleportFinished(const LLVector3d& pos, const bool& local)
mNextStreamURI = parcel->getMusicURL();
}
}
mWasPlaying = false;
}
void init_audio()
@ -378,12 +381,22 @@ void audio_update_volume(bool force_update)
{
if (progress_view_visible && !LLViewerAudio::getInstance()->getForcedTeleportFade())
{
// Even though the music was turned off it was starting up (with autoplay disabled) occasionally
// after a failed teleport or after an intra-parcel teleport.
if (gAudiop->getInternetStreamURL().empty())
{
LLViewerAudio::getInstance()->setWasPlaying(false);
}
else
{
LLViewerAudio::getInstance()->setWasPlaying(true);
}
LLViewerAudio::getInstance()->setForcedTeleportFade(true);
LLViewerAudio::getInstance()->startInternetStreamWithAutoFade(LLStringUtil::null);
LLViewerAudio::getInstance()->setNextStreamURI(LLStringUtil::null);
}
if (!progress_view_visible && LLViewerAudio::getInstance()->getForcedTeleportFade() == true)
if (!progress_view_visible && LLViewerAudio::getInstance()->getForcedTeleportFade())
{
LLViewerAudio::getInstance()->setForcedTeleportFade(false);
}

2
indra/newview/llvieweraudio.h
View File

@ -66,6 +66,7 @@ public:
bool getForcedTeleportFade() { return mForcedTeleportFade; };
void setForcedTeleportFade(bool fade) { mForcedTeleportFade = fade;} ;
void setNextStreamURI(std::string stream) { mNextStreamURI = stream; } ;
void setWasPlaying(bool playing) { mWasPlaying = playing;} ;
private:
@ -76,6 +77,7 @@ private:
LLFrameTimer stream_fade_timer;
bool mIdleListnerActive;
bool mForcedTeleportFade;
bool mWasPlaying;
boost::signals2::connection mTeleportFailedConnection;
boost::signals2::connection mTeleportFinishedConnection;