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:
Latif Khalifa
2013-10-12 22:09:37 +02:00
parent 1df09dec35 daa07d031c
commit f096f181f3
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llaudio/llaudioengine.cpp
View File

@@ -277,11 +277,6 @@ void LLAudioEngine::updateChannels()
} }
} }
llassert(found_buffer); llassert(found_buffer);
if(!mChannels[i]->mCurrentBufferp->mInUse)
{
llassert(!mChannels[i]->isPlaying());
llassert(!mChannels[i]->isWaiting());
}
} }
#endif //SHOW_ASSERT #endif //SHOW_ASSERT
} }

4
indra/llaudio/llaudioengine_fmodex.cpp
View File

@@ -178,7 +178,7 @@ public:
} }
void removeChannel(FMOD::Channel* channel) void removeChannel(FMOD::Channel* channel)
{ {
gSoundCheck.assertActiveState(channel,true); assertActiveState(channel,true);
active_channels_t::const_iterator it = mActiveChannels.find(channel); active_channels_t::const_iterator it = mActiveChannels.find(channel);
llassert(it != mActiveChannels.end()); llassert(it != mActiveChannels.end());
@@ -208,7 +208,7 @@ public:
if(try_log && sVerboseDebugging) if(try_log && sVerboseDebugging)
#endif #endif
{ {
CFMODSoundChecks::STATUS chan = gSoundCheck.getPtrStatus(ptr); CFMODSoundChecks::STATUS chan = getPtrStatus(ptr);
if(try_log && sVerboseDebugging) if(try_log && sVerboseDebugging)
{ {
if(active) if(active)