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

Remove cursor_directory and resampler_directory (#16346)

Browse Source
This commit is contained in:
Rob Loach 2024-03-12 07:10:42 -04:00 committed by GitHub
parent fc67ac0808
commit 936328e637
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configuration.c
View File

@ -1579,7 +1579,6 @@ static struct config_path_setting *populate_settings_path(
SETTING_PATH("cache_directory", settings->paths.directory_cache, false, NULL, true); SETTING_PATH("cache_directory", settings->paths.directory_cache, false, NULL, true);
SETTING_PATH("audio_dsp_plugin", settings->paths.path_audio_dsp_plugin, false, NULL, true); SETTING_PATH("audio_dsp_plugin", settings->paths.path_audio_dsp_plugin, false, NULL, true);
SETTING_PATH("audio_filter_dir", settings->paths.directory_audio_filter, true, NULL, true); SETTING_PATH("audio_filter_dir", settings->paths.directory_audio_filter, true, NULL, true);
SETTING_PATH("resampler_directory", settings->paths.directory_resampler, false, NULL, true);
SETTING_PATH("video_shader_dir", settings->paths.directory_video_shader, true, NULL, true); SETTING_PATH("video_shader_dir", settings->paths.directory_video_shader, true, NULL, true);
SETTING_PATH("video_filter_dir", settings->paths.directory_video_filter, true, NULL, true); SETTING_PATH("video_filter_dir", settings->paths.directory_video_filter, true, NULL, true);
SETTING_PATH("video_filter", settings->paths.path_softfilter_plugin, false, NULL, true); SETTING_PATH("video_filter", settings->paths.path_softfilter_plugin, false, NULL, true);
@ -2904,7 +2903,6 @@ void config_set_defaults(void *data)
*settings->paths.path_libretro_info = '\0'; *settings->paths.path_libretro_info = '\0';
*settings->paths.directory_libretro = '\0'; *settings->paths.directory_libretro = '\0';
*settings->paths.directory_resampler = '\0';
*settings->paths.directory_screenshot = '\0'; *settings->paths.directory_screenshot = '\0';
*settings->paths.directory_system = '\0'; *settings->paths.directory_system = '\0';
*settings->paths.directory_cache = '\0'; *settings->paths.directory_cache = '\0';
@ -3110,10 +3108,6 @@ void config_set_defaults(void *data)
configuration_set_string(settings, configuration_set_string(settings,
settings->paths.directory_screenshot, settings->paths.directory_screenshot,
g_defaults.dirs[DEFAULT_DIR_SCREENSHOT]); g_defaults.dirs[DEFAULT_DIR_SCREENSHOT]);
if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_RESAMPLER]))
configuration_set_string(settings,
settings->paths.directory_resampler,
g_defaults.dirs[DEFAULT_DIR_RESAMPLER]);
if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_LOGS])) if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_LOGS]))
configuration_set_string(settings, configuration_set_string(settings,
settings->paths.log_dir, settings->paths.log_dir,

1
configuration.h
View File

@ -543,7 +543,6 @@ typedef struct settings
char directory_input_remapping[PATH_MAX_LENGTH]; char directory_input_remapping[PATH_MAX_LENGTH];
char directory_overlay[PATH_MAX_LENGTH]; char directory_overlay[PATH_MAX_LENGTH];
char directory_osk_overlay[PATH_MAX_LENGTH]; char directory_osk_overlay[PATH_MAX_LENGTH];
char directory_resampler[PATH_MAX_LENGTH];
char directory_screenshot[PATH_MAX_LENGTH]; char directory_screenshot[PATH_MAX_LENGTH];
char directory_system[PATH_MAX_LENGTH]; char directory_system[PATH_MAX_LENGTH];
char directory_cache[PATH_MAX_LENGTH]; char directory_cache[PATH_MAX_LENGTH];

1
defaults.h
View File

@ -45,7 +45,6 @@ enum default_dirs
DEFAULT_DIR_PORT, DEFAULT_DIR_PORT,
DEFAULT_DIR_SHADER, DEFAULT_DIR_SHADER,
DEFAULT_DIR_SAVESTATE, DEFAULT_DIR_SAVESTATE,
DEFAULT_DIR_RESAMPLER,
DEFAULT_DIR_SRAM, DEFAULT_DIR_SRAM,
DEFAULT_DIR_SCREENSHOT, DEFAULT_DIR_SCREENSHOT,
DEFAULT_DIR_SYSTEM, DEFAULT_DIR_SYSTEM,

4
intl/msg_hash_lbl.h
View File

@ -904,10 +904,6 @@ MSG_HASH(
MENU_ENUM_LABEL_CPU_CORES, MENU_ENUM_LABEL_CPU_CORES,
"system_information_cpu_cores" "system_information_cpu_cores"
) )
MSG_HASH(
MENU_ENUM_LABEL_CURSOR_DIRECTORY,
"cursor_directory"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_CURSOR_MANAGER, MENU_ENUM_LABEL_CURSOR_MANAGER,
"cursor_manager" "cursor_manager"

6
menu/cbs/menu_cbs_title.c
View File

@ -747,7 +747,6 @@ DEFAULT_FILL_TITLE_MACRO(action_get_title_browser_directory, MENU_ENUM_LABEL
DEFAULT_FILL_TITLE_MACRO(action_get_title_use_last_start_directory, MENU_ENUM_LABEL_VALUE_USE_LAST_START_DIRECTORY) DEFAULT_FILL_TITLE_MACRO(action_get_title_use_last_start_directory, MENU_ENUM_LABEL_VALUE_USE_LAST_START_DIRECTORY)
DEFAULT_FILL_TITLE_MACRO(action_get_title_content_directory, MENU_ENUM_LABEL_VALUE_CONTENT_DIR) DEFAULT_FILL_TITLE_MACRO(action_get_title_content_directory, MENU_ENUM_LABEL_VALUE_CONTENT_DIR)
DEFAULT_FILL_TITLE_MACRO(action_get_title_screenshot_directory, MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY) DEFAULT_FILL_TITLE_MACRO(action_get_title_screenshot_directory, MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY)
DEFAULT_FILL_TITLE_MACRO(action_get_title_cursor_directory, MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY)
DEFAULT_FILL_TITLE_MACRO(action_get_title_onscreen_overlay_keyboard_directory, MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY) DEFAULT_FILL_TITLE_MACRO(action_get_title_onscreen_overlay_keyboard_directory, MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY)
DEFAULT_FILL_TITLE_MACRO(action_get_title_recording_config_directory, MENU_ENUM_LABEL_VALUE_RECORDING_CONFIG_DIRECTORY) DEFAULT_FILL_TITLE_MACRO(action_get_title_recording_config_directory, MENU_ENUM_LABEL_VALUE_RECORDING_CONFIG_DIRECTORY)
DEFAULT_FILL_TITLE_MACRO(action_get_title_recording_output_directory, MENU_ENUM_LABEL_VALUE_RECORDING_OUTPUT_DIRECTORY) DEFAULT_FILL_TITLE_MACRO(action_get_title_recording_output_directory, MENU_ENUM_LABEL_VALUE_RECORDING_OUTPUT_DIRECTORY)
@ -1147,8 +1146,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
action_get_title_video_filter_directory}, action_get_title_video_filter_directory},
{MENU_ENUM_LABEL_AUDIO_FILTER_DIR, {MENU_ENUM_LABEL_AUDIO_FILTER_DIR,
action_get_title_audio_filter_directory}, action_get_title_audio_filter_directory},
{MENU_ENUM_LABEL_CURSOR_DIRECTORY,
action_get_title_cursor_directory},
{MENU_ENUM_LABEL_RECORDING_CONFIG_DIRECTORY, {MENU_ENUM_LABEL_RECORDING_CONFIG_DIRECTORY,
action_get_title_recording_config_directory}, action_get_title_recording_config_directory},
{MENU_ENUM_LABEL_RECORDING_OUTPUT_DIRECTORY, {MENU_ENUM_LABEL_RECORDING_OUTPUT_DIRECTORY,
@ -1457,9 +1454,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_AUDIO_FILTER_DIR: case MENU_ENUM_LABEL_AUDIO_FILTER_DIR:
BIND_ACTION_GET_TITLE(cbs, action_get_title_audio_filter_directory); BIND_ACTION_GET_TITLE(cbs, action_get_title_audio_filter_directory);
break; break;
case MENU_ENUM_LABEL_CURSOR_DIRECTORY:
BIND_ACTION_GET_TITLE(cbs, action_get_title_cursor_directory);
break;
case MENU_ENUM_LABEL_RECORDING_CONFIG_DIRECTORY: case MENU_ENUM_LABEL_RECORDING_CONFIG_DIRECTORY:
BIND_ACTION_GET_TITLE(cbs, action_get_title_recording_config_directory); BIND_ACTION_GET_TITLE(cbs, action_get_title_recording_config_directory);
break; break;

1
msg_hash.h
View File

@ -3133,7 +3133,6 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_SCAN_ENTRY, MENU_ENUM_LABEL_VALUE_SCAN_ENTRY,
MENU_ENUM_LABEL_VALUE_MANAGE, MENU_ENUM_LABEL_VALUE_MANAGE,
MENU_LABEL(CHEAT_DATABASE_PATH), MENU_LABEL(CHEAT_DATABASE_PATH),
MENU_LABEL(CURSOR_DIRECTORY),
MENU_LABEL(OSK_OVERLAY_DIRECTORY), MENU_LABEL(OSK_OVERLAY_DIRECTORY),
MENU_LABEL(RECORDING_OUTPUT_DIRECTORY), MENU_LABEL(RECORDING_OUTPUT_DIRECTORY),
MENU_LABEL(RECORDING_CONFIG_DIRECTORY), MENU_LABEL(RECORDING_CONFIG_DIRECTORY),

1
retroarch.c
View File

@ -3038,7 +3038,6 @@ static void dir_check_config(void)
/* PORT */ /* PORT */
ENSURE_DIRECTORY(settings->paths.directory_video_shader); ENSURE_DIRECTORY(settings->paths.directory_video_shader);
ENSURE_DIRECTORY(dir_get_ptr(RARCH_DIR_SAVESTATE)); ENSURE_DIRECTORY(dir_get_ptr(RARCH_DIR_SAVESTATE));
ENSURE_DIRECTORY(settings->paths.directory_resampler);
ENSURE_DIRECTORY(dir_get_ptr(RARCH_DIR_SAVEFILE)); ENSURE_DIRECTORY(dir_get_ptr(RARCH_DIR_SAVEFILE));
ENSURE_DIRECTORY(settings->paths.directory_screenshot); ENSURE_DIRECTORY(settings->paths.directory_screenshot);
ENSURE_DIRECTORY(settings->paths.directory_system); ENSURE_DIRECTORY(settings->paths.directory_system);

3
retroarch.cfg
View File

@ -852,9 +852,6 @@
# Path to content database directory. # Path to content database directory.
# content_database_path = # content_database_path =
# Saved queries are stored to this directory.
# cursor_directory =
# Path to cheat database directory. # Path to cheat database directory.
# cheat_database_path = # cheat_database_path =