From c36460060ea434158c2069d696880cbaf4431123 Mon Sep 17 00:00:00 2001 From: Emmanouil Papadeas Date: Wed, 8 Feb 2023 17:40:15 +0200 Subject: Further refactoring to AudioDriver implementations after #69120. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rename all instances of `capture_start()` and `capture_end()` to their new names. Fixes #72892. - More internal renames to match what was started in #69120. - Use `override` consistently so that such refactoring bugs can be caught. - Harmonize the order of definition of the overridden virtual methods in each audio driver. - Harmonize prototype for `set_output_device` and `set_input_device`. Co-authored-by: Rémi Verschelde --- servers/audio_server.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'servers/audio_server.cpp') diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index 8c877e4eed..0344bf322d 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -1640,8 +1640,8 @@ String AudioServer::get_output_device() { return AudioDriver::get_singleton()->get_output_device(); } -void AudioServer::set_output_device(String output_device) { - AudioDriver::get_singleton()->set_output_device(output_device); +void AudioServer::set_output_device(const String &p_name) { + AudioDriver::get_singleton()->set_output_device(p_name); } PackedStringArray AudioServer::get_input_device_list() { @@ -1711,9 +1711,10 @@ void AudioServer::_bind_methods() { ClassDB::bind_method(D_METHOD("get_speaker_mode"), &AudioServer::get_speaker_mode); ClassDB::bind_method(D_METHOD("get_mix_rate"), &AudioServer::get_mix_rate); + ClassDB::bind_method(D_METHOD("get_output_device_list"), &AudioServer::get_output_device_list); ClassDB::bind_method(D_METHOD("get_output_device"), &AudioServer::get_output_device); - ClassDB::bind_method(D_METHOD("set_output_device", "output_device"), &AudioServer::set_output_device); + ClassDB::bind_method(D_METHOD("set_output_device", "name"), &AudioServer::set_output_device); ClassDB::bind_method(D_METHOD("get_time_to_next_mix"), &AudioServer::get_time_to_next_mix); ClassDB::bind_method(D_METHOD("get_time_since_last_mix"), &AudioServer::get_time_since_last_mix); -- cgit v1.2.3