diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-06 13:01:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-06 13:01:27 +0200 |
| commit | bdea6702d4a625080154eaec9d7b4c8f889b7182 (patch) | |
| tree | 55cf87332c521a3bdc1fe6d0e9424fd76e72a52f /platform | |
| parent | 34ea708596031afb0bdd522ba0b6196078bbadde (diff) | |
| parent | d450220baec506a627b7c9dc33a0d3afcb732046 (diff) | |
Merge pull request #26743 from akien-mga/audio-defaults
Use mix rate and output latency constants in audio drivers
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/audio_driver_opensl.cpp | 2 | ||||
| -rw-r--r-- | platform/haiku/audio_driver_media_kit.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/audio_driver_opensl.cpp b/platform/android/audio_driver_opensl.cpp index cb25575b74..1232fc7453 100644 --- a/platform/android/audio_driver_opensl.cpp +++ b/platform/android/audio_driver_opensl.cpp @@ -326,7 +326,7 @@ Error AudioDriverOpenSL::capture_stop() { int AudioDriverOpenSL::get_mix_rate() const { - return 44100; + return 44100; // hardcoded for Android, as selected by SL_SAMPLINGRATE_44_1 } AudioDriver::SpeakerMode AudioDriverOpenSL::get_speaker_mode() const { diff --git a/platform/haiku/audio_driver_media_kit.cpp b/platform/haiku/audio_driver_media_kit.cpp index 8b7dd08bb7..3c4e31da36 100644 --- a/platform/haiku/audio_driver_media_kit.cpp +++ b/platform/haiku/audio_driver_media_kit.cpp @@ -39,11 +39,11 @@ int32_t *AudioDriverMediaKit::samples_in = NULL; Error AudioDriverMediaKit::init() { active = false; - mix_rate = 44100; + mix_rate = GLOBAL_DEF_RST("audio/mix_rate", DEFAULT_MIX_RATE); speaker_mode = SPEAKER_MODE_STEREO; channels = 2; - int latency = GLOBAL_DEF_RST("audio/output_latency", 25); + int latency = GLOBAL_DEF_RST("audio/output_latency", DEFAULT_OUTPUT_LATENCY); buffer_size = next_power_of_2(latency * mix_rate / 1000); samples_in = memnew_arr(int32_t, buffer_size * channels); |