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

Further refactoring to AudioDriver implementations after #69120.

Browse Source 
- 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 <rverschelde@gmail.com>
This commit is contained in:
Emmanouil Papadeas
2023-02-08 17:40:15 +02:00
committed by Rémi Verschelde
parent d69809cab6
commit c36460060e
22 changed files with 227 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/wasapi/audio_driver_wasapi.cpp
View File

@ -634,9 +634,9 @@ String AudioDriverWASAPI::get_output_device() {
return name;
}
void AudioDriverWASAPI::set_output_device(String output_device) {
void AudioDriverWASAPI::set_output_device(const String &p_name) {
lock();
audio_output.new_device = output_device;
audio_output.new_device = p_name;
unlock();
}
@ -964,12 +964,6 @@ Error AudioDriverWASAPI::input_stop() {
return FAILED;
}
void AudioDriverWASAPI::set_input_device(const String &p_name) {
lock();
audio_input.new_device = p_name;
unlock();
}
PackedStringArray AudioDriverWASAPI::get_input_device_list() {
return audio_device_get_list(true);
}
@ -982,6 +976,12 @@ String AudioDriverWASAPI::get_input_device() {
return name;
}
void AudioDriverWASAPI::set_input_device(const String &p_name) {
lock();
audio_input.new_device = p_name;
unlock();
}
AudioDriverWASAPI::AudioDriverWASAPI() {
samples_in.clear();
}

37
drivers/wasapi/audio_driver_wasapi.h
View File

@ -94,27 +94,30 @@ class AudioDriverWASAPI : public AudioDriver {
PackedStringArray audio_device_get_list(bool p_input);
public:
virtual const char *get_name() const {
virtual const char *get_name() const override {
return "WASAPI";
}
virtual Error init();
virtual void start();
virtual int get_mix_rate() const;
virtual float get_latency();
virtual SpeakerMode get_speaker_mode() const;
virtual PackedStringArray get_output_device_list();
virtual String get_output_device();
virtual void set_output_device(String output_device);
virtual void lock();
virtual void unlock();
virtual void finish();
virtual Error init() override;
virtual void start() override;
virtual int get_mix_rate() const override;
virtual SpeakerMode get_speaker_mode() const override;
virtual float get_latency() override;
virtual Error input_start();
virtual Error input_stop();
virtual PackedStringArray get_input_device_list();
virtual void set_input_device(const String &p_name);
virtual String get_input_device();
virtual void lock() override;
virtual void unlock() override;
virtual void finish() override;
virtual PackedStringArray get_output_device_list() override;
virtual String get_output_device() override;
virtual void set_output_device(const String &p_name) override;
virtual Error input_start() override;
virtual Error input_stop() override;
virtual PackedStringArray get_input_device_list() override;
virtual String get_input_device() override;
virtual void set_input_device(const String &p_name) override;
AudioDriverWASAPI();
};