ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(RARCH_CONSOLE) Some cleanups

This commit is contained in:
twinaphex 2013-10-06 23:14:41 +02:00
parent b58ccb6e59
commit c052b2fb9c
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
driver.c
View File

@ -353,6 +353,11 @@ void global_init_drivers(void)
#endif #endif
driver.input_data = driver.input->init(); driver.input_data = driver.input->init();
for(unsigned i = 0; i < MAX_PLAYERS; i++)
if (driver.input->set_keybinds)
driver.input->set_keybinds(driver.input_data, g_settings.input.device[i], i, 0,
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (*g_settings.input.overlay) if (*g_settings.input.overlay)
{ {

12
frontend/frontend.c
View File

@ -65,22 +65,11 @@ static bool libretro_install_core(const char *path_prefix,
return true; return true;
} }
static void input_default_binds_console(void)
{
for(unsigned i = 0; i < MAX_PLAYERS; i++)
if (driver.input->set_keybinds)
driver.input->set_keybinds(driver.input_data, g_settings.input.device[i], i, 0,
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
}
static void rarch_get_environment_console(void) static void rarch_get_environment_console(void)
{ {
init_libretro_sym(false); init_libretro_sym(false);
rarch_init_system_info(); rarch_init_system_info();
global_init_drivers();
input_default_binds_console();
#ifdef HAVE_LIBRETRO_MANAGEMENT #ifdef HAVE_LIBRETRO_MANAGEMENT
char path_prefix[PATH_MAX]; char path_prefix[PATH_MAX];
#if defined(_WIN32) #if defined(_WIN32)
@ -139,6 +128,7 @@ int main_entry(int argc, char *argv[])
config_load(); config_load();
rarch_get_environment_console(); rarch_get_environment_console();
global_init_drivers();
#elif !defined(HAVE_BB10) #elif !defined(HAVE_BB10)
rarch_init_msg_queue(); rarch_init_msg_queue();
int init_ret; int init_ret;