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

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

Browse Source
This commit is contained in:
Latif Khalifa
2013-10-12 22:45:05 +02:00
parent f096f181f3 1389bf76ce
commit aa077032b7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llaudio/llaudioengine.cpp
View File

@@ -323,7 +323,7 @@ void LLAudioEngine::idle(F32 max_decode_time)
//Also add sources that might be able to start playing to a priority queue.
//Only sources without channels, or are waiting for a syncmaster, should be added to this queue.
std::priority_queue<audio_source_t,std::vector<audio_source_t,boost::pool_allocator<audio_source_t> >,SourcePriorityComparator> queue;
for (source_map::iterator iter = mAllSources.begin(); iter != mAllSources.end(); ++iter)
for (source_map::iterator iter = mAllSources.begin(); iter != mAllSources.end();)
{
LLAudioSource *sourcep = iter->second;
@@ -339,6 +339,9 @@ void LLAudioEngine::idle(F32 max_decode_time)
continue;
}
// Increment iter here (it is not used anymore), so we can use continue below to move on to the next source.
++iter;
LLAudioData *adp = sourcep->getCurrentData();
//If there is no current data at all, or if it hasn't loaded, we must skip this source.
if (!adp || !adp->getBuffer())