maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/godotengine/godot

Browse source
This commit is contained in:
Juan Linietsky 2015-12-21 10:26:04 -03:00
parent 49a19f85b8 d4ed043968
commit 3fe740dac6
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servers/audio/audio_server_sw.cpp
View file

@ -30,6 +30,10 @@
#include "globals.h"
#include "os/os.h"
#ifdef NO_THREADS
#define NO_AUDIO_THREADS
#endif
struct _AudioDriverLock {
_AudioDriverLock() { if (AudioDriverSW::get_singleton()) AudioDriverSW::get_singleton()->lock(); }
@ -775,7 +779,7 @@ void AudioServerSW::_thread_func(void *self) {
AudioServerSW *as=(AudioServerSW *)self;
as->thread->set_name("AudioServerSW");
//as->thread->set_name("AudioServerSW");
while (!as->exit_update_thread) {
as->_update_streams(true);
@ -814,16 +818,17 @@ void AudioServerSW::init() {
if (AudioDriverSW::get_singleton())
AudioDriverSW::get_singleton()->start();
#ifndef NO_THREADS
#ifndef NO_AUDIO_THREADS
exit_update_thread=false;
thread = Thread::create(_thread_func,this);
thread->set_name("AudioServerSW");
#endif
}
void AudioServerSW::finish() {
#ifndef NO_THREADS
#ifndef NO_AUDIO_THREADS
exit_update_thread=true;
Thread::wait_to_finish(thread);
memdelete(thread);
@ -856,7 +861,7 @@ void AudioServerSW::_update_streams(bool p_thread) {
void AudioServerSW::update() {
_update_streams(false);
#ifdef NO_THREADS
#ifdef NO_AUDIO_THREADS
_update_streams(true);
#endif