mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move code to input_config_reset

Browse Source
This commit is contained in:
twinaphex 2017-04-25 18:18:37 +02:00
parent d66aff8fbd
commit 3b3b008614
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -27,8 +27,6 @@
#include "input/input_driver.h" #include "input/input_driver.h"
#include "config.def.keybinds.h"
enum video_driver_enum enum video_driver_enum
{ {
VIDEO_GL = 0, VIDEO_GL = 0,

9
configuration.c
View File

@ -1156,15 +1156,6 @@ static void config_set_defaults(void)
*settings->cheevos.password = '\0'; *settings->cheevos.password = '\0';
#endif #endif
retro_assert(sizeof(settings->input.binds[0]) >= sizeof(retro_keybinds_1));
retro_assert(sizeof(settings->input.binds[1]) >= sizeof(retro_keybinds_rest));
memcpy(input_config_get_binds(0), retro_keybinds_1, sizeof(retro_keybinds_1));
for (i = 1; i < MAX_USERS; i++)
memcpy(input_config_get_binds(i), retro_keybinds_rest,
sizeof(retro_keybinds_rest));
input_config_reset(); input_config_reset();
input_remapping_set_defaults(); input_remapping_set_defaults();
input_autoconfigure_reset(); input_autoconfigure_reset();

14
input/input_config.c
View File

@ -23,11 +23,15 @@
#include <file/file_path.h> #include <file/file_path.h>
#include <file/config_file.h> #include <file/config_file.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include <retro_assert.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../config.h"
#endif #endif
#include "../config.def.h"
#include "../config.def.keybinds.h"
#include "input_config.h" #include "input_config.h"
#include "input_keymaps.h" #include "input_keymaps.h"
#include "input_remapping.h" #include "input_remapping.h"
@ -582,6 +586,16 @@ int32_t input_config_get_vid(unsigned port)
void input_config_reset(void) void input_config_reset(void)
{ {
unsigned i; unsigned i;
settings_t *settings = config_get_ptr();
retro_assert(sizeof(settings->input.binds[0]) >= sizeof(retro_keybinds_1));
retro_assert(sizeof(settings->input.binds[1]) >= sizeof(retro_keybinds_rest));
memcpy(input_config_get_binds(0), retro_keybinds_1, sizeof(retro_keybinds_1));
for (i = 1; i < MAX_USERS; i++)
memcpy(input_config_get_binds(i), retro_keybinds_rest,
sizeof(retro_keybinds_rest));
for (i = 0; i < MAX_USERS; i++) for (i = 0; i < MAX_USERS; i++)
{ {

3
menu/menu_setting.c
View File

@ -35,6 +35,9 @@
#include "../config.h" #include "../config.h"
#endif #endif
#include "config.def.h"
#include "config.def.keybinds.h"
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include <sdk_version.h> #include <sdk_version.h>

3
setting_list.c
View File

@ -23,6 +23,9 @@
#include "config.h" #include "config.h"
#endif #endif
#include "config.def.h"
#include "config.def.keybinds.h"
#ifdef HAVE_MENU #ifdef HAVE_MENU
#include "menu/menu_driver.h" #include "menu/menu_driver.h"
#include "menu/widgets/menu_input_dialog.h" #include "menu/widgets/menu_input_dialog.h"