noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Access microphone buffer from AudioServer and prevent microphone double starts

Browse Source
This commit is contained in:
Julian Todd
2025-11-28 17:28:12 +00:00
committed by Lukas Tenbrink
parent 7ed0b61676
commit 3e8bf3ba91
7 changed files with 136 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pulseaudio/audio_driver_pulseaudio.cpp
View File

@@ -555,6 +555,8 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) {
}
// User selected a new input device, finish the current one so we'll init the new input device
// (If `AudioServer.set_input_device()` did not set the value when the microphone was running,
// this section with its problematic error handling could be deleted.)
if (ad->input_device_name != ad->new_input_device) {
ad->input_device_name = ad->new_input_device;
ad->finish_input_device();
@@ -691,6 +693,10 @@ void AudioDriverPulseAudio::finish() {
}
Error AudioDriverPulseAudio::init_input_device() {
if (pa_rec_str) {
return ERR_ALREADY_IN_USE;
}
// If there is a specified input device, check that it is really present
if (input_device_name != "Default") {
PackedStringArray list = get_input_device_list();

8
drivers/wasapi/audio_driver_wasapi.cpp
View File

@@ -542,6 +542,10 @@ Error AudioDriverWASAPI::init_output_device(bool p_reinit) {
}
Error AudioDriverWASAPI::init_input_device(bool p_reinit) {
if (audio_input.active.is_set()) {
return ERR_ALREADY_IN_USE;
}
Error err = audio_device_init(&audio_input, true, p_reinit);
if (err != OK) {
// We've tried to init the device, but have failed. Time to clean up.
@@ -1023,11 +1027,9 @@ Error AudioDriverWASAPI::input_stop() {
if (audio_input.active.is_set()) {
audio_input.audio_client->Stop();
audio_input.active.clear();
return OK;
}
return FAILED;
return OK;
}
PackedStringArray AudioDriverWASAPI::get_input_device_list() {