Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove cursor_directory and resampler_directory #16346

Merged
merged 1 commit into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions configuration.c
Original file line number Diff line number Diff line change
Expand Up @@ -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("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("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_filter_dir", settings->paths.directory_video_filter, true, NULL, true);
SETTING_PATH("video_filter", settings->paths.path_softfilter_plugin, false, NULL, true);
Expand Down Expand Up @@ -1720,7 +1719,7 @@ static struct config_bool_setting *populate_settings_bool(
SETTING_BOOL("game_specific_options", &settings->bools.game_specific_options, true, DEFAULT_GAME_SPECIFIC_OPTIONS, false);
SETTING_BOOL("auto_overrides_enable", &settings->bools.auto_overrides_enable, true, DEFAULT_AUTO_OVERRIDES_ENABLE, false);
SETTING_BOOL("auto_remaps_enable", &settings->bools.auto_remaps_enable, true, DEFAULT_AUTO_REMAPS_ENABLE, false);
SETTING_BOOL("initial_disk_change_enable", &settings->bools.initial_disk_change_enable, true, DEFAULT_INITIAL_DISK_CHANGE_ENABLE, false);
SETTING_BOOL("initial_disk_change_enable", &settings->bools.initial_disk_change_enable, true, DEFAULT_INITIAL_DISK_CHANGE_ENABLE, false);
SETTING_BOOL("global_core_options", &settings->bools.global_core_options, true, DEFAULT_GLOBAL_CORE_OPTIONS, false);
SETTING_BOOL("auto_shaders_enable", &settings->bools.auto_shaders_enable, true, DEFAULT_AUTO_SHADERS_ENABLE, false);
SETTING_BOOL("scan_without_core_match", &settings->bools.scan_without_core_match, true, DEFAULT_SCAN_WITHOUT_CORE_MATCH, false);
Expand Down Expand Up @@ -2904,7 +2903,6 @@ void config_set_defaults(void *data)

*settings->paths.path_libretro_info = '\0';
*settings->paths.directory_libretro = '\0';
*settings->paths.directory_resampler = '\0';
*settings->paths.directory_screenshot = '\0';
*settings->paths.directory_system = '\0';
*settings->paths.directory_cache = '\0';
Expand Down Expand Up @@ -3110,10 +3108,6 @@ void config_set_defaults(void *data)
configuration_set_string(settings,
settings->paths.directory_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]))
configuration_set_string(settings,
settings->paths.log_dir,
Expand Down Expand Up @@ -4112,15 +4106,15 @@ static bool config_load_file(global_t *global,
if (settings->bools.switch_oc == true) {
fprintf(f, "1\n");
} else {
fprintf(f, "0\n");
fprintf(f, "0\n");
}
fclose(f);
if (settings->bools.switch_cec == true) {
FILE* f = fopen(SWITCH_CEC_TOGGLE_PATH, "w");
fprintf(f, "\n");
fclose(f);
} else {
filestream_delete(SWITCH_CEC_TOGGLE_PATH);
filestream_delete(SWITCH_CEC_TOGGLE_PATH);
}
if (settings->bools.bluetooth_ertm_disable == true) {
FILE* f = fopen(BLUETOOTH_ERTM_TOGGLE_PATH, "w");
Expand All @@ -4131,8 +4125,8 @@ static bool config_load_file(global_t *global,
fprintf(f, "0\n");
fclose(f);
}
#endif
#endif

frontend_driver_set_sustained_performance_mode(settings->bools.sustained_performance_mode);
recording_driver_update_streaming_url();

Expand Down Expand Up @@ -4472,7 +4466,7 @@ bool config_unload_override(void)
{
/* This is for 'win32_common.c', so we don't save
* fullscreen size and position if we're switching
* back to windowed mode.
* back to windowed mode.
* Might be useful for other devices as well? */
if ( settings->bools.video_window_save_positions
&& !settings->bools.video_fullscreen)
Expand Down Expand Up @@ -4931,7 +4925,7 @@ static void input_config_save_keybinds_user_override(config_file_t *conf,
}

void config_get_autoconf_profile_filename(
const char *device_name, unsigned user,
const char *device_name, unsigned user,
char *buf, size_t len_buf)
{
static const char* invalid_filename_chars[] = {
Expand Down
3 changes: 1 addition & 2 deletions configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,6 @@ typedef struct settings
char directory_input_remapping[PATH_MAX_LENGTH];
char directory_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_system[PATH_MAX_LENGTH];
char directory_cache[PATH_MAX_LENGTH];
Expand Down Expand Up @@ -1218,7 +1217,7 @@ bool config_load_remap(const char *directory_input_remapping,
**/

void config_get_autoconf_profile_filename(
const char *device_name, unsigned user,
const char *device_name, unsigned user,
char *buf, size_t len_buf);
/**
* config_save_autoconf_profile:
Expand Down
1 change: 0 additions & 1 deletion defaults.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ enum default_dirs
DEFAULT_DIR_PORT,
DEFAULT_DIR_SHADER,
DEFAULT_DIR_SAVESTATE,
DEFAULT_DIR_RESAMPLER,
DEFAULT_DIR_SRAM,
DEFAULT_DIR_SCREENSHOT,
DEFAULT_DIR_SYSTEM,
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_lbl.h
Original file line number Diff line number Diff line change
Expand Up @@ -904,10 +904,6 @@ MSG_HASH(
MENU_ENUM_LABEL_CPU_CORES,
"system_information_cpu_cores"
)
MSG_HASH(
MENU_ENUM_LABEL_CURSOR_DIRECTORY,
"cursor_directory"
)
MSG_HASH(
MENU_ENUM_LABEL_CURSOR_MANAGER,
"cursor_manager"
Expand Down
18 changes: 6 additions & 12 deletions menu/cbs/menu_cbs_title.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static void action_get_title_fill_search_filter_default(
static void action_get_title_fill_path_search_filter_default(
const char *path, enum msg_hash_enums lbl, char *s, size_t len)
{
size_t _len = 0;
size_t _len = 0;
const char *title = msg_hash_to_str(lbl);
if (!string_is_empty(title))
_len = strlcpy(s, title, len);
Expand Down Expand Up @@ -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_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_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_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)
Expand Down Expand Up @@ -887,7 +886,7 @@ static int action_get_title_group_settings(const char *path, const char *label,
unsigned menu_type, char *s, size_t len)
{
unsigned i;
typedef struct title_info_list
typedef struct title_info_list
{
enum msg_hash_enums type;
enum msg_hash_enums val;
Expand Down Expand Up @@ -969,7 +968,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
const char *label)
{
unsigned i;
typedef struct title_info_list
typedef struct title_info_list
{
enum msg_hash_enums type;
int (*cb)(const char *path, const char *label,
Expand Down Expand Up @@ -1087,7 +1086,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
{MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST, action_get_title_deferred_cursor_manager_list},
{MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_DEVELOPER, action_get_title_list_rdb_entry_developer},
{MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PUBLISHER, action_get_title_list_rdb_entry_publisher},
{MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ORIGIN,
{MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ORIGIN,
action_get_title_list_rdb_entry_origin},
{MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FRANCHISE,
action_get_title_list_rdb_entry_franchise},
Expand Down Expand Up @@ -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},
{MENU_ENUM_LABEL_AUDIO_FILTER_DIR,
action_get_title_audio_filter_directory},
{MENU_ENUM_LABEL_CURSOR_DIRECTORY,
action_get_title_cursor_directory},
{MENU_ENUM_LABEL_RECORDING_CONFIG_DIRECTORY,
action_get_title_recording_config_directory},
{MENU_ENUM_LABEL_RECORDING_OUTPUT_DIRECTORY,
Expand Down Expand Up @@ -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:
BIND_ACTION_GET_TITLE(cbs, action_get_title_audio_filter_directory);
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:
BIND_ACTION_GET_TITLE(cbs, action_get_title_recording_config_directory);
break;
Expand Down Expand Up @@ -1704,7 +1698,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
break;
case MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_FACEBOOK_LIST:
BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_facebook_list);
break;
break;
case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_LIST:
case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_SUBDIR_LIST:
BIND_ACTION_GET_TITLE(cbs, action_get_download_core_content_list);
Expand Down Expand Up @@ -1790,7 +1784,7 @@ int menu_cbs_init_bind_title(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx)
{
unsigned i;
typedef struct title_info_list
typedef struct title_info_list
{
enum msg_hash_enums type;
int (*cb)(const char *path, const char *label,
Expand Down
3 changes: 1 addition & 2 deletions msg_hash.h
Original file line number Diff line number Diff line change
Expand Up @@ -2900,7 +2900,7 @@ enum msg_hash_enums

MSG_ACCESSIBILITY_STARTUP,
MSG_AI_SERVICE_STOPPED,

MENU_LABEL(ON),
MENU_LABEL(OFF),
MENU_LABEL(DISABLED),
Expand Down Expand Up @@ -3133,7 +3133,6 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_SCAN_ENTRY,
MENU_ENUM_LABEL_VALUE_MANAGE,
MENU_LABEL(CHEAT_DATABASE_PATH),
MENU_LABEL(CURSOR_DIRECTORY),
MENU_LABEL(OSK_OVERLAY_DIRECTORY),
MENU_LABEL(RECORDING_OUTPUT_DIRECTORY),
MENU_LABEL(RECORDING_CONFIG_DIRECTORY),
Expand Down
1 change: 0 additions & 1 deletion retroarch.c
Original file line number Diff line number Diff line change
Expand Up @@ -3038,7 +3038,6 @@ static void dir_check_config(void)
/* PORT */
ENSURE_DIRECTORY(settings->paths.directory_video_shader);
ENSURE_DIRECTORY(dir_get_ptr(RARCH_DIR_SAVESTATE));
ENSURE_DIRECTORY(settings->paths.directory_resampler);
ENSURE_DIRECTORY(dir_get_ptr(RARCH_DIR_SAVEFILE));
ENSURE_DIRECTORY(settings->paths.directory_screenshot);
ENSURE_DIRECTORY(settings->paths.directory_system);
Expand Down
3 changes: 0 additions & 3 deletions retroarch.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -852,9 +852,6 @@
# Path to content database directory.
# content_database_path =

# Saved queries are stored to this directory.
# cursor_directory =

# Path to cheat database directory.
# cheat_database_path =

Expand Down
Loading