Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2012-07-19 22:19:52 +02:00
parent 15af410e6f 756a284048
commit a8a30ae3b9
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/llaudio/llstreamingaudio_fmodex.cpp
View File

@@ -70,9 +70,7 @@ LLStreamingAudio_FMODEX::LLStreamingAudio_FMODEX(FMOD::System *system) :
mCurrentInternetStreamp(NULL),
mFMODInternetStreamChannelp(NULL),
mGain(1.0f),
mMetaData(NULL),
mStarvedProgress(0),
mStarvedNoProgressFrames(0)
mMetaData(NULL)
{
// Number of milliseconds of audio to buffer for the audio card.
// Must be larger than the usual Second Life frame stutter time.
@@ -252,27 +250,10 @@ void LLStreamingAudio_FMODEX::update()
llinfos << " (diskbusy="<<diskbusy<<")" << llendl;
llinfos << " (progress="<<progress<<")" << llendl;
mFMODInternetStreamChannelp->setMute(true);
mStarvedProgress = progress;
mStarvedNoProgressFrames = 0;
}
else if(mStarvedProgress == progress)
{
if(++mStarvedNoProgressFrames >= 10)
{
//we got 10 consecutive updates of 0 progress made on the stream buffer. It probably stalled.
llinfos << "Stream unable to recover from starvation. Halting." << llendl;
stop();
return;
}
}
else
{
mStarvedNoProgressFrames = 0;
mStarvedProgress = progress;
}
mLastStarved.start();
}
else if(mLastStarved.getStarted() && mLastStarved.getElapsedTimeF32() > 5.f)
else if(mLastStarved.getStarted() && mLastStarved.getElapsedTimeF32() > 1.f)
{
mLastStarved.stop();
mFMODInternetStreamChannelp->setMute(false);

2
indra/llaudio/llstreamingaudio_fmodex.h
View File

@@ -80,8 +80,6 @@ private:
F32 mGain;
LLTimer mLastStarved;
unsigned int mStarvedProgress;
unsigned int mStarvedNoProgressFrames;
LLSD *mMetaData;
};