CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-04 09:27:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename 'content_directory' to 'core_assets_directory' so it's more

Browse Source 
understandable. NOTE: Nobody ever used GET_CONTENT_DIRECTORY so it's
permissible to change it since nobody will be affected by the change
to GET_CORE_ASSETS_DIRECTORY
This commit is contained in:
twinaphex 2015-03-16 02:59:30 +01:00
parent ec9758a063
commit 4f25b67baa
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dynamic.c
View File

@ -1087,14 +1087,14 @@ bool rarch_environment_cb(unsigned cmd, void *data)
break; break;
} }
case RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY: case RETRO_ENVIRONMENT_GET_CORE_ASSETS_DIRECTORY:
{ {
const char **dir = (const char**)data; const char **dir = (const char**)data;
*dir = *g_settings.content_directory ? *dir = *g_settings.core_assets_directory ?
g_settings.content_directory : NULL; g_settings.core_assets_directory : NULL;
RARCH_LOG("Environ CONTENT_DIRECTORY: \"%s\".\n", RARCH_LOG("Environ CORE_ASSETS_DIRECTORY: \"%s\".\n",
g_settings.content_directory); g_settings.core_assets_directory);
break; break;
} }

2
general.h
View File

@ -366,7 +366,7 @@ struct settings
uint16_t network_cmd_port; uint16_t network_cmd_port;
bool stdin_cmd_enable; bool stdin_cmd_enable;
char content_directory[PATH_MAX_LENGTH]; char core_assets_directory[PATH_MAX_LENGTH];
char assets_directory[PATH_MAX_LENGTH]; char assets_directory[PATH_MAX_LENGTH];
char menu_config_directory[PATH_MAX_LENGTH]; char menu_config_directory[PATH_MAX_LENGTH];
#if defined(HAVE_MENU) #if defined(HAVE_MENU)

4
libretro.h
View File

@ -695,9 +695,9 @@ enum retro_mod
* location-based information from the host device, * location-based information from the host device,
* such as current latitude / longitude. * such as current latitude / longitude.
*/ */
#define RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY 30 #define RETRO_ENVIRONMENT_GET_CORE_ASSETS_DIRECTORY 30
/* const char ** -- /* const char ** --
* Returns the "content" directory of the frontend. * Returns the "core assets" directory of the frontend.
* This directory can be used to store specific assets that the * This directory can be used to store specific assets that the
* core relies upon, such as art assets, * core relies upon, such as art assets,
* input data, etc etc. * input data, etc etc.

2
menu/menu_entries.c
View File

@ -210,7 +210,7 @@ int menu_entries_push_horizontal_menu_list(menu_handle_t *menu,
menu_list_clear(list); menu_list_clear(list);
menu_entries_push_cores_list(list, info, g_settings.content_directory, true); menu_entries_push_cores_list(list, info, g_settings.core_assets_directory, true);
menu_list_populate_generic(list, path, label, menu_type); menu_list_populate_generic(list, path, label, menu_type);

14
settings.c
View File

@ -609,7 +609,7 @@ static void config_set_defaults(void)
*g_settings.input_remapping_directory = '\0'; *g_settings.input_remapping_directory = '\0';
*g_settings.input.autoconfig_dir = '\0'; *g_settings.input.autoconfig_dir = '\0';
*g_settings.input.overlay = '\0'; *g_settings.input.overlay = '\0';
*g_settings.content_directory = '\0'; *g_settings.core_assets_directory = '\0';
*g_settings.assets_directory = '\0'; *g_settings.assets_directory = '\0';
*g_settings.playlist_directory = '\0'; *g_settings.playlist_directory = '\0';
*g_settings.video.shader_path = '\0'; *g_settings.video.shader_path = '\0';
@ -1348,11 +1348,11 @@ static bool config_load_file(const char *path, bool set_defaults)
CONFIG_GET_PATH(resampler_directory, "resampler_directory"); CONFIG_GET_PATH(resampler_directory, "resampler_directory");
CONFIG_GET_PATH(extraction_directory, "extraction_directory"); CONFIG_GET_PATH(extraction_directory, "extraction_directory");
CONFIG_GET_PATH(input_remapping_directory, "input_remapping_directory"); CONFIG_GET_PATH(input_remapping_directory, "input_remapping_directory");
CONFIG_GET_PATH(content_directory, "content_directory"); CONFIG_GET_PATH(core_assets_directory, "core_assets_directory");
CONFIG_GET_PATH(assets_directory, "assets_directory"); CONFIG_GET_PATH(assets_directory, "assets_directory");
CONFIG_GET_PATH(playlist_directory, "playlist_directory"); CONFIG_GET_PATH(playlist_directory, "playlist_directory");
if (!strcmp(g_settings.content_directory, "default")) if (!strcmp(g_settings.core_assets_directory, "default"))
*g_settings.content_directory = '\0'; *g_settings.core_assets_directory = '\0';
if (!strcmp(g_settings.assets_directory, "default")) if (!strcmp(g_settings.assets_directory, "default"))
*g_settings.assets_directory = '\0'; *g_settings.assets_directory = '\0';
if (!strcmp(g_settings.playlist_directory, "default")) if (!strcmp(g_settings.playlist_directory, "default"))
@ -1975,9 +1975,9 @@ bool config_save_file(const char *path)
*g_settings.audio.filter_dir ? *g_settings.audio.filter_dir ?
g_settings.audio.filter_dir : "default"); g_settings.audio.filter_dir : "default");
config_set_path(conf, "content_directory", config_set_path(conf, "core_assets_directory",
*g_settings.content_directory ? *g_settings.core_assets_directory ?
g_settings.content_directory : "default"); g_settings.core_assets_directory : "default");
config_set_path(conf, "assets_directory", config_set_path(conf, "assets_directory",
*g_settings.assets_directory ? *g_settings.assets_directory ?
g_settings.assets_directory : "default"); g_settings.assets_directory : "default");

6
settings_data.c
View File

@ -5812,9 +5812,9 @@ static bool setting_data_append_list_path_options(
SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION); SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION);
CONFIG_DIR( CONFIG_DIR(
g_settings.content_directory, g_settings.core_assets_directory,
"content_directory", "core_assets_directory",
"Content Directory", "Core Assets Directory",
"", "",
"<default>", "<default>",
group_info.name, group_info.name,