gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-15 23:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69120 from souplamp/audio-function-rename

Browse source 
Rename references to audio device, capture_device to output_device, input_device respectively
This commit is contained in:
Rémi Verschelde 2023-01-31 18:56:27 +01:00
parent 14a4408e02 5300daaff2
commit ea3566f2ed
No known key found for this signature in database
GPG key ID: C3336907360768E1
10 changed files with 286 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
doc/classes/AudioServer.xml
View file

@ -29,13 +29,6 @@
Adds an [AudioEffect] effect to the bus [param bus_idx] at [param at_position]. Adds an [AudioEffect] effect to the bus [param bus_idx] at [param at_position].
</description> </description>
</method> </method>
<method name="capture_get_device_list">
<return type="PackedStringArray" />
<description>
Returns the names of all audio input devices detected on the system.
[b]Note:[/b] [member ProjectSettings.audio/driver/enable_input] must be [code]true[/code] for audio input to work. See also that setting's description for caveats related to permissions and operating system privacy settings.
</description>
</method>
<method name="generate_bus_layout" qualifiers="const"> <method name="generate_bus_layout" qualifiers="const">
<return type="AudioBusLayout" /> <return type="AudioBusLayout" />
<description> <description>
@ -117,10 +110,11 @@
Returns the volume of the bus at index [param bus_idx] in dB. Returns the volume of the bus at index [param bus_idx] in dB.
</description> </description>
</method> </method>
<method name="get_device_list"> <method name="get_input_device_list">
<return type="PackedStringArray" /> <return type="PackedStringArray" />
<description> <description>
Returns the names of all audio devices detected on the system. Returns the names of all audio input devices detected on the system.
[b]Note:[/b] [member ProjectSettings.audio/driver/enable_input] must be [code]true[/code] for audio input to work. See also that setting's description for caveats related to permissions and operating system privacy settings.
</description> </description>
</method> </method>
<method name="get_mix_rate" qualifiers="const"> <method name="get_mix_rate" qualifiers="const">
@ -129,6 +123,12 @@
Returns the sample rate at the output of the [AudioServer]. Returns the sample rate at the output of the [AudioServer].
</description> </description>
</method> </method>
<method name="get_output_device_list">
<return type="PackedStringArray" />
<description>
Returns the names of all audio output devices detected on the system.
</description>
</method>
<method name="get_output_latency" qualifiers="const"> <method name="get_output_latency" qualifiers="const">
<return type="float" /> <return type="float" />
<description> <description>
@ -302,12 +302,12 @@
<member name="bus_count" type="int" setter="set_bus_count" getter="get_bus_count" default="1"> <member name="bus_count" type="int" setter="set_bus_count" getter="get_bus_count" default="1">
Number of available audio buses. Number of available audio buses.
</member> </member>
<member name="capture_device" type="String" setter="capture_set_device" getter="capture_get_device" default="&quot;Default&quot;"> <member name="input_device" type="String" setter="set_input_device" getter="get_input_device" default="&quot;Default&quot;">
Name of the current device for audio input (see [method capture_get_device_list]). On systems with multiple audio inputs (such as analog, USB and HDMI audio), this can be used to select the audio input device. The value [code]"Default"[/code] will record audio on the system-wide default audio input. If an invalid device name is set, the value will be reverted back to [code]"Default"[/code]. Name of the current device for audio input (see [method get_input_device_list]). On systems with multiple audio inputs (such as analog, USB and HDMI audio), this can be used to select the audio input device. The value [code]"Default"[/code] will record audio on the system-wide default audio input. If an invalid device name is set, the value will be reverted back to [code]"Default"[/code].
[b]Note:[/b] [member ProjectSettings.audio/driver/enable_input] must be [code]true[/code] for audio input to work. See also that setting's description for caveats related to permissions and operating system privacy settings. [b]Note:[/b] [member ProjectSettings.audio/driver/enable_input] must be [code]true[/code] for audio input to work. See also that setting's description for caveats related to permissions and operating system privacy settings.
</member> </member>
<member name="device" type="String" setter="set_device" getter="get_device" default="&quot;Default&quot;"> <member name="output_device" type="String" setter="set_output_device" getter="get_output_device" default="&quot;Default&quot;">
Name of the current device for audio output (see [method get_device_list]). On systems with multiple audio outputs (such as analog, USB and HDMI audio), this can be used to select the audio output device. The value [code]"Default"[/code] will play audio on the system-wide default audio output. If an invalid device name is set, the value will be reverted back to [code]"Default"[/code]. Name of the current device for audio output (see [method get_output_device_list]). On systems with multiple audio outputs (such as analog, USB and HDMI audio), this can be used to select the audio output device. The value [code]"Default"[/code] will play audio on the system-wide default audio output. If an invalid device name is set, the value will be reverted back to [code]"Default"[/code].
</member> </member>
<member name="playback_speed_scale" type="float" setter="set_playback_speed_scale" getter="get_playback_speed_scale" default="1.0"> <member name="playback_speed_scale" type="float" setter="set_playback_speed_scale" getter="get_playback_speed_scale" default="1.0">
Scales the rate at which audio is played (i.e. setting it to [code]0.5[/code] will make the audio be played at half its speed). Scales the rate at which audio is played (i.e. setting it to [code]0.5[/code] will make the audio be played at half its speed).

54
drivers/coreaudio/audio_driver_coreaudio.cpp
View file

@ -44,10 +44,10 @@ OSStatus AudioDriverCoreAudio::input_device_address_cb(AudioObjectID inObjectID,
void *inClientData) { void *inClientData) {
AudioDriverCoreAudio *driver = static_cast<AudioDriverCoreAudio *>(inClientData); AudioDriverCoreAudio *driver = static_cast<AudioDriverCoreAudio *>(inClientData);
// If our selected device is the Default call set_device to update the // If our selected input device is the Default, call set_input_device to update the
// kAudioOutputUnitProperty_CurrentDevice property // kAudioOutputUnitProperty_CurrentDevice property
if (driver->capture_device_name == "Default") { if (driver->input_device_name == "Default") {
driver->capture_set_device("Default"); driver->set_input_device("Default");
} }
return noErr; return noErr;
@ -58,10 +58,10 @@ OSStatus AudioDriverCoreAudio::output_device_address_cb(AudioObjectID inObjectID
void *inClientData) { void *inClientData) {
AudioDriverCoreAudio *driver = static_cast<AudioDriverCoreAudio *>(inClientData); AudioDriverCoreAudio *driver = static_cast<AudioDriverCoreAudio *>(inClientData);
// If our selected device is the Default call set_device to update the // If our selected output device is the Default call set_output_device to update the
// kAudioOutputUnitProperty_CurrentDevice property // kAudioOutputUnitProperty_CurrentDevice property
if (driver->device_name == "Default") { if (driver->output_device_name == "Default") {
driver->set_device("Default"); driver->set_output_device("Default");
} }
return noErr; return noErr;
@ -495,7 +495,7 @@ Error AudioDriverCoreAudio::capture_stop() {
#ifdef MACOS_ENABLED #ifdef MACOS_ENABLED
PackedStringArray AudioDriverCoreAudio::_get_device_list(bool capture) { PackedStringArray AudioDriverCoreAudio::_get_device_list(bool input) {
PackedStringArray list; PackedStringArray list;
list.push_back("Default"); list.push_back("Default");
@ -514,7 +514,7 @@ PackedStringArray AudioDriverCoreAudio::_get_device_list(bool capture) {
UInt32 deviceCount = size / sizeof(AudioDeviceID); UInt32 deviceCount = size / sizeof(AudioDeviceID);
for (UInt32 i = 0; i < deviceCount; i++) { for (UInt32 i = 0; i < deviceCount; i++) {
prop.mScope = capture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput; prop.mScope = input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput;
prop.mSelector = kAudioDevicePropertyStreamConfiguration; prop.mSelector = kAudioDevicePropertyStreamConfiguration;
AudioObjectGetPropertyDataSize(audioDevices[i], &prop, 0, nullptr, &size); AudioObjectGetPropertyDataSize(audioDevices[i], &prop, 0, nullptr, &size);
@ -555,10 +555,10 @@ PackedStringArray AudioDriverCoreAudio::_get_device_list(bool capture) {
return list; return list;
} }
void AudioDriverCoreAudio::_set_device(const String &device, bool capture) { void AudioDriverCoreAudio::_set_device(const String &output_device, bool input) {
AudioDeviceID deviceId; AudioDeviceID deviceId;
bool found = false; bool found = false;
if (device != "Default") { if (output_device != "Default") {
AudioObjectPropertyAddress prop; AudioObjectPropertyAddress prop;
prop.mSelector = kAudioHardwarePropertyDevices; prop.mSelector = kAudioHardwarePropertyDevices;
@ -573,7 +573,7 @@ void AudioDriverCoreAudio::_set_device(const String &device, bool capture) {
UInt32 deviceCount = size / sizeof(AudioDeviceID); UInt32 deviceCount = size / sizeof(AudioDeviceID);
for (UInt32 i = 0; i < deviceCount && !found; i++) { for (UInt32 i = 0; i < deviceCount && !found; i++) {
prop.mScope = capture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput; prop.mScope = input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput;
prop.mSelector = kAudioDevicePropertyStreamConfiguration; prop.mSelector = kAudioDevicePropertyStreamConfiguration;
AudioObjectGetPropertyDataSize(audioDevices[i], &prop, 0, nullptr, &size); AudioObjectGetPropertyDataSize(audioDevices[i], &prop, 0, nullptr, &size);
@ -602,7 +602,7 @@ void AudioDriverCoreAudio::_set_device(const String &device, bool capture) {
ERR_FAIL_NULL_MSG(buffer, "Out of memory."); ERR_FAIL_NULL_MSG(buffer, "Out of memory.");
if (CFStringGetCString(cfname, buffer, maxSize, kCFStringEncodingUTF8)) { if (CFStringGetCString(cfname, buffer, maxSize, kCFStringEncodingUTF8)) {
String name = String::utf8(buffer) + " (" + itos(audioDevices[i]) + ")"; String name = String::utf8(buffer) + " (" + itos(audioDevices[i]) + ")";
if (name == device) { if (name == output_device) {
deviceId = audioDevices[i]; deviceId = audioDevices[i];
found = true; found = true;
} }
@ -618,7 +618,7 @@ void AudioDriverCoreAudio::_set_device(const String &device, bool capture) {
if (!found) { if (!found) {
// If we haven't found the desired device get the system default one // If we haven't found the desired device get the system default one
UInt32 size = sizeof(AudioDeviceID); UInt32 size = sizeof(AudioDeviceID);
UInt32 elem = capture ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice; UInt32 elem = input ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice;
AudioObjectPropertyAddress property = { elem, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster }; AudioObjectPropertyAddress property = { elem, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
OSStatus result = AudioObjectGetPropertyData(kAudioObjectSystemObject, &property, 0, nullptr, &size, &deviceId); OSStatus result = AudioObjectGetPropertyData(kAudioObjectSystemObject, &property, 0, nullptr, &size, &deviceId);
@ -628,10 +628,10 @@ void AudioDriverCoreAudio::_set_device(const String &device, bool capture) {
} }
if (found) { if (found) {
OSStatus result = AudioUnitSetProperty(capture ? input_unit : audio_unit, kAudioOutputUnitProperty_CurrentDevice, kAudioUnitScope_Global, 0, &deviceId, sizeof(AudioDeviceID)); OSStatus result = AudioUnitSetProperty(input ? input_unit : audio_unit, kAudioOutputUnitProperty_CurrentDevice, kAudioUnitScope_Global, 0, &deviceId, sizeof(AudioDeviceID));
ERR_FAIL_COND(result != noErr); ERR_FAIL_COND(result != noErr);
if (capture) { if (input) {
// Reset audio input to keep synchronization. // Reset audio input to keep synchronization.
input_position = 0; input_position = 0;
input_size = 0; input_size = 0;
@ -639,34 +639,34 @@ void AudioDriverCoreAudio::_set_device(const String &device, bool capture) {
} }
} }
PackedStringArray AudioDriverCoreAudio::get_device_list() { PackedStringArray AudioDriverCoreAudio::get_output_device_list() {
return _get_device_list(); return _get_device_list();
} }
String AudioDriverCoreAudio::get_device() { String AudioDriverCoreAudio::get_output_device() {
return device_name; return output_device_name;
} }
void AudioDriverCoreAudio::set_device(String device) { void AudioDriverCoreAudio::set_output_device(String output_device) {
device_name = device; output_device_name = output_device;
if (active) { if (active) {
_set_device(device_name); _set_device(output_device_name);
} }
} }
void AudioDriverCoreAudio::capture_set_device(const String &p_name) { void AudioDriverCoreAudio::set_input_device(const String &p_name) {
capture_device_name = p_name; input_device_name = p_name;
if (active) { if (active) {
_set_device(capture_device_name, true); _set_device(input_device_name, true);
} }
} }
PackedStringArray AudioDriverCoreAudio::capture_get_device_list() { PackedStringArray AudioDriverCoreAudio::get_input_device_list() {
return _get_device_list(true); return _get_device_list(true);
} }
String AudioDriverCoreAudio::capture_get_device() { String AudioDriverCoreAudio::get_input_device() {
return capture_device_name; return input_device_name;
} }
#endif #endif

18
drivers/coreaudio/audio_driver_coreaudio.h
View file

@ -47,8 +47,8 @@ class AudioDriverCoreAudio : public AudioDriver {
bool active = false; bool active = false;
Mutex mutex; Mutex mutex;
String device_name = "Default"; String output_device_name = "Default";
String capture_device_name = "Default"; String input_device_name = "Default";
int mix_rate = 0; int mix_rate = 0;
unsigned int channels = 2; unsigned int channels = 2;
@ -60,7 +60,7 @@ class AudioDriverCoreAudio : public AudioDriver {
#ifdef MACOS_ENABLED #ifdef MACOS_ENABLED
PackedStringArray _get_device_list(bool capture = false); PackedStringArray _get_device_list(bool capture = false);
void _set_device(const String &device, bool capture = false); void _set_device(const String &output_device, bool capture = false);
static OSStatus input_device_address_cb(AudioObjectID inObjectID, static OSStatus input_device_address_cb(AudioObjectID inObjectID,
UInt32 inNumberAddresses, const AudioObjectPropertyAddress *inAddresses, UInt32 inNumberAddresses, const AudioObjectPropertyAddress *inAddresses,
@ -107,13 +107,13 @@ public:
void stop(); void stop();
#ifdef MACOS_ENABLED #ifdef MACOS_ENABLED
virtual PackedStringArray get_device_list(); virtual PackedStringArray get_output_device_list();
virtual String get_device(); virtual String get_output_device();
virtual void set_device(String device); virtual void set_output_device(String output_device);
virtual PackedStringArray capture_get_device_list(); virtual PackedStringArray get_input_device_list();
virtual void capture_set_device(const String &p_name); virtual void set_input_device(const String &p_name);
virtual String capture_get_device(); virtual String get_input_device();
#endif #endif
AudioDriverCoreAudio(); AudioDriverCoreAudio();

138
drivers/pulseaudio/audio_driver_pulseaudio.cpp
View file

@ -106,15 +106,15 @@ void AudioDriverPulseAudio::pa_server_info_cb(pa_context *c, const pa_server_inf
ERR_FAIL_COND_MSG(!i, "PulseAudio server info is null."); ERR_FAIL_COND_MSG(!i, "PulseAudio server info is null.");
AudioDriverPulseAudio *ad = static_cast<AudioDriverPulseAudio *>(userdata); AudioDriverPulseAudio *ad = static_cast<AudioDriverPulseAudio *>(userdata);
ad->capture_default_device = i->default_source_name; ad->default_input_device = i->default_source_name;
ad->default_device = i->default_sink_name; ad->default_output_device = i->default_sink_name;
ad->pa_status++; ad->pa_status++;
} }
Error AudioDriverPulseAudio::detect_channels(bool capture) { Error AudioDriverPulseAudio::detect_channels(bool input) {
pa_channel_map_init_stereo(capture ? &pa_rec_map : &pa_map); pa_channel_map_init_stereo(input ? &pa_rec_map : &pa_map);
String device = capture ? capture_device_name : device_name; String device = input ? input_device_name : output_device_name;
if (device == "Default") { if (device == "Default") {
// Get the default output device name // Get the default output device name
pa_status = 0; pa_status = 0;
@ -136,7 +136,7 @@ Error AudioDriverPulseAudio::detect_channels(bool capture) {
char dev[1024]; char dev[1024];
if (device == "Default") { if (device == "Default") {
strcpy(dev, capture ? capture_default_device.utf8().get_data() : default_device.utf8().get_data()); strcpy(dev, input ? default_input_device.utf8().get_data() : default_output_device.utf8().get_data());
} else { } else {
strcpy(dev, device.utf8().get_data()); strcpy(dev, device.utf8().get_data());
} }
@ -145,7 +145,7 @@ Error AudioDriverPulseAudio::detect_channels(bool capture) {
// Now using the device name get the amount of channels // Now using the device name get the amount of channels
pa_status = 0; pa_status = 0;
pa_operation *pa_op; pa_operation *pa_op;
if (capture) { if (input) {
pa_op = pa_context_get_source_info_by_name(pa_ctx, dev, &AudioDriverPulseAudio::pa_source_info_cb, (void *)this); pa_op = pa_context_get_source_info_by_name(pa_ctx, dev, &AudioDriverPulseAudio::pa_source_info_cb, (void *)this);
} else { } else {
pa_op = pa_context_get_sink_info_by_name(pa_ctx, dev, &AudioDriverPulseAudio::pa_sink_info_cb, (void *)this); pa_op = pa_context_get_sink_info_by_name(pa_ctx, dev, &AudioDriverPulseAudio::pa_sink_info_cb, (void *)this);
@ -165,7 +165,7 @@ Error AudioDriverPulseAudio::detect_channels(bool capture) {
return FAILED; return FAILED;
} }
} else { } else {
if (capture) { if (input) {
ERR_PRINT("pa_context_get_source_info_by_name error"); ERR_PRINT("pa_context_get_source_info_by_name error");
} else { } else {
ERR_PRINT("pa_context_get_sink_info_by_name error"); ERR_PRINT("pa_context_get_sink_info_by_name error");
@ -175,13 +175,13 @@ Error AudioDriverPulseAudio::detect_channels(bool capture) {
return OK; return OK;
} }
Error AudioDriverPulseAudio::init_device() { Error AudioDriverPulseAudio::init_output_device() {
// If there is a specified device check that it is really present // If there is a specified output device, check that it is really present
if (device_name != "Default") { if (output_device_name != "Default") {
PackedStringArray list = get_device_list(); PackedStringArray list = get_output_device_list();
if (list.find(device_name) == -1) { if (list.find(output_device_name) == -1) {
device_name = "Default"; output_device_name = "Default";
new_device = "Default"; new_output_device = "Default";
} }
} }
@ -192,7 +192,7 @@ Error AudioDriverPulseAudio::init_device() {
Error err = detect_channels(); Error err = detect_channels();
if (err != OK) { if (err != OK) {
// This most likely means there are no sinks. // This most likely means there are no sinks.
ERR_PRINT("PulseAudio: init device failed to detect number of output channels"); ERR_PRINT("PulseAudio: init_output_device failed to detect number of output channels");
return err; return err;
} }
@ -256,7 +256,7 @@ Error AudioDriverPulseAudio::init_device() {
attr.maxlength = (uint32_t)-1; attr.maxlength = (uint32_t)-1;
attr.minreq = (uint32_t)-1; attr.minreq = (uint32_t)-1;
const char *dev = device_name == "Default" ? nullptr : device_name.utf8().get_data(); const char *dev = output_device_name == "Default" ? nullptr : output_device_name.utf8().get_data();
pa_stream_flags flags = pa_stream_flags(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE); pa_stream_flags flags = pa_stream_flags(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE);
int error_code = pa_stream_connect_playback(pa_str, dev, &attr, flags, nullptr, nullptr); int error_code = pa_stream_connect_playback(pa_str, dev, &attr, flags, nullptr, nullptr);
ERR_FAIL_COND_V(error_code < 0, ERR_CANT_OPEN); ERR_FAIL_COND_V(error_code < 0, ERR_CANT_OPEN);
@ -346,7 +346,7 @@ Error AudioDriverPulseAudio::init() {
return ERR_CANT_OPEN; return ERR_CANT_OPEN;
} }
init_device(); init_output_device();
thread.start(AudioDriverPulseAudio::thread_func, this); thread.start(AudioDriverPulseAudio::thread_func, this);
return OK; return OK;
@ -448,18 +448,18 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) {
} }
} }
// User selected a new device, finish the current one so we'll init the new device // User selected a new output device, finish the current one so we'll init the new output device
if (ad->device_name != ad->new_device) { if (ad->output_device_name != ad->new_output_device) {
ad->device_name = ad->new_device; ad->output_device_name = ad->new_output_device;
ad->finish_device(); ad->finish_output_device();
Error err = ad->init_device(); Error err = ad->init_output_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("PulseAudio: init_device error"); ERR_PRINT("PulseAudio: init_output_device error");
ad->device_name = "Default"; ad->output_device_name = "Default";
ad->new_device = "Default"; ad->new_output_device = "Default";
err = ad->init_device(); err = ad->init_output_device();
if (err != OK) { if (err != OK) {
ad->active.clear(); ad->active.clear();
ad->exit_thread.set(); ad->exit_thread.set();
@ -471,11 +471,11 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) {
write_ofs = 0; write_ofs = 0;
} }
// If we're using the default device check that the current device is still the default // If we're using the default output device, check that the current output device is still the default
if (ad->device_name == "Default") { if (ad->output_device_name == "Default") {
uint64_t msec = OS::get_singleton()->get_ticks_msec(); uint64_t msec = OS::get_singleton()->get_ticks_msec();
if (msec > (default_device_msec + 1000)) { if (msec > (default_device_msec + 1000)) {
String old_default_device = ad->default_device; String old_default_device = ad->default_output_device;
default_device_msec = msec; default_device_msec = msec;
@ -494,12 +494,12 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) {
ERR_PRINT("pa_context_get_server_info error: " + String(pa_strerror(pa_context_errno(ad->pa_ctx)))); ERR_PRINT("pa_context_get_server_info error: " + String(pa_strerror(pa_context_errno(ad->pa_ctx))));
} }
if (old_default_device != ad->default_device) { if (old_default_device != ad->default_output_device) {
ad->finish_device(); ad->finish_output_device();
Error err = ad->init_device(); Error err = ad->init_output_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("PulseAudio: init_device error"); ERR_PRINT("PulseAudio: init_output_device error");
ad->active.clear(); ad->active.clear();
ad->exit_thread.set(); ad->exit_thread.set();
break; break;
@ -541,18 +541,18 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) {
} }
} }
// User selected a new device, finish the current one so we'll init the new device // User selected a new input device, finish the current one so we'll init the new input device
if (ad->capture_device_name != ad->capture_new_device) { if (ad->input_device_name != ad->new_input_device) {
ad->capture_device_name = ad->capture_new_device; ad->input_device_name = ad->new_input_device;
ad->capture_finish_device(); ad->finish_input_device();
Error err = ad->capture_init_device(); Error err = ad->init_input_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("PulseAudio: capture_init_device error"); ERR_PRINT("PulseAudio: init_input_device error");
ad->capture_device_name = "Default"; ad->input_device_name = "Default";
ad->capture_new_device = "Default"; ad->new_input_device = "Default";
err = ad->capture_init_device(); err = ad->init_input_device();
if (err != OK) { if (err != OK) {
ad->active.clear(); ad->active.clear();
ad->exit_thread.set(); ad->exit_thread.set();
@ -596,7 +596,7 @@ void AudioDriverPulseAudio::pa_sinklist_cb(pa_context *c, const pa_sink_info *l,
ad->pa_status++; ad->pa_status++;
} }
PackedStringArray AudioDriverPulseAudio::get_device_list() { PackedStringArray AudioDriverPulseAudio::get_output_device_list() {
pa_devices.clear(); pa_devices.clear();
pa_devices.push_back("Default"); pa_devices.push_back("Default");
@ -606,7 +606,7 @@ PackedStringArray AudioDriverPulseAudio::get_device_list() {
lock(); lock();
// Get the device list // Get the output device list
pa_status = 0; pa_status = 0;
pa_operation *pa_op = pa_context_get_sink_info_list(pa_ctx, pa_sinklist_cb, (void *)this); pa_operation *pa_op = pa_context_get_sink_info_list(pa_ctx, pa_sinklist_cb, (void *)this);
if (pa_op) { if (pa_op) {
@ -627,13 +627,13 @@ PackedStringArray AudioDriverPulseAudio::get_device_list() {
return pa_devices; return pa_devices;
} }
String AudioDriverPulseAudio::get_device() { String AudioDriverPulseAudio::get_output_device() {
return device_name; return output_device_name;
} }
void AudioDriverPulseAudio::set_device(String device) { void AudioDriverPulseAudio::set_output_device(String output_device) {
lock(); lock();
new_device = device; new_output_device = output_device;
unlock(); unlock();
} }
@ -645,7 +645,7 @@ void AudioDriverPulseAudio::unlock() {
mutex.unlock(); mutex.unlock();
} }
void AudioDriverPulseAudio::finish_device() { void AudioDriverPulseAudio::finish_output_device() {
if (pa_str) { if (pa_str) {
pa_stream_disconnect(pa_str); pa_stream_disconnect(pa_str);
pa_stream_unref(pa_str); pa_stream_unref(pa_str);
@ -661,7 +661,7 @@ void AudioDriverPulseAudio::finish() {
exit_thread.set(); exit_thread.set();
thread.wait_to_finish(); thread.wait_to_finish();
finish_device(); finish_output_device();
if (pa_ctx) { if (pa_ctx) {
pa_context_disconnect(pa_ctx); pa_context_disconnect(pa_ctx);
@ -675,13 +675,13 @@ void AudioDriverPulseAudio::finish() {
} }
} }
Error AudioDriverPulseAudio::capture_init_device() { Error AudioDriverPulseAudio::init_input_device() {
// If there is a specified device check that it is really present // If there is a specified input device, check that it is really present
if (capture_device_name != "Default") { if (input_device_name != "Default") {
PackedStringArray list = capture_get_device_list(); PackedStringArray list = get_input_device_list();
if (list.find(capture_device_name) == -1) { if (list.find(input_device_name) == -1) {
capture_device_name = "Default"; input_device_name = "Default";
capture_new_device = "Default"; new_input_device = "Default";
} }
} }
@ -718,7 +718,7 @@ Error AudioDriverPulseAudio::capture_init_device() {
ERR_FAIL_V(ERR_CANT_OPEN); ERR_FAIL_V(ERR_CANT_OPEN);
} }
const char *dev = capture_device_name == "Default" ? nullptr : capture_device_name.utf8().get_data(); const char *dev = input_device_name == "Default" ? nullptr : input_device_name.utf8().get_data();
pa_stream_flags flags = pa_stream_flags(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE); pa_stream_flags flags = pa_stream_flags(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE);
int error_code = pa_stream_connect_record(pa_rec_str, dev, &attr, flags); int error_code = pa_stream_connect_record(pa_rec_str, dev, &attr, flags);
if (error_code < 0) { if (error_code < 0) {
@ -734,7 +734,7 @@ Error AudioDriverPulseAudio::capture_init_device() {
return OK; return OK;
} }
void AudioDriverPulseAudio::capture_finish_device() { void AudioDriverPulseAudio::finish_input_device() {
if (pa_rec_str) { if (pa_rec_str) {
int ret = pa_stream_disconnect(pa_rec_str); int ret = pa_stream_disconnect(pa_rec_str);
if (ret != 0) { if (ret != 0) {
@ -745,25 +745,25 @@ void AudioDriverPulseAudio::capture_finish_device() {
} }
} }
Error AudioDriverPulseAudio::capture_start() { Error AudioDriverPulseAudio::input_start() {
lock(); lock();
Error err = capture_init_device(); Error err = init_input_device();
unlock(); unlock();
return err; return err;
} }
Error AudioDriverPulseAudio::capture_stop() { Error AudioDriverPulseAudio::input_stop() {
lock(); lock();
capture_finish_device(); finish_input_device();
unlock(); unlock();
return OK; return OK;
} }
void AudioDriverPulseAudio::capture_set_device(const String &p_name) { void AudioDriverPulseAudio::set_input_device(const String &p_name) {
lock(); lock();
capture_new_device = p_name; new_input_device = p_name;
unlock(); unlock();
} }
@ -782,7 +782,7 @@ void AudioDriverPulseAudio::pa_sourcelist_cb(pa_context *c, const pa_source_info
ad->pa_status++; ad->pa_status++;
} }
PackedStringArray AudioDriverPulseAudio::capture_get_device_list() { PackedStringArray AudioDriverPulseAudio::get_input_device_list() {
pa_rec_devices.clear(); pa_rec_devices.clear();
pa_rec_devices.push_back("Default"); pa_rec_devices.push_back("Default");
@ -813,9 +813,9 @@ PackedStringArray AudioDriverPulseAudio::capture_get_device_list() {
return pa_rec_devices; return pa_rec_devices;
} }
String AudioDriverPulseAudio::capture_get_device() { String AudioDriverPulseAudio::get_input_device() {
lock(); lock();
String name = capture_device_name; String name = input_device_name;
unlock(); unlock();
return name; return name;

36
drivers/pulseaudio/audio_driver_pulseaudio.h
View file

@ -51,13 +51,13 @@ class AudioDriverPulseAudio : public AudioDriver {
pa_channel_map pa_map = {}; pa_channel_map pa_map = {};
pa_channel_map pa_rec_map = {}; pa_channel_map pa_rec_map = {};
String device_name = "Default"; String output_device_name = "Default";
String new_device = "Default"; String new_output_device = "Default";
String default_device; String default_output_device;
String capture_device_name; String input_device_name;
String capture_new_device; String new_input_device;
String capture_default_device; String default_input_device;
Vector<int32_t> samples_in; Vector<int32_t> samples_in;
Vector<int16_t> samples_out; Vector<int16_t> samples_out;
@ -83,11 +83,11 @@ class AudioDriverPulseAudio : public AudioDriver {
static void pa_sinklist_cb(pa_context *c, const pa_sink_info *l, int eol, void *userdata); static void pa_sinklist_cb(pa_context *c, const pa_sink_info *l, int eol, void *userdata);
static void pa_sourcelist_cb(pa_context *c, const pa_source_info *l, int eol, void *userdata); static void pa_sourcelist_cb(pa_context *c, const pa_source_info *l, int eol, void *userdata);
Error init_device(); Error init_output_device();
void finish_device(); void finish_output_device();
Error capture_init_device(); Error init_input_device();
void capture_finish_device(); void finish_input_device();
Error detect_channels(bool capture = false); Error detect_channels(bool capture = false);
@ -103,13 +103,13 @@ public:
virtual int get_mix_rate() const; virtual int get_mix_rate() const;
virtual SpeakerMode get_speaker_mode() const; virtual SpeakerMode get_speaker_mode() const;
virtual PackedStringArray get_device_list(); virtual PackedStringArray get_output_device_list();
virtual String get_device(); virtual String get_output_device();
virtual void set_device(String device); virtual void set_output_device(String output_device);
virtual PackedStringArray capture_get_device_list(); virtual PackedStringArray get_input_device_list();
virtual void capture_set_device(const String &p_name); virtual void set_input_device(const String &p_name);
virtual String capture_get_device(); virtual String get_input_device();
virtual void lock(); virtual void lock();
virtual void unlock(); virtual void unlock();
@ -117,8 +117,8 @@ public:
virtual float get_latency(); virtual float get_latency();
virtual Error capture_start(); virtual Error input_start();
virtual Error capture_stop(); virtual Error input_stop();
AudioDriverPulseAudio(); AudioDriverPulseAudio();
~AudioDriverPulseAudio() {} ~AudioDriverPulseAudio() {}

162
drivers/wasapi/audio_driver_wasapi.cpp
View file

@ -118,8 +118,8 @@ const IID IID_IAudioCaptureClient = __uuidof(IAudioCaptureClient);
#define CAPTURE_BUFFER_CHANNELS 2 #define CAPTURE_BUFFER_CHANNELS 2
static bool default_render_device_changed = false; static bool default_output_device_changed = false;
static bool default_capture_device_changed = false; static bool default_input_device_changed = false;
// Silence warning due to a COM API weirdness (GH-35194). // Silence warning due to a COM API weirdness (GH-35194).
#if defined(__GNUC__) && !defined(__clang__) #if defined(__GNUC__) && !defined(__clang__)
@ -181,9 +181,9 @@ public:
HRESULT STDMETHODCALLTYPE OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR pwstrDeviceId) { HRESULT STDMETHODCALLTYPE OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR pwstrDeviceId) {
if (role == eConsole) { if (role == eConsole) {
if (flow == eRender) { if (flow == eRender) {
default_render_device_changed = true; default_output_device_changed = true;
} else if (flow == eCapture) { } else if (flow == eCapture) {
default_capture_device_changed = true; default_input_device_changed = true;
} }
} }
@ -201,10 +201,10 @@ public:
static CMMNotificationClient notif_client; static CMMNotificationClient notif_client;
Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_capture, bool p_reinit, bool p_no_audio_client_3) { Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_input, bool p_reinit, bool p_no_audio_client_3) {
WAVEFORMATEX *pwfex; WAVEFORMATEX *pwfex;
IMMDeviceEnumerator *enumerator = nullptr; IMMDeviceEnumerator *enumerator = nullptr;
IMMDevice *device = nullptr; IMMDevice *output_device = nullptr;
CoInitialize(nullptr); CoInitialize(nullptr);
@ -212,11 +212,11 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_c
ERR_FAIL_COND_V(hr != S_OK, ERR_CANT_OPEN); ERR_FAIL_COND_V(hr != S_OK, ERR_CANT_OPEN);
if (p_device->device_name == "Default") { if (p_device->device_name == "Default") {
hr = enumerator->GetDefaultAudioEndpoint(p_capture ? eCapture : eRender, eConsole, &device); hr = enumerator->GetDefaultAudioEndpoint(p_input ? eCapture : eRender, eConsole, &output_device);
} else { } else {
IMMDeviceCollection *devices = nullptr; IMMDeviceCollection *devices = nullptr;
hr = enumerator->EnumAudioEndpoints(p_capture ? eCapture : eRender, DEVICE_STATE_ACTIVE, &devices); hr = enumerator->EnumAudioEndpoints(p_input ? eCapture : eRender, DEVICE_STATE_ACTIVE, &devices);
ERR_FAIL_COND_V(hr != S_OK, ERR_CANT_OPEN); ERR_FAIL_COND_V(hr != S_OK, ERR_CANT_OPEN);
LPWSTR strId = nullptr; LPWSTR strId = nullptr;
@ -255,20 +255,20 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_c
} }
if (found) { if (found) {
hr = enumerator->GetDevice(strId, &device); hr = enumerator->GetDevice(strId, &output_device);
} }
if (strId) { if (strId) {
CoTaskMemFree(strId); CoTaskMemFree(strId);
} }
if (device == nullptr) { if (output_device == nullptr) {
hr = enumerator->GetDefaultAudioEndpoint(p_capture ? eCapture : eRender, eConsole, &device); hr = enumerator->GetDefaultAudioEndpoint(p_input ? eCapture : eRender, eConsole, &output_device);
} }
} }
if (p_reinit) { if (p_reinit) {
// In case we're trying to re-initialize the device prevent throwing this error on the console, // In case we're trying to re-initialize the device, prevent throwing this error on the console,
// otherwise if there is currently no device available this will spam the console. // otherwise if there is currently no device available this will spam the console.
if (hr != S_OK) { if (hr != S_OK) {
return ERR_CANT_OPEN; return ERR_CANT_OPEN;
@ -284,28 +284,28 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_c
ERR_PRINT("WASAPI: RegisterEndpointNotificationCallback error"); ERR_PRINT("WASAPI: RegisterEndpointNotificationCallback error");
} }
using_audio_client_3 = !p_capture; // IID_IAudioClient3 is only used for adjustable output latency (not input) using_audio_client_3 = !p_input; // IID_IAudioClient3 is only used for adjustable output latency (not input)
if (p_no_audio_client_3) { if (p_no_audio_client_3) {
using_audio_client_3 = false; using_audio_client_3 = false;
} }
if (using_audio_client_3) { if (using_audio_client_3) {
hr = device->Activate(IID_IAudioClient3, CLSCTX_ALL, nullptr, (void **)&p_device->audio_client); hr = output_device->Activate(IID_IAudioClient3, CLSCTX_ALL, nullptr, (void **)&p_device->audio_client);
if (hr != S_OK) { if (hr != S_OK) {
// IID_IAudioClient3 will never activate on OS versions before Windows 10. // IID_IAudioClient3 will never activate on OS versions before Windows 10.
// Older Windows versions should fall back gracefully. // Older Windows versions should fall back gracefully.
using_audio_client_3 = false; using_audio_client_3 = false;
print_verbose("WASAPI: Couldn't activate device with IAudioClient3 interface, falling back to IAudioClient interface"); print_verbose("WASAPI: Couldn't activate output_device with IAudioClient3 interface, falling back to IAudioClient interface");
} else { } else {
print_verbose("WASAPI: Activated device using IAudioClient3 interface"); print_verbose("WASAPI: Activated output_device using IAudioClient3 interface");
} }
} }
if (!using_audio_client_3) { if (!using_audio_client_3) {
hr = device->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, (void **)&p_device->audio_client); hr = output_device->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, (void **)&p_device->audio_client);
} }
SAFE_RELEASE(device) SAFE_RELEASE(output_device)
if (p_reinit) { if (p_reinit) {
if (hr != S_OK) { if (hr != S_OK) {
@ -339,7 +339,7 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_c
WAVEFORMATEX *closest = nullptr; WAVEFORMATEX *closest = nullptr;
hr = p_device->audio_client->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED, pwfex, &closest); hr = p_device->audio_client->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED, pwfex, &closest);
if (hr == S_FALSE) { if (hr == S_FALSE) {
WARN_PRINT("WASAPI: Mix format is not supported by the Device"); WARN_PRINT("WASAPI: Mix format is not supported by the output_device");
if (closest) { if (closest) {
print_verbose("WASAPI: closest->wFormatTag = " + itos(closest->wFormatTag)); print_verbose("WASAPI: closest->wFormatTag = " + itos(closest->wFormatTag));
print_verbose("WASAPI: closest->nChannels = " + itos(closest->nChannels)); print_verbose("WASAPI: closest->nChannels = " + itos(closest->nChannels));
@ -385,14 +385,14 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_c
pwfex->nSamplesPerSec = mix_rate; pwfex->nSamplesPerSec = mix_rate;
pwfex->nAvgBytesPerSec = pwfex->nSamplesPerSec * pwfex->nChannels * (pwfex->wBitsPerSample / 8); pwfex->nAvgBytesPerSec = pwfex->nSamplesPerSec * pwfex->nChannels * (pwfex->wBitsPerSample / 8);
} }
hr = p_device->audio_client->Initialize(AUDCLNT_SHAREMODE_SHARED, streamflags, p_capture ? REFTIMES_PER_SEC : 0, 0, pwfex, nullptr); hr = p_device->audio_client->Initialize(AUDCLNT_SHAREMODE_SHARED, streamflags, p_input ? REFTIMES_PER_SEC : 0, 0, pwfex, nullptr);
ERR_FAIL_COND_V_MSG(hr != S_OK, ERR_CANT_OPEN, "WASAPI: Initialize failed with error 0x" + String::num_uint64(hr, 16) + "."); ERR_FAIL_COND_V_MSG(hr != S_OK, ERR_CANT_OPEN, "WASAPI: Initialize failed with error 0x" + String::num_uint64(hr, 16) + ".");
UINT32 max_frames; UINT32 max_frames;
hr = p_device->audio_client->GetBufferSize(&max_frames); hr = p_device->audio_client->GetBufferSize(&max_frames);
ERR_FAIL_COND_V(hr != S_OK, ERR_CANT_OPEN); ERR_FAIL_COND_V(hr != S_OK, ERR_CANT_OPEN);
// Due to WASAPI Shared Mode we have no control of the buffer size // Due to WASAPI Shared Mode we have no control of the buffer size
if (!p_capture) { if (!p_input) {
buffer_frames = max_frames; buffer_frames = max_frames;
int64_t latency = 0; int64_t latency = 0;
@ -421,8 +421,8 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_c
if (hr != S_OK) { if (hr != S_OK) {
print_verbose("WASAPI: GetSharedModeEnginePeriod failed with error 0x" + String::num_uint64(hr, 16) + ", falling back to IAudioClient."); print_verbose("WASAPI: GetSharedModeEnginePeriod failed with error 0x" + String::num_uint64(hr, 16) + ", falling back to IAudioClient.");
CoTaskMemFree(pwfex); CoTaskMemFree(pwfex);
SAFE_RELEASE(device) SAFE_RELEASE(output_device)
return audio_device_init(p_device, p_capture, p_reinit, true); return audio_device_init(p_device, p_input, p_reinit, true);
} }
// Period frames must be an integral multiple of fundamental_period_frames or IAudioClient3 initialization will fail, // Period frames must be an integral multiple of fundamental_period_frames or IAudioClient3 initialization will fail,
@ -443,8 +443,8 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_c
if (hr != S_OK) { if (hr != S_OK) {
print_verbose("WASAPI: InitializeSharedAudioStream failed with error 0x" + String::num_uint64(hr, 16) + ", falling back to IAudioClient."); print_verbose("WASAPI: InitializeSharedAudioStream failed with error 0x" + String::num_uint64(hr, 16) + ", falling back to IAudioClient.");
CoTaskMemFree(pwfex); CoTaskMemFree(pwfex);
SAFE_RELEASE(device); SAFE_RELEASE(output_device);
return audio_device_init(p_device, p_capture, p_reinit, true); return audio_device_init(p_device, p_input, p_reinit, true);
} else { } else {
uint32_t output_latency_in_frames; uint32_t output_latency_in_frames;
WAVEFORMATEX *current_pwfex; WAVEFORMATEX *current_pwfex;
@ -455,13 +455,13 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_c
} else { } else {
print_verbose("WASAPI: GetCurrentSharedModeEnginePeriod failed with error 0x" + String::num_uint64(hr, 16) + ", falling back to IAudioClient."); print_verbose("WASAPI: GetCurrentSharedModeEnginePeriod failed with error 0x" + String::num_uint64(hr, 16) + ", falling back to IAudioClient.");
CoTaskMemFree(pwfex); CoTaskMemFree(pwfex);
SAFE_RELEASE(device); SAFE_RELEASE(output_device);
return audio_device_init(p_device, p_capture, p_reinit, true); return audio_device_init(p_device, p_input, p_reinit, true);
} }
} }
} }
if (p_capture) { if (p_input) {
hr = p_device->audio_client->GetService(IID_IAudioCaptureClient, (void **)&p_device->capture_client); hr = p_device->audio_client->GetService(IID_IAudioCaptureClient, (void **)&p_device->capture_client);
} else { } else {
hr = p_device->audio_client->GetService(IID_IAudioRenderClient, (void **)&p_device->render_client); hr = p_device->audio_client->GetService(IID_IAudioRenderClient, (void **)&p_device->render_client);
@ -470,12 +470,12 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_c
// Free memory // Free memory
CoTaskMemFree(pwfex); CoTaskMemFree(pwfex);
SAFE_RELEASE(device) SAFE_RELEASE(output_device)
return OK; return OK;
} }
Error AudioDriverWASAPI::init_render_device(bool p_reinit) { Error AudioDriverWASAPI::init_output_device(bool p_reinit) {
Error err = audio_device_init(&audio_output, false, p_reinit); Error err = audio_device_init(&audio_output, false, p_reinit);
if (err != OK) { if (err != OK) {
return err; return err;
@ -507,7 +507,7 @@ Error AudioDriverWASAPI::init_render_device(bool p_reinit) {
return OK; return OK;
} }
Error AudioDriverWASAPI::init_capture_device(bool p_reinit) { Error AudioDriverWASAPI::init_input_device(bool p_reinit) {
Error err = audio_device_init(&audio_input, true, p_reinit); Error err = audio_device_init(&audio_input, true, p_reinit);
if (err != OK) { if (err != OK) {
return err; return err;
@ -538,11 +538,11 @@ Error AudioDriverWASAPI::audio_device_finish(AudioDeviceWASAPI *p_device) {
return OK; return OK;
} }
Error AudioDriverWASAPI::finish_render_device() { Error AudioDriverWASAPI::finish_output_device() {
return audio_device_finish(&audio_output); return audio_device_finish(&audio_output);
} }
Error AudioDriverWASAPI::finish_capture_device() { Error AudioDriverWASAPI::finish_input_device() {
return audio_device_finish(&audio_input); return audio_device_finish(&audio_input);
} }
@ -551,9 +551,9 @@ Error AudioDriverWASAPI::init() {
target_latency_ms = GLOBAL_GET("audio/driver/output_latency"); target_latency_ms = GLOBAL_GET("audio/driver/output_latency");
Error err = init_render_device(); Error err = init_output_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("WASAPI: init_render_device error"); ERR_PRINT("WASAPI: init_output_device error");
} }
exit_thread.clear(); exit_thread.clear();
@ -575,7 +575,7 @@ AudioDriver::SpeakerMode AudioDriverWASAPI::get_speaker_mode() const {
return get_speaker_mode_by_total_channels(channels); return get_speaker_mode_by_total_channels(channels);
} }
PackedStringArray AudioDriverWASAPI::audio_device_get_list(bool p_capture) { PackedStringArray AudioDriverWASAPI::audio_device_get_list(bool p_input) {
PackedStringArray list; PackedStringArray list;
IMMDeviceCollection *devices = nullptr; IMMDeviceCollection *devices = nullptr;
IMMDeviceEnumerator *enumerator = nullptr; IMMDeviceEnumerator *enumerator = nullptr;
@ -587,7 +587,7 @@ PackedStringArray AudioDriverWASAPI::audio_device_get_list(bool p_capture) {
HRESULT hr = CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void **)&enumerator); HRESULT hr = CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void **)&enumerator);
ERR_FAIL_COND_V(hr != S_OK, PackedStringArray()); ERR_FAIL_COND_V(hr != S_OK, PackedStringArray());
hr = enumerator->EnumAudioEndpoints(p_capture ? eCapture : eRender, DEVICE_STATE_ACTIVE, &devices); hr = enumerator->EnumAudioEndpoints(p_input ? eCapture : eRender, DEVICE_STATE_ACTIVE, &devices);
ERR_FAIL_COND_V(hr != S_OK, PackedStringArray()); ERR_FAIL_COND_V(hr != S_OK, PackedStringArray());
UINT count = 0; UINT count = 0;
@ -595,13 +595,13 @@ PackedStringArray AudioDriverWASAPI::audio_device_get_list(bool p_capture) {
ERR_FAIL_COND_V(hr != S_OK, PackedStringArray()); ERR_FAIL_COND_V(hr != S_OK, PackedStringArray());
for (ULONG i = 0; i < count; i++) { for (ULONG i = 0; i < count; i++) {
IMMDevice *device = nullptr; IMMDevice *output_device = nullptr;
hr = devices->Item(i, &device); hr = devices->Item(i, &output_device);
ERR_BREAK(hr != S_OK); ERR_BREAK(hr != S_OK);
IPropertyStore *props = nullptr; IPropertyStore *props = nullptr;
hr = device->OpenPropertyStore(STGM_READ, &props); hr = output_device->OpenPropertyStore(STGM_READ, &props);
ERR_BREAK(hr != S_OK); ERR_BREAK(hr != S_OK);
PROPVARIANT propvar; PROPVARIANT propvar;
@ -614,7 +614,7 @@ PackedStringArray AudioDriverWASAPI::audio_device_get_list(bool p_capture) {
PropVariantClear(&propvar); PropVariantClear(&propvar);
props->Release(); props->Release();
device->Release(); output_device->Release();
} }
devices->Release(); devices->Release();
@ -622,11 +622,11 @@ PackedStringArray AudioDriverWASAPI::audio_device_get_list(bool p_capture) {
return list; return list;
} }
PackedStringArray AudioDriverWASAPI::get_device_list() { PackedStringArray AudioDriverWASAPI::get_output_device_list() {
return audio_device_get_list(false); return audio_device_get_list(false);
} }
String AudioDriverWASAPI::get_device() { String AudioDriverWASAPI::get_output_device() {
lock(); lock();
String name = audio_output.device_name; String name = audio_output.device_name;
unlock(); unlock();
@ -634,9 +634,9 @@ String AudioDriverWASAPI::get_device() {
return name; return name;
} }
void AudioDriverWASAPI::set_device(String device) { void AudioDriverWASAPI::set_output_device(String output_device) {
lock(); lock();
audio_output.new_device = device; audio_output.new_device = output_device;
unlock(); unlock();
} }
@ -769,13 +769,13 @@ void AudioDriverWASAPI::thread_func(void *p_udata) {
avail_frames -= write_frames; avail_frames -= write_frames;
written_frames += write_frames; written_frames += write_frames;
} else if (hr == AUDCLNT_E_DEVICE_INVALIDATED) { } else if (hr == AUDCLNT_E_DEVICE_INVALIDATED) {
// Device is not valid anymore, reopen it // output_device is not valid anymore, reopen it
Error err = ad->finish_render_device(); Error err = ad->finish_output_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("WASAPI: finish_render_device error"); ERR_PRINT("WASAPI: finish_output_device error");
} else { } else {
// We reopened the device and samples_in may have resized, so invalidate the current avail_frames // We reopened the output device and samples_in may have resized, so invalidate the current avail_frames
avail_frames = 0; avail_frames = 0;
} }
} else { } else {
@ -790,37 +790,37 @@ void AudioDriverWASAPI::thread_func(void *p_udata) {
} }
if (invalidated) { if (invalidated) {
// Device is not valid anymore // output_device is not valid anymore
WARN_PRINT("WASAPI: Current device invalidated, closing device"); WARN_PRINT("WASAPI: Current output_device invalidated, closing output_device");
Error err = ad->finish_render_device(); Error err = ad->finish_output_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("WASAPI: finish_render_device error"); ERR_PRINT("WASAPI: finish_output_device error");
} }
} }
} }
// If we're using the Default device and it changed finish it so we'll re-init the device // If we're using the Default output device and it changed finish it so we'll re-init the output device
if (ad->audio_output.device_name == "Default" && default_render_device_changed) { if (ad->audio_output.device_name == "Default" && default_output_device_changed) {
Error err = ad->finish_render_device(); Error err = ad->finish_output_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("WASAPI: finish_render_device error"); ERR_PRINT("WASAPI: finish_output_device error");
} }
default_render_device_changed = false; default_output_device_changed = false;
} }
// User selected a new device, finish the current one so we'll init the new device // User selected a new output device, finish the current one so we'll init the new output device
if (ad->audio_output.device_name != ad->audio_output.new_device) { if (ad->audio_output.device_name != ad->audio_output.new_device) {
ad->audio_output.device_name = ad->audio_output.new_device; ad->audio_output.device_name = ad->audio_output.new_device;
Error err = ad->finish_render_device(); Error err = ad->finish_output_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("WASAPI: finish_render_device error"); ERR_PRINT("WASAPI: finish_output_device error");
} }
} }
if (!ad->audio_output.audio_client) { if (!ad->audio_output.audio_client) {
Error err = ad->init_render_device(true); Error err = ad->init_output_device(true);
if (err == OK) { if (err == OK) {
ad->start(); ad->start();
} }
@ -873,29 +873,29 @@ void AudioDriverWASAPI::thread_func(void *p_udata) {
} }
} }
// If we're using the Default device and it changed finish it so we'll re-init the device // If we're using the Default output device and it changed finish it so we'll re-init the output device
if (ad->audio_input.device_name == "Default" && default_capture_device_changed) { if (ad->audio_input.device_name == "Default" && default_input_device_changed) {
Error err = ad->finish_capture_device(); Error err = ad->finish_input_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("WASAPI: finish_capture_device error"); ERR_PRINT("WASAPI: finish_input_device error");
} }
default_capture_device_changed = false; default_input_device_changed = false;
} }
// User selected a new device, finish the current one so we'll init the new device // User selected a new input device, finish the current one so we'll init the new input device
if (ad->audio_input.device_name != ad->audio_input.new_device) { if (ad->audio_input.device_name != ad->audio_input.new_device) {
ad->audio_input.device_name = ad->audio_input.new_device; ad->audio_input.device_name = ad->audio_input.new_device;
Error err = ad->finish_capture_device(); Error err = ad->finish_input_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("WASAPI: finish_capture_device error"); ERR_PRINT("WASAPI: finish_input_device error");
} }
} }
if (!ad->audio_input.audio_client) { if (!ad->audio_input.audio_client) {
Error err = ad->init_capture_device(true); Error err = ad->init_input_device(true);
if (err == OK) { if (err == OK) {
ad->capture_start(); ad->input_start();
} }
} }
} }
@ -933,14 +933,14 @@ void AudioDriverWASAPI::finish() {
exit_thread.set(); exit_thread.set();
thread.wait_to_finish(); thread.wait_to_finish();
finish_capture_device(); finish_input_device();
finish_render_device(); finish_output_device();
} }
Error AudioDriverWASAPI::capture_start() { Error AudioDriverWASAPI::input_start() {
Error err = init_capture_device(); Error err = init_input_device();
if (err != OK) { if (err != OK) {
ERR_PRINT("WASAPI: init_capture_device error"); ERR_PRINT("WASAPI: init_input_device error");
return err; return err;
} }
@ -953,7 +953,7 @@ Error AudioDriverWASAPI::capture_start() {
return OK; return OK;
} }
Error AudioDriverWASAPI::capture_stop() { Error AudioDriverWASAPI::input_stop() {
if (audio_input.active.is_set()) { if (audio_input.active.is_set()) {
audio_input.audio_client->Stop(); audio_input.audio_client->Stop();
audio_input.active.clear(); audio_input.active.clear();
@ -964,17 +964,17 @@ Error AudioDriverWASAPI::capture_stop() {
return FAILED; return FAILED;
} }
void AudioDriverWASAPI::capture_set_device(const String &p_name) { void AudioDriverWASAPI::set_input_device(const String &p_name) {
lock(); lock();
audio_input.new_device = p_name; audio_input.new_device = p_name;
unlock(); unlock();
} }
PackedStringArray AudioDriverWASAPI::capture_get_device_list() { PackedStringArray AudioDriverWASAPI::get_input_device_list() {
return audio_device_get_list(true); return audio_device_get_list(true);
} }
String AudioDriverWASAPI::capture_get_device() { String AudioDriverWASAPI::get_input_device() {
lock(); lock();
String name = audio_input.device_name; String name = audio_input.device_name;
unlock(); unlock();

36
drivers/wasapi/audio_driver_wasapi.h
View file

@ -47,8 +47,8 @@ class AudioDriverWASAPI : public AudioDriver {
class AudioDeviceWASAPI { class AudioDeviceWASAPI {
public: public:
IAudioClient *audio_client = nullptr; IAudioClient *audio_client = nullptr;
IAudioRenderClient *render_client = nullptr; IAudioRenderClient *render_client = nullptr; // Output
IAudioCaptureClient *capture_client = nullptr; IAudioCaptureClient *capture_client = nullptr; // Input
SafeFlag active; SafeFlag active;
WORD format_tag = 0; WORD format_tag = 0;
@ -56,8 +56,8 @@ class AudioDriverWASAPI : public AudioDriver {
unsigned int channels = 0; unsigned int channels = 0;
unsigned int frame_size = 0; unsigned int frame_size = 0;
String device_name = "Default"; String device_name = "Default"; // Output OR Input
String new_device = "Default"; String new_device = "Default"; // Output OR Input
AudioDeviceWASAPI() {} AudioDeviceWASAPI() {}
}; };
@ -83,15 +83,15 @@ class AudioDriverWASAPI : public AudioDriver {
static _FORCE_INLINE_ int32_t read_sample(WORD format_tag, int bits_per_sample, BYTE *buffer, int i); static _FORCE_INLINE_ int32_t read_sample(WORD format_tag, int bits_per_sample, BYTE *buffer, int i);
static void thread_func(void *p_udata); static void thread_func(void *p_udata);
Error init_render_device(bool p_reinit = false); Error init_output_device(bool p_reinit = false);
Error init_capture_device(bool p_reinit = false); Error init_input_device(bool p_reinit = false);
Error finish_render_device(); Error finish_output_device();
Error finish_capture_device(); Error finish_input_device();
Error audio_device_init(AudioDeviceWASAPI *p_device, bool p_capture, bool p_reinit, bool p_no_audio_client_3 = false); Error audio_device_init(AudioDeviceWASAPI *p_device, bool p_input, bool p_reinit, bool p_no_audio_client_3 = false);
Error audio_device_finish(AudioDeviceWASAPI *p_device); Error audio_device_finish(AudioDeviceWASAPI *p_device);
PackedStringArray audio_device_get_list(bool p_capture); PackedStringArray audio_device_get_list(bool p_input);
public: public:
virtual const char *get_name() const { virtual const char *get_name() const {
@ -103,18 +103,18 @@ public:
virtual int get_mix_rate() const; virtual int get_mix_rate() const;
virtual float get_latency(); virtual float get_latency();
virtual SpeakerMode get_speaker_mode() const; virtual SpeakerMode get_speaker_mode() const;
virtual PackedStringArray get_device_list(); virtual PackedStringArray get_output_device_list();
virtual String get_device(); virtual String get_output_device();
virtual void set_device(String device); virtual void set_output_device(String output_device);
virtual void lock(); virtual void lock();
virtual void unlock(); virtual void unlock();
virtual void finish(); virtual void finish();
virtual Error capture_start(); virtual Error input_start();
virtual Error capture_stop(); virtual Error input_stop();
virtual PackedStringArray capture_get_device_list(); virtual PackedStringArray get_input_device_list();
virtual void capture_set_device(const String &p_name); virtual void set_input_device(const String &p_name);
virtual String capture_get_device(); virtual String get_input_device();
AudioDriverWASAPI(); AudioDriverWASAPI();
}; };

14
editor/project_converter_3_to_4.cpp
View file

@ -241,6 +241,9 @@ const char *ProjectConverter3To4::gdscript_function_renames[][2] = {
{ "can_generate_small_preview", "_can_generate_small_preview" }, // EditorResourcePreviewGenerator { "can_generate_small_preview", "_can_generate_small_preview" }, // EditorResourcePreviewGenerator
{ "can_instance", "can_instantiate" }, // PackedScene, Script { "can_instance", "can_instantiate" }, // PackedScene, Script
{ "canvas_light_set_scale", "canvas_light_set_texture_scale" }, // RenderingServer { "canvas_light_set_scale", "canvas_light_set_texture_scale" }, // RenderingServer
{ "capture_get_device", "get_input_device" }, // AudioServer
{ "capture_get_device_list", "get_input_device_list" }, // AudioServer
{ "capture_set_device", "set_input_device" }, // AudioServer
{ "center_viewport_to_cursor", "center_viewport_to_caret" }, // TextEdit { "center_viewport_to_cursor", "center_viewport_to_caret" }, // TextEdit
{ "change_scene", "change_scene_to_file" }, // SceneTree { "change_scene", "change_scene_to_file" }, // SceneTree
{ "change_scene_to", "change_scene_to_packed" }, // SceneTree { "change_scene_to", "change_scene_to_packed" }, // SceneTree
@ -301,6 +304,8 @@ const char *ProjectConverter3To4::gdscript_function_renames[][2] = {
{ "get_cursor_position", "get_caret_column" }, // LineEdit { "get_cursor_position", "get_caret_column" }, // LineEdit
{ "get_d", "get_distance" }, // LineShape2D { "get_d", "get_distance" }, // LineShape2D
{ "get_depth_bias_enable", "get_depth_bias_enabled" }, // RDPipelineRasterizationState { "get_depth_bias_enable", "get_depth_bias_enabled" }, // RDPipelineRasterizationState
{ "get_device", "get_output_device" }, // AudioServer
{ "get_device_list", "get_output_device_list" }, // AudioServer
{ "get_drag_data", "_get_drag_data" }, // Control { "get_drag_data", "_get_drag_data" }, // Control
{ "get_editor_viewport", "get_editor_main_screen" }, // EditorPlugin { "get_editor_viewport", "get_editor_main_screen" }, // EditorPlugin
{ "get_enabled_focus_mode", "get_focus_mode" }, // BaseButton { "get_enabled_focus_mode", "get_focus_mode" }, // BaseButton
@ -499,6 +504,7 @@ const char *ProjectConverter3To4::gdscript_function_renames[][2] = {
{ "set_cursor_position", "set_caret_column" }, // LineEdit { "set_cursor_position", "set_caret_column" }, // LineEdit
{ "set_d", "set_distance" }, // WorldMarginShape2D { "set_d", "set_distance" }, // WorldMarginShape2D
{ "set_depth_bias_enable", "set_depth_bias_enabled" }, // RDPipelineRasterizationState { "set_depth_bias_enable", "set_depth_bias_enabled" }, // RDPipelineRasterizationState
{ "set_device", "set_output_device" }, // AudioServer
{ "set_doubleclick", "set_double_click" }, // InputEventMouseButton { "set_doubleclick", "set_double_click" }, // InputEventMouseButton
{ "set_draw_red", "set_draw_warning" }, // EditorProperty { "set_draw_red", "set_draw_warning" }, // EditorProperty
{ "set_enable_follow_smoothing", "set_position_smoothing_enabled" }, // Camera2D { "set_enable_follow_smoothing", "set_position_smoothing_enabled" }, // Camera2D
@ -697,6 +703,9 @@ const char *ProjectConverter3To4::csharp_function_renames[][2] = {
{ "CanGenerateSmallPreview", "_CanGenerateSmallPreview" }, // EditorResourcePreviewGenerator { "CanGenerateSmallPreview", "_CanGenerateSmallPreview" }, // EditorResourcePreviewGenerator
{ "CanInstance", "CanInstantiate" }, // PackedScene, Script { "CanInstance", "CanInstantiate" }, // PackedScene, Script
{ "CanvasLightSetScale", "CanvasLightSetTextureScale" }, // RenderingServer { "CanvasLightSetScale", "CanvasLightSetTextureScale" }, // RenderingServer
{ "CaptureGetDevice", "GetInputDevice" }, // AudioServer
{ "CaptureGetDeviceList", "GetInputDeviceList" }, // AudioServer
{ "CaptureSetDevice", "SetInputDevice" }, // AudioServer
{ "CenterViewportToCursor", "CenterViewportToCaret" }, // TextEdit { "CenterViewportToCursor", "CenterViewportToCaret" }, // TextEdit
{ "ChangeScene", "ChangeSceneToFile" }, // SceneTree { "ChangeScene", "ChangeSceneToFile" }, // SceneTree
{ "ChangeSceneTo", "ChangeSceneToPacked" }, // SceneTree { "ChangeSceneTo", "ChangeSceneToPacked" }, // SceneTree
@ -754,6 +763,8 @@ const char *ProjectConverter3To4::csharp_function_renames[][2] = {
{ "GetCursorPosition", "GetCaretColumn" }, // LineEdit { "GetCursorPosition", "GetCaretColumn" }, // LineEdit
{ "GetD", "GetDistance" }, // LineShape2D { "GetD", "GetDistance" }, // LineShape2D
{ "GetDepthBiasEnable", "GetDepthBiasEnabled" }, // RDPipelineRasterizationState { "GetDepthBiasEnable", "GetDepthBiasEnabled" }, // RDPipelineRasterizationState
{ "GetDevice", "GetOutputDevice" }, // AudioServer
{ "GetDeviceList", "GetOutputDeviceList" }, // AudioServer
{ "GetDragDataFw", "_GetDragDataFw" }, // ScriptEditor { "GetDragDataFw", "_GetDragDataFw" }, // ScriptEditor
{ "GetEditorViewport", "GetViewport" }, // EditorPlugin { "GetEditorViewport", "GetViewport" }, // EditorPlugin
{ "GetEnabledFocusMode", "GetFocusMode" }, // BaseButton { "GetEnabledFocusMode", "GetFocusMode" }, // BaseButton
@ -942,6 +953,7 @@ const char *ProjectConverter3To4::csharp_function_renames[][2] = {
{ "SetCursorPosition", "SetCaretColumn" }, // LineEdit { "SetCursorPosition", "SetCaretColumn" }, // LineEdit
{ "SetD", "SetDistance" }, // WorldMarginShape2D { "SetD", "SetDistance" }, // WorldMarginShape2D
{ "SetDepthBiasEnable", "SetDepthBiasEnabled" }, // RDPipelineRasterizationState { "SetDepthBiasEnable", "SetDepthBiasEnabled" }, // RDPipelineRasterizationState
{ "SetDevice", "SetOutputDevice" }, // AudioServer
{ "SetDoubleclick", "SetDoubleClick" }, // InputEventMouseButton { "SetDoubleclick", "SetDoubleClick" }, // InputEventMouseButton
{ "SetEnableFollowSmoothing", "SetFollowSmoothingEnabled" }, // Camera2D { "SetEnableFollowSmoothing", "SetFollowSmoothingEnabled" }, // Camera2D
{ "SetEnabledFocusMode", "SetFocusMode" }, // BaseButton { "SetEnabledFocusMode", "SetFocusMode" }, // BaseButton
@ -1070,6 +1082,7 @@ const char *ProjectConverter3To4::gdscript_properties_renames[][2] = {
// // {"shift","shift_pressed"},// This may broke a lot of comments and user variables // // {"shift","shift_pressed"},// This may broke a lot of comments and user variables
// { "autowrap", "autowrap_mode" }, // Label // { "autowrap", "autowrap_mode" }, // Label
// { "cast_to", "target_position" }, // RayCast2D, RayCast3D // { "cast_to", "target_position" }, // RayCast2D, RayCast3D
// { "device", "output_device"}, // AudioServer - Too vague, most likely breaks comments & variables
// { "doubleclick", "double_click" }, // InputEventMouseButton // { "doubleclick", "double_click" }, // InputEventMouseButton
// { "group", "button_group" }, // BaseButton // { "group", "button_group" }, // BaseButton
// { "process_mode", "process_callback" }, // AnimationTree, Camera2D // { "process_mode", "process_callback" }, // AnimationTree, Camera2D
@ -1085,6 +1098,7 @@ const char *ProjectConverter3To4::gdscript_properties_renames[][2] = {
{ "bbcode_text", "text" }, // RichTextLabel { "bbcode_text", "text" }, // RichTextLabel
{ "bg", "panel" }, // Theme { "bg", "panel" }, // Theme
{ "bg_focus", "focus" }, // Theme { "bg_focus", "focus" }, // Theme
{ "capture_device", "input_device" }, // AudioServer
{ "caret_blink_speed", "caret_blink_interval" }, // TextEdit, LineEdit { "caret_blink_speed", "caret_blink_interval" }, // TextEdit, LineEdit
{ "caret_moving_by_right_click", "caret_move_on_right_click" }, // TextEdit { "caret_moving_by_right_click", "caret_move_on_right_click" }, // TextEdit
{ "caret_position", "caret_column" }, // LineEdit { "caret_position", "caret_column" }, // LineEdit

50
servers/audio_server.cpp
View file

@ -144,7 +144,7 @@ int AudioDriver::get_total_channels_by_speaker_mode(AudioDriver::SpeakerMode p_m
ERR_FAIL_V(2); ERR_FAIL_V(2);
} }
PackedStringArray AudioDriver::get_device_list() { PackedStringArray AudioDriver::get_output_device_list() {
PackedStringArray list; PackedStringArray list;
list.push_back("Default"); list.push_back("Default");
@ -152,11 +152,11 @@ PackedStringArray AudioDriver::get_device_list() {
return list; return list;
} }
String AudioDriver::get_device() { String AudioDriver::get_output_device() {
return "Default"; return "Default";
} }
PackedStringArray AudioDriver::capture_get_device_list() { PackedStringArray AudioDriver::get_input_device_list() {
PackedStringArray list; PackedStringArray list;
list.push_back("Default"); list.push_back("Default");
@ -238,7 +238,7 @@ void AudioServer::_driver_process(int p_frames, int32_t *p_buffer) {
#endif #endif
if (channel_count != get_channel_count()) { if (channel_count != get_channel_count()) {
// Amount of channels changed due to a device change // Amount of channels changed due to a output_device change
// reinitialize the buses channels and buffers // reinitialize the buses channels and buffers
init_channels_and_buffers(); init_channels_and_buffers();
} }
@ -1632,28 +1632,28 @@ Ref<AudioBusLayout> AudioServer::generate_bus_layout() const {
return state; return state;
} }
PackedStringArray AudioServer::get_device_list() { PackedStringArray AudioServer::get_output_device_list() {
return AudioDriver::get_singleton()->get_device_list(); return AudioDriver::get_singleton()->get_output_device_list();
} }
String AudioServer::get_device() { String AudioServer::get_output_device() {
return AudioDriver::get_singleton()->get_device(); return AudioDriver::get_singleton()->get_output_device();
} }
void AudioServer::set_device(String device) { void AudioServer::set_output_device(String output_device) {
AudioDriver::get_singleton()->set_device(device); AudioDriver::get_singleton()->set_output_device(output_device);
} }
PackedStringArray AudioServer::capture_get_device_list() { PackedStringArray AudioServer::get_input_device_list() {
return AudioDriver::get_singleton()->capture_get_device_list(); return AudioDriver::get_singleton()->get_input_device_list();
} }
String AudioServer::capture_get_device() { String AudioServer::get_input_device() {
return AudioDriver::get_singleton()->capture_get_device(); return AudioDriver::get_singleton()->get_input_device();
} }
void AudioServer::capture_set_device(const String &p_name) { void AudioServer::set_input_device(const String &p_name) {
AudioDriver::get_singleton()->capture_set_device(p_name); AudioDriver::get_singleton()->set_input_device(p_name);
} }
void AudioServer::set_enable_tagging_used_audio_streams(bool p_enable) { void AudioServer::set_enable_tagging_used_audio_streams(bool p_enable) {
@ -1711,17 +1711,17 @@ void AudioServer::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_speaker_mode"), &AudioServer::get_speaker_mode); 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_mix_rate"), &AudioServer::get_mix_rate);
ClassDB::bind_method(D_METHOD("get_device_list"), &AudioServer::get_device_list); ClassDB::bind_method(D_METHOD("get_output_device_list"), &AudioServer::get_output_device_list);
ClassDB::bind_method(D_METHOD("get_device"), &AudioServer::get_device); ClassDB::bind_method(D_METHOD("get_output_device"), &AudioServer::get_output_device);
ClassDB::bind_method(D_METHOD("set_device", "device"), &AudioServer::set_device); ClassDB::bind_method(D_METHOD("set_output_device", "output_device"), &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_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); ClassDB::bind_method(D_METHOD("get_time_since_last_mix"), &AudioServer::get_time_since_last_mix);
ClassDB::bind_method(D_METHOD("get_output_latency"), &AudioServer::get_output_latency); ClassDB::bind_method(D_METHOD("get_output_latency"), &AudioServer::get_output_latency);
ClassDB::bind_method(D_METHOD("capture_get_device_list"), &AudioServer::capture_get_device_list); ClassDB::bind_method(D_METHOD("get_input_device_list"), &AudioServer::get_input_device_list);
ClassDB::bind_method(D_METHOD("capture_get_device"), &AudioServer::capture_get_device); ClassDB::bind_method(D_METHOD("get_input_device"), &AudioServer::get_input_device);
ClassDB::bind_method(D_METHOD("capture_set_device", "name"), &AudioServer::capture_set_device); ClassDB::bind_method(D_METHOD("set_input_device", "name"), &AudioServer::set_input_device);
ClassDB::bind_method(D_METHOD("set_bus_layout", "bus_layout"), &AudioServer::set_bus_layout); ClassDB::bind_method(D_METHOD("set_bus_layout", "bus_layout"), &AudioServer::set_bus_layout);
ClassDB::bind_method(D_METHOD("generate_bus_layout"), &AudioServer::generate_bus_layout); ClassDB::bind_method(D_METHOD("generate_bus_layout"), &AudioServer::generate_bus_layout);
@ -1729,11 +1729,11 @@ void AudioServer::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_enable_tagging_used_audio_streams", "enable"), &AudioServer::set_enable_tagging_used_audio_streams); ClassDB::bind_method(D_METHOD("set_enable_tagging_used_audio_streams", "enable"), &AudioServer::set_enable_tagging_used_audio_streams);
ADD_PROPERTY(PropertyInfo(Variant::INT, "bus_count"), "set_bus_count", "get_bus_count"); ADD_PROPERTY(PropertyInfo(Variant::INT, "bus_count"), "set_bus_count", "get_bus_count");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "device"), "set_device", "get_device"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "output_device"), "set_output_device", "get_output_device");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "capture_device"), "capture_set_device", "capture_get_device"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "input_device"), "set_input_device", "get_input_device");
// The default value may be set to an empty string by the platform-specific audio driver. // The default value may be set to an empty string by the platform-specific audio driver.
// Override for class reference generation purposes. // Override for class reference generation purposes.
ADD_PROPERTY_DEFAULT("capture_device", "Default"); ADD_PROPERTY_DEFAULT("input_device", "Default");
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "playback_speed_scale"), "set_playback_speed_scale", "get_playback_speed_scale"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "playback_speed_scale"), "set_playback_speed_scale", "get_playback_speed_scale");
ADD_SIGNAL(MethodInfo("bus_layout_changed")); ADD_SIGNAL(MethodInfo("bus_layout_changed"));

24
servers/audio_server.h
View file

@ -94,18 +94,18 @@ public:
virtual void start() = 0; virtual void start() = 0;
virtual int get_mix_rate() const = 0; virtual int get_mix_rate() const = 0;
virtual SpeakerMode get_speaker_mode() const = 0; virtual SpeakerMode get_speaker_mode() const = 0;
virtual PackedStringArray get_device_list(); virtual PackedStringArray get_output_device_list();
virtual String get_device(); virtual String get_output_device();
virtual void set_device(String device) {} virtual void set_output_device(String output_device) {}
virtual void lock() = 0; virtual void lock() = 0;
virtual void unlock() = 0; virtual void unlock() = 0;
virtual void finish() = 0; virtual void finish() = 0;
virtual Error capture_start() { return FAILED; } virtual Error capture_start() { return FAILED; }
virtual Error capture_stop() { return FAILED; } virtual Error capture_stop() { return FAILED; }
virtual void capture_set_device(const String &p_name) {} virtual void set_input_device(const String &p_name) {}
virtual String capture_get_device() { return "Default"; } virtual String get_input_device() { return "Default"; }
virtual PackedStringArray capture_get_device_list(); virtual PackedStringArray get_input_device_list();
virtual float get_latency() { return 0; } virtual float get_latency() { return 0; }
@ -419,13 +419,13 @@ public:
void set_bus_layout(const Ref<AudioBusLayout> &p_bus_layout); void set_bus_layout(const Ref<AudioBusLayout> &p_bus_layout);
Ref<AudioBusLayout> generate_bus_layout() const; Ref<AudioBusLayout> generate_bus_layout() const;
PackedStringArray get_device_list(); PackedStringArray get_output_device_list();
String get_device(); String get_output_device();
void set_device(String device); void set_output_device(String output_device);
PackedStringArray capture_get_device_list(); PackedStringArray get_input_device_list();
String capture_get_device(); String get_input_device();
void capture_set_device(const String &p_name); void set_input_device(const String &p_name);
void set_enable_tagging_used_audio_streams(bool p_enable); void set_enable_tagging_used_audio_streams(bool p_enable);