mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-10 12:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move console 'set default binds' and 'set analog stick' default

Browse Source 
set_keybindings to global_init_drivers
This commit is contained in:
twinaphex 2013-03-16 17:44:24 +01:00
parent 2579af2764
commit 5f2a808042
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
driver.c
View File

@ -281,7 +281,39 @@ void global_init_drivers(void)
#ifdef RARCH_CONSOLE
driver.video->start(); // Statically starts video driver. Sets driver.video_data.
#endif
driver.input_data = driver.input->init();
if (driver.input && driver.input->init)
driver.input_data = driver.input->init();
if (driver.input)
{
for(unsigned i = 0; i < MAX_PLAYERS; i++)
{
unsigned action = 0;
if (driver.input->set_keybinds)
action |= (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS);
switch (g_settings.input.dpad_emulation[i])
{
case ANALOG_DPAD_LSTICK:
action |= (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_LSTICK);
break;
case ANALOG_DPAD_RSTICK:
action |= (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_RSTICK);
break;
case ANALOG_DPAD_NONE:
action |= (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_NONE);
break;
default:
break;
}
if (action)
if (driver.input->set_keybinds)
driver.input->set_keybinds(driver.input_data, 0, i, 0,
action);
}
}
}
void global_uninit_drivers(void)
@ -903,36 +935,6 @@ void init_video_input(void)
rarch_fail(1, "init_video_input()");
}
if (driver.input != NULL)
{
for(unsigned i = 0; i < MAX_PLAYERS; i++)
{
unsigned action = 0;
if (driver.input->set_keybinds)
action |= (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS);
switch (g_settings.input.dpad_emulation[i])
{
case ANALOG_DPAD_LSTICK:
action |= (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_LSTICK);
break;
case ANALOG_DPAD_RSTICK:
action |= (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_RSTICK);
break;
case ANALOG_DPAD_NONE:
action |= (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_NONE);
break;
default:
break;
}
if (action)
if (driver.input->set_keybinds)
driver.input->set_keybinds(driver.input_data, 0, i, 0,
action);
}
}
}
#ifdef HAVE_OVERLAY