libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

Merge pull request #1587 from fr500/master

Browse Source 
Override cleanups
This commit is contained in:
Twinaphex 2015-04-05 21:01:44 +02:00
commit ce091a68cb
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configuration.c
View File

@ -1630,27 +1630,22 @@ static void config_load_core_specific(void)
}
/**
* config_append_specific:
* config_load_override:
*
* Tries to append game-specific and core-specific configuration.
* These settings will always have precedence, thus this feature
* can be used to enforce overrides.
*
* Let $RETROARCH_CFG be the directory that contains retroarch.cfg,
* $CORE_NAME be the name of the libretro core library in use and
* $ROM_NAME the basename of the ROM (without the extension and
* directory).
*
* This function only has an effect if a game-specific or core-specific
* configuration file exists at respective locations.
*
* core-specific: $RETROARCH_CFG/$CORE_NAME/$CORE_NAME.cfg
* game-specific: $RETROARCH_CFG/$CORE_NAME/$ROM_NAME.cfg
* core-specific: $CONFIG_DIR/$CORE_NAME/$CORE_NAME.cfg fallback: $CURRENT_CFG_LOCATION/$CORE_NAME/$CORE_NAME.cfg
* game-specific: $CONFIG_DIR/$CORE_NAME/$ROM_NAME.cfg fallback: $CURRENT_CFG_LOCATION/$CORE_NAME/$GAME_NAME.cfg
*
* Returns: False if there was an error.
* Returns: false if there was an error.
*
*/
bool config_append_specific(void)
bool config_load_override(void)
{
char config_directory[PATH_MAX_LENGTH], /* path to the directory containing retroarch.cfg (prefix) */
core_path[PATH_MAX_LENGTH], /* final path for core-specific configuration (prefix+suffix) */
@ -1662,7 +1657,11 @@ bool config_append_specific(void)
RARCH_LOG("Game name: %s\n",global->basename);
RARCH_LOG("Core name: %s\n",global->system.info.library_name);
if (!global || !settings || !global->system.info.library_name)
//early return in case a library isn't loaded
if(!global->system.info.library_name)
return true;
if (!global || !settings )
{
RARCH_ERR("Could not obtain global pointer or configuration file pointer to retrieve path of retroarch.cfg.\n");
return false;
@ -1715,7 +1714,7 @@ bool config_append_specific(void)
new_conf = NULL;
/* Create a new config file from core_path */
/* Create a new config file from game_path */
new_conf = config_file_new(game_path);
/* Append game-specific */
@ -1737,6 +1736,8 @@ bool config_append_specific(void)
if(should_append)
config_load_file(global->config_path, false);
else
return false;
return true; /* only means no errors were caught */
}

12
configuration.h
View File

@ -400,7 +400,17 @@ const char *config_get_default_menu(void);
*/
void config_load(void);
bool config_append_specific(void);
/**
* config_load_override:
*
* Tries to append game-specific and core-specific configuration.
* These settings will always have precedence, thus this feature
* can be used to enforce overrides.
*
* Returns: false if there was an error.
*
*/
bool config_load_override(void);
/**
* config_save_keybinds_file:

3
retroarch.c
View File

@ -1886,7 +1886,8 @@ static bool init_core(void)
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
config_append_specific();
if(!config_load_override());
RARCH_ERR("Error loading override files");
verify_api_version();
pretro_init();