Set some android options default explicitly.

This commit is contained in:
Themaister 2013-01-05 20:06:59 +01:00
parent dd74683f26
commit 8d0fbe53ab
2 changed files with 15 additions and 1 deletions

View File

@ -343,6 +343,15 @@ static const float axis_threshold = 0.5;
static const unsigned turbo_period = 6;
static const unsigned turbo_duty_cycle = 3;
// Enable input debugging output.
static const bool input_debug_enable = false;
#ifdef ANDROID
// Enable input auto-detection. Will attempt to autoconfigure
// gamepads, plug-and-play style.
static const bool input_autodetect_enable = true;
#endif
// Player 1
static const struct retro_keybind retro_keybinds_1[] = {
// SNES button | keyboard key | js btn | js axis |

View File

@ -232,6 +232,11 @@ void config_set_defaults(void)
g_settings.input.netplay_client_swap_input = netplay_client_swap_input;
g_settings.input.turbo_period = turbo_period;
g_settings.input.turbo_duty_cycle = turbo_duty_cycle;
g_settings.input.debug_enable = input_debug_enable;
#ifdef ANDROID
g_settings.input.autodetect_enable = input_autodetect_enable;
#endif
for (int i = 0; i < MAX_PLAYERS; i++)
g_settings.input.joypad_map[i] = i;
@ -490,10 +495,10 @@ bool config_load_file(const char *path)
CONFIG_GET_INT(input.turbo_duty_cycle, "input_duty_cycle");
CONFIG_GET_PATH(input.overlay, "input_overlay");
CONFIG_GET_BOOL(input.debug_enable, "input_debug_enable");
#ifdef ANDROID
CONFIG_GET_BOOL(input.autodetect_enable, "input_autodetect_enable");
#endif
CONFIG_GET_BOOL(input.debug_enable, "input_debug_enable");
if (config_get_string(conf, "environment_variables",
&g_extern.system.environment))