From ada900e1e1cc63a76b9a6963fa71e0f2426c971b Mon Sep 17 00:00:00 2001 From: Monroe88 Date: Fri, 28 Apr 2017 21:40:24 -0500 Subject: [PATCH] Unhardcode WASAPI default settings --- config.def.h | 7 +++++++ configuration.c | 6 +++--- menu/menu_setting.c | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/config.def.h b/config.def.h index 1dbb541ca9..afdb4150a5 100644 --- a/config.def.h +++ b/config.def.h @@ -792,6 +792,13 @@ static const float max_timing_skew = 0.05; /* Default audio volume in dB. (0.0 dB == unity gain). */ static const float audio_volume = 0.0; +#ifdef HAVE_WASAPI +/* WASAPI defaults */ +static const bool wasapi_exclusive_mode = true; +static const bool wasapi_float_format = false; +static const unsigned wasapi_sh_buffer_length = 0; +#endif + /* MISC */ /* Enables displaying the current frames per second. */ diff --git a/configuration.c b/configuration.c index e3486ce5d3..a5f9ac975a 100644 --- a/configuration.c +++ b/configuration.c @@ -876,8 +876,8 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("input_autodetect_enable", &settings->bools.input_autodetect_enable, true, input_autodetect_enable, false); SETTING_BOOL("audio_rate_control", &settings->bools.audio_rate_control, true, rate_control, false); #ifdef HAVE_WASAPI - SETTING_BOOL("audio_wasapi_exclusive_mode", &settings->bools.audio_wasapi_exclusive_mode, true, true, false); - SETTING_BOOL("audio_wasapi_float_format", &settings->bools.audio_wasapi_float_format, true, false, false); + SETTING_BOOL("audio_wasapi_exclusive_mode", &settings->bools.audio_wasapi_exclusive_mode, true, wasapi_exclusive_mode, false); + SETTING_BOOL("audio_wasapi_float_format", &settings->bools.audio_wasapi_float_format, true, wasapi_float_format, false); #endif if (global) @@ -990,7 +990,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings, SETTING_UINT("bundle_assets_extract_version_current", &settings->uints.bundle_assets_extract_version_current, true, 0, false); SETTING_UINT("bundle_assets_extract_last_version", &settings->uints.bundle_assets_extract_last_version, true, 0, false); #ifdef HAVE_WASAPI - SETTING_UINT("audio_wasapi_sh_buffer_length", &settings->uints.audio_wasapi_sh_buffer_length, true, 0, false); + SETTING_UINT("audio_wasapi_sh_buffer_length", &settings->uints.audio_wasapi_sh_buffer_length, true, wasapi_sh_buffer_length, false); #endif *size = count; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 0697137e3c..57b249cf9a 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3931,7 +3931,7 @@ static bool setting_append_list( &settings->bools.audio_wasapi_exclusive_mode, MENU_ENUM_LABEL_AUDIO_WASAPI_EXCLUSIVE_MODE, MENU_ENUM_LABEL_VALUE_AUDIO_WASAPI_EXCLUSIVE_MODE, - true, + wasapi_exclusive_mode, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -3947,7 +3947,7 @@ static bool setting_append_list( &settings->bools.audio_wasapi_float_format, MENU_ENUM_LABEL_AUDIO_WASAPI_FLOAT_FORMAT, MENU_ENUM_LABEL_VALUE_AUDIO_WASAPI_FLOAT_FORMAT, - true, + wasapi_float_format, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -3963,7 +3963,7 @@ static bool setting_append_list( &settings->uints.audio_wasapi_sh_buffer_length, MENU_ENUM_LABEL_AUDIO_WASAPI_SH_BUFFER_LENGTH, MENU_ENUM_LABEL_VALUE_AUDIO_WASAPI_SH_BUFFER_LENGTH, - 0, + wasapi_sh_buffer_length, &group_info, &subgroup_info, parent_group,