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

Merge pull request #21949 from marcelofg55/wasapi_init_fix 

Fix possible crash when switching audio device on WASAPI driver
This commit is contained in:
Rémi Verschelde 2018-09-10 20:41:51 +02:00 committed by GitHub
parent db26c1205c 10a4925159
commit 864a314340
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/wasapi/audio_driver_wasapi.cpp
View File

@ -65,7 +65,6 @@ const IID IID_IAudioCaptureClient = __uuidof(IAudioCaptureClient);
#define CAPTURE_BUFFER_CHANNELS 2 #define CAPTURE_BUFFER_CHANNELS 2
static StringName capture_device_id;
static bool default_render_device_changed = false; static bool default_render_device_changed = false;
static bool default_capture_device_changed = false; static bool default_capture_device_changed = false;
@ -128,7 +127,6 @@ public:
default_render_device_changed = true; default_render_device_changed = true;
} else if (flow == eCapture) { } else if (flow == eCapture) {
default_capture_device_changed = true; default_capture_device_changed = true;
capture_device_id = String(pwstrDeviceId);
} }
} }
@ -659,6 +657,9 @@ void AudioDriverWASAPI::thread_func(void *p_udata) {
if (err == OK) { if (err == OK) {
ad->start(); ad->start();
} }
avail_frames = 0;
write_ofs = 0;
} }
if (ad->audio_input.active) { if (ad->audio_input.active) {