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.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'servers/audio_server.h') diff --git a/servers/audio_server.h b/servers/audio_server.h index d3d87a8400..155beb2000 100644 --- a/servers/audio_server.h +++ b/servers/audio_server.h @@ -88,26 +88,32 @@ public: static AudioDriver *get_singleton(); void set_singleton(); + // Virtual API to implement. + virtual const char *get_name() const = 0; virtual Error init() = 0; virtual void start() = 0; virtual int get_mix_rate() const = 0; virtual SpeakerMode get_speaker_mode() const = 0; - virtual PackedStringArray get_output_device_list(); - virtual String get_output_device(); - virtual void set_output_device(String output_device) {} + virtual float get_latency() { return 0; } + virtual void lock() = 0; virtual void unlock() = 0; virtual void finish() = 0; - virtual Error capture_start() { return FAILED; } - virtual Error capture_stop() { return FAILED; } - virtual void set_input_device(const String &p_name) {} - virtual String get_input_device() { return "Default"; } + virtual PackedStringArray get_output_device_list(); + virtual String get_output_device(); + virtual void set_output_device(const String &p_name) {} + + virtual Error input_start() { return FAILED; } + virtual Error input_stop() { return FAILED; } + virtual PackedStringArray get_input_device_list(); + virtual String get_input_device() { return "Default"; } + virtual void set_input_device(const String &p_name) {} - virtual float get_latency() { return 0; } + // SpeakerMode get_speaker_mode_by_total_channels(int p_channels) const; int get_total_channels_by_speaker_mode(SpeakerMode) const; @@ -421,7 +427,7 @@ public: PackedStringArray get_output_device_list(); String get_output_device(); - void set_output_device(String output_device); + void set_output_device(const String &p_name); PackedStringArray get_input_device_list(); String get_input_device(); -- cgit v1.2.3