From 4f25b67baa22e93ffb97685266f27e08f13fcdc6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 16 Mar 2015 02:59:30 +0100 Subject: [PATCH] Rename 'content_directory' to 'core_assets_directory' so it's more 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 --- dynamic.c | 10 +++++----- general.h | 2 +- libretro.h | 4 ++-- menu/menu_entries.c | 2 +- settings.c | 14 +++++++------- settings_data.c | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dynamic.c b/dynamic.c index 5fb88b17ac..ca6d83df62 100644 --- a/dynamic.c +++ b/dynamic.c @@ -1087,14 +1087,14 @@ bool rarch_environment_cb(unsigned cmd, void *data) break; } - case RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY: + case RETRO_ENVIRONMENT_GET_CORE_ASSETS_DIRECTORY: { const char **dir = (const char**)data; - *dir = *g_settings.content_directory ? - g_settings.content_directory : NULL; - RARCH_LOG("Environ CONTENT_DIRECTORY: \"%s\".\n", - g_settings.content_directory); + *dir = *g_settings.core_assets_directory ? + g_settings.core_assets_directory : NULL; + RARCH_LOG("Environ CORE_ASSETS_DIRECTORY: \"%s\".\n", + g_settings.core_assets_directory); break; } diff --git a/general.h b/general.h index fb423a3a57..cdcf9d574c 100644 --- a/general.h +++ b/general.h @@ -366,7 +366,7 @@ struct settings uint16_t network_cmd_port; bool stdin_cmd_enable; - char content_directory[PATH_MAX_LENGTH]; + char core_assets_directory[PATH_MAX_LENGTH]; char assets_directory[PATH_MAX_LENGTH]; char menu_config_directory[PATH_MAX_LENGTH]; #if defined(HAVE_MENU) diff --git a/libretro.h b/libretro.h index f16bed4767..766eeb1557 100755 --- a/libretro.h +++ b/libretro.h @@ -695,9 +695,9 @@ enum retro_mod * location-based information from the host device, * such as current latitude / longitude. */ -#define RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY 30 +#define RETRO_ENVIRONMENT_GET_CORE_ASSETS_DIRECTORY 30 /* 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 * core relies upon, such as art assets, * input data, etc etc. diff --git a/menu/menu_entries.c b/menu/menu_entries.c index c11bdb6db2..0d9214392b 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -210,7 +210,7 @@ int menu_entries_push_horizontal_menu_list(menu_handle_t *menu, 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); diff --git a/settings.c b/settings.c index cadec16549..bda03389bc 100644 --- a/settings.c +++ b/settings.c @@ -609,7 +609,7 @@ static void config_set_defaults(void) *g_settings.input_remapping_directory = '\0'; *g_settings.input.autoconfig_dir = '\0'; *g_settings.input.overlay = '\0'; - *g_settings.content_directory = '\0'; + *g_settings.core_assets_directory = '\0'; *g_settings.assets_directory = '\0'; *g_settings.playlist_directory = '\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(extraction_directory, "extraction_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(playlist_directory, "playlist_directory"); - if (!strcmp(g_settings.content_directory, "default")) - *g_settings.content_directory = '\0'; + if (!strcmp(g_settings.core_assets_directory, "default")) + *g_settings.core_assets_directory = '\0'; if (!strcmp(g_settings.assets_directory, "default")) *g_settings.assets_directory = '\0'; 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 : "default"); - config_set_path(conf, "content_directory", - *g_settings.content_directory ? - g_settings.content_directory : "default"); + config_set_path(conf, "core_assets_directory", + *g_settings.core_assets_directory ? + g_settings.core_assets_directory : "default"); config_set_path(conf, "assets_directory", *g_settings.assets_directory ? g_settings.assets_directory : "default"); diff --git a/settings_data.c b/settings_data.c index 30b82fb305..2a643fe04c 100644 --- a/settings_data.c +++ b/settings_data.c @@ -5812,9 +5812,9 @@ static bool setting_data_append_list_path_options( SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR | SD_FLAG_BROWSER_ACTION); CONFIG_DIR( - g_settings.content_directory, - "content_directory", - "Content Directory", + g_settings.core_assets_directory, + "core_assets_directory", + "Core Assets Directory", "", "", group_info.name,