From 78136e019160f31ad3b3dde2a3010a885d313817 Mon Sep 17 00:00:00 2001 From: Themaister Date: Mon, 13 Feb 2012 19:20:24 +0100 Subject: [PATCH] Make keybind loader public. --- general.h | 2 ++ settings.c | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/general.h b/general.h index a9c08370e1..7f2449399a 100644 --- a/general.h +++ b/general.h @@ -400,7 +400,9 @@ void config_load(void); void config_set_defaults(void); #ifdef HAVE_CONFIGFILE +#include "conf/config_file.h" bool config_load_file(const char *path); +void config_read_keybinds(config_file_t *conf); #endif void ssnes_game_reset(void); diff --git a/settings.c b/settings.c index fc6e095903..5980071922 100644 --- a/settings.c +++ b/settings.c @@ -36,10 +36,6 @@ struct global g_extern; struct console_settings g_console; #endif -#ifdef HAVE_CONFIGFILE -static void read_keybinds(config_file_t *conf); -#endif - void config_set_defaults(void) { const char *def_video = NULL; @@ -499,7 +495,7 @@ bool config_load_file(const char *path) SSNES_WARN("savestate_directory is not a directory, ignoring ...\n"); } - read_keybinds(conf); + config_read_keybinds(conf); config_file_free(conf); return true; @@ -776,7 +772,7 @@ static void read_keybinds_player(config_file_t *conf, unsigned player) } } -static void read_keybinds(config_file_t *conf) +void config_read_keybinds(config_file_t *conf) { for (unsigned i = 0; i < MAX_PLAYERS; i++) read_keybinds_player(conf, i);