Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

-different attempt to avod deadlock problem

Browse source
This commit is contained in:
Juan Linietsky 2015-12-21 10:25:46 -03:00
parent 15429d6ac9
commit 49a19f85b8
3 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
servers/audio/audio_server_sw.cpp
View file

@ -693,18 +693,28 @@ void AudioServerSW::stream_set_active(RID p_stream, bool p_active) {
Stream *s = stream_owner.get(p_stream);
ERR_FAIL_COND(!s);
_THREAD_SAFE_METHOD_
if (s->active==p_active)
return;
AUDIO_LOCK;
_THREAD_SAFE_METHOD_
s->active=p_active;
if (p_active)
s->E=active_audio_streams.push_back(s);
else {
active_audio_streams.erase(s->E);
s->E=NULL;
if (!thread || thread->get_ID()!=Thread::get_caller_ID()) {
//do not lock in mix thread
lock();
}
{
s->active=p_active;
if (p_active)
s->E=active_audio_streams.push_back(s);
else {
active_audio_streams.erase(s->E);
s->E=NULL;
}
}
if (!thread || thread->get_ID()!=Thread::get_caller_ID()) {
//do not lock in mix thread
unlock();
}
}
bool AudioServerSW::stream_is_active(RID p_stream) const {