hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorganize Project Settings

Browse source 
-Advanced Settings toggle also hides advanced properties when disabled
-Simplified Advanced Bar (errors were just plain redundant)
-Reorganized rendering quality settings.
-Reorganized miscelaneous settings for clean up.
This commit is contained in:
reduz 2021-02-17 13:44:49 -03:00
parent 8eaea1db53
commit 64140eaf42
64 changed files with 523 additions and 476 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/alsa/audio_driver_alsa.cpp
View file

@ -44,7 +44,7 @@ extern int initialize_pulse();
#endif
Error AudioDriverALSA::init_device() {
mix_rate = GLOBAL_GET("audio/mix_rate");
mix_rate = GLOBAL_GET("audio/driver/mix_rate");
speaker_mode = SPEAKER_MODE_STEREO;
channels = 2;
@ -110,7 +110,7 @@ Error AudioDriverALSA::init_device() {
// In ALSA the period size seems to be the one that will determine the actual latency
// Ref: https://www.alsa-project.org/main/index.php/FramesPeriods
unsigned int periods = 2;
int latency = GLOBAL_GET("audio/output_latency");
int latency = GLOBAL_GET("audio/driver/output_latency");
buffer_frames = closest_power_of_2(latency * mix_rate / 1000);
buffer_size = buffer_frames * periods;
period_size = buffer_frames;

8
drivers/coreaudio/audio_driver_coreaudio.cpp
View file

@ -116,7 +116,7 @@ Error AudioDriverCoreAudio::init() {
break;
}
mix_rate = GLOBAL_GET("audio/mix_rate");
mix_rate = GLOBAL_GET("audio/driver/mix_rate");
zeromem(&strdesc, sizeof(strdesc));
strdesc.mFormatID = kAudioFormatLinearPCM;
@ -131,7 +131,7 @@ Error AudioDriverCoreAudio::init() {
result = AudioUnitSetProperty(audio_unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, kOutputBus, &strdesc, sizeof(strdesc));
ERR_FAIL_COND_V(result != noErr, FAILED);
int latency = GLOBAL_GET("audio/output_latency");
int latency = GLOBAL_GET("audio/driver/output_latency");
// Sample rate is independent of channels (ref: https://stackoverflow.com/questions/11048825/audio-sample-frequency-rely-on-channels)
buffer_frames = closest_power_of_2(latency * mix_rate / 1000);
@ -157,7 +157,7 @@ Error AudioDriverCoreAudio::init() {
result = AudioUnitInitialize(audio_unit);
ERR_FAIL_COND_V(result != noErr, FAILED);
if (GLOBAL_GET("audio/enable_audio_input")) {
if (GLOBAL_GET("audio/driver/enable_input")) {
return capture_init();
}
return OK;
@ -403,7 +403,7 @@ Error AudioDriverCoreAudio::capture_init() {
break;
}
mix_rate = GLOBAL_GET("audio/mix_rate");
mix_rate = GLOBAL_GET("audio/driver/mix_rate");
zeromem(&strdesc, sizeof(strdesc));
strdesc.mFormatID = kAudioFormatLinearPCM;

4
drivers/pulseaudio/audio_driver_pulseaudio.cpp
View file

@ -179,7 +179,7 @@ Error AudioDriverPulseAudio::init_device() {
break;
}
int latency = GLOBAL_GET("audio/output_latency");
int latency = GLOBAL_GET("audio/driver/output_latency");
buffer_frames = closest_power_of_2(latency * mix_rate / 1000);
pa_buffer_size = buffer_frames * pa_map.channels;
@ -241,7 +241,7 @@ Error AudioDriverPulseAudio::init() {
thread_exited = false;
exit_thread = false;
mix_rate = GLOBAL_GET("audio/mix_rate");
mix_rate = GLOBAL_GET("audio/driver/mix_rate");
pa_ml = pa_mainloop_new();
ERR_FAIL_COND_V(pa_ml == nullptr, ERR_CANT_OPEN);

2
drivers/wasapi/audio_driver_wasapi.cpp
View file

@ -387,7 +387,7 @@ Error AudioDriverWASAPI::finish_capture_device() {
}
Error AudioDriverWASAPI::init() {
mix_rate = GLOBAL_GET("audio/mix_rate");
mix_rate = GLOBAL_GET("audio/driver/mix_rate");
Error err = init_render_device();
if (err != OK) {

4
drivers/xaudio2/audio_driver_xaudio2.cpp
View file

@ -44,12 +44,12 @@ Error AudioDriverXAudio2::init() {
pcm_open = false;
samples_in = nullptr;
mix_rate = GLOBAL_GET("audio/mix_rate");
mix_rate = GLOBAL_GET("audio/driver/mix_rate");
// FIXME: speaker_mode seems unused in the Xaudio2 driver so far
speaker_mode = SPEAKER_MODE_STEREO;
channels = 2;
int latency = GLOBAL_GET("audio/output_latency");
int latency = GLOBAL_GET("audio/driver/output_latency");
buffer_size = closest_power_of_2(latency * mix_rate / 1000);
samples_in = memnew_arr(int32_t, buffer_size * channels);