godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21407 from marcelofg55/coreaudio_dfix

Browse Source 
Prevent CoreAudio driver failing on finish if Dummy driver was selected
This commit is contained in:
Rémi Verschelde 2018-08-26 16:30:57 +02:00 committed by GitHub
commit 653b4829f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/coreaudio/audio_driver_coreaudio.cpp
View File

@ -331,6 +331,7 @@ bool AudioDriverCoreAudio::try_lock() {
} }
void AudioDriverCoreAudio::finish() { void AudioDriverCoreAudio::finish() {
if (audio_unit) {
OSStatus result; OSStatus result;
lock(); lock();
@ -374,12 +375,13 @@ void AudioDriverCoreAudio::finish() {
} }
unlock(); unlock();
}
if (mutex) { if (mutex) {
memdelete(mutex); memdelete(mutex);
mutex = NULL; mutex = NULL;
} }
}; }
Error AudioDriverCoreAudio::capture_start() { Error AudioDriverCoreAudio::capture_start() {
@ -576,6 +578,7 @@ String AudioDriverCoreAudio::capture_get_device() {
#endif #endif
AudioDriverCoreAudio::AudioDriverCoreAudio() { AudioDriverCoreAudio::AudioDriverCoreAudio() {
audio_unit = NULL;
active = false; active = false;
mutex = NULL; mutex = NULL;