From 3b4c50b19e16efe78eb8224e0401c3b8708a5420 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 Jan 2017 06:19:07 +0100 Subject: [PATCH] filebrowser_clear_type - get rid of it --- menu/cbs/menu_cbs_cancel.c | 2 +- menu/cbs/menu_cbs_ok.c | 34 ++++++++++++++--------------- menu/menu_displaylist.c | 38 ++++++++++++++++----------------- menu/widgets/menu_filebrowser.c | 5 ----- menu/widgets/menu_filebrowser.h | 2 -- 5 files changed, 37 insertions(+), 44 deletions(-) diff --git a/menu/cbs/menu_cbs_cancel.c b/menu/cbs/menu_cbs_cancel.c index 35407e75f0..8e849b586f 100644 --- a/menu/cbs/menu_cbs_cancel.c +++ b/menu/cbs/menu_cbs_cancel.c @@ -47,7 +47,7 @@ static int action_cancel_pop_default(const char *path, msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST) ) ) - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &new_selection_ptr); menu_entries_pop_stack(&new_selection_ptr, 0, 1); diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 197b99da04..46455f38ab 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -324,7 +324,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_AUDIO_DSP_PLUGIN: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info.directory_ptr = idx; info_path = settings->directory.audio_filter; info_label = msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN); @@ -332,7 +332,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE; break; case ACTION_OK_DL_SHADER_PASS: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info.type = type; info.directory_ptr = idx; info_path = settings->directory.video_shader; @@ -374,7 +374,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_SHADER_PRESET: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info.type = type; info.directory_ptr = idx; info_path = settings->directory.video_shader; @@ -397,7 +397,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_FILE_BROWSER_SCAN_DIR; break; case ACTION_OK_DL_REMAP_FILE: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info.type = type; info.directory_ptr = idx; info_path = settings->directory.input_remapping; @@ -405,7 +405,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE; break; case ACTION_OK_DL_RECORD_CONFIGFILE: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); { global_t *global = global_get_ptr(); info.type = type; @@ -416,7 +416,7 @@ int generic_action_ok_displaylist_push(const char *path, } break; case ACTION_OK_DL_DISK_IMAGE_APPEND_LIST: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info.type = type; info.directory_ptr = idx; info_path = settings->directory.menu_content; @@ -424,7 +424,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE; break; case ACTION_OK_DL_PLAYLIST_COLLECTION: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info.type = type; info.directory_ptr = idx; info_path = path; @@ -432,7 +432,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_CHEAT_FILE: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info.type = type; info.directory_ptr = idx; info_path = settings->path.cheat_database; @@ -440,7 +440,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE; break; case ACTION_OK_DL_CORE_LIST: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info.type = type; info.directory_ptr = idx; info_path = settings->directory.libretro; @@ -464,7 +464,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_COLLECTION; break; case ACTION_OK_DL_RDB_ENTRY: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); fill_pathname_join_delim(tmp, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RDB_ENTRY_DETAIL), path, '|', sizeof(tmp)); @@ -538,7 +538,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_DATABASE_MANAGER_LIST: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); fill_pathname_join(tmp, settings->path.content_database, path, sizeof(tmp)); @@ -551,7 +551,7 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_CURSOR_MANAGER_LIST: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); fill_pathname_join(tmp, settings->directory.cursor, path, sizeof(tmp)); @@ -1993,7 +1993,7 @@ static int action_ok_remap_file_save_game(const char *path, int action_ok_path_use_directory(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); return generic_action_ok(NULL, label, type, idx, entry_idx, ACTION_OK_SET_DIRECTORY, MSG_UNKNOWN); } @@ -3272,7 +3272,7 @@ static int action_ok_push_content_list(const char *path, static int action_ok_push_scan_file(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); return action_ok_push_content_list(path, label, type, idx, entry_idx); } @@ -3280,7 +3280,7 @@ static int action_ok_scan_directory_list(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { settings_t *settings = config_get_ptr(); - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); return generic_action_ok_displaylist_push(path, settings->directory.menu_content, label, type, idx, entry_idx, ACTION_OK_DL_SCAN_DIR_LIST); @@ -3300,7 +3300,7 @@ static int action_ok_push_downloads_dir(const char *path, { settings_t *settings = config_get_ptr(); - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); return generic_action_ok_displaylist_push(path, settings->directory.core_assets, msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES), type, idx, @@ -3332,7 +3332,7 @@ int action_ok_push_filebrowser_list_dir_select(const char *path, static int action_ok_push_default(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); return generic_action_ok_displaylist_push(path, NULL, label, type, idx, entry_idx, ACTION_OK_DL_PUSH_DEFAULT); } diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index c7aea2a370..6e297f12d3 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3682,7 +3682,7 @@ static bool menu_displaylist_push_internal( } else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MUSIC_TAB))) { - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type = 42; strlcpy(info->exts, file_path_str(FILE_PATH_LPL_EXTENSION_NO_DOT), @@ -3697,7 +3697,7 @@ static bool menu_displaylist_push_internal( } else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_TAB))) { - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type = 42; strlcpy(info->exts, file_path_str(FILE_PATH_LPL_EXTENSION_NO_DOT), @@ -3713,7 +3713,7 @@ static bool menu_displaylist_push_internal( else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_IMAGES_TAB))) { - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type = 42; strlcpy(info->exts, file_path_str(FILE_PATH_LPL_EXTENSION_NO_DOT), @@ -3748,7 +3748,7 @@ static bool menu_displaylist_push_internal( { settings_t *settings = config_get_ptr(); - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type = 42; strlcpy(info->exts, file_path_str(FILE_PATH_LPL_EXTENSION_NO_DOT), @@ -6053,7 +6053,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) info->need_push = true; break; case DISPLAYLIST_DATABASES: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_RDB; strlcpy(info->exts, file_path_str(FILE_PATH_RDB_EXTENSION), @@ -6092,7 +6092,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) info->need_push = true; break; case DISPLAYLIST_DATABASE_CURSORS: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_CURSOR; strlcpy(info->exts, "dbc", sizeof(info->exts)); strlcpy(info->path, settings->directory.cursor, sizeof(info->path)); @@ -6103,14 +6103,14 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) ext_name[0] = '\0'; - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_PLAIN; if (frontend_driver_get_core_extension(ext_name, sizeof(ext_name))) strlcpy(info->exts, ext_name, sizeof(info->exts)); } break; case DISPLAYLIST_CONFIG_FILES: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_CONFIG; strlcpy(info->exts, "cfg", sizeof(info->exts)); break; @@ -6123,7 +6123,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) #endif str_list = string_list_new(); - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_SHADER_PRESET; #ifdef HAVE_CG @@ -6149,7 +6149,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) str_list = string_list_new(); - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_SHADER; @@ -6167,12 +6167,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) } break; case DISPLAYLIST_VIDEO_FILTERS: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_VIDEOFILTER; strlcpy(info->exts, "filt", sizeof(info->exts)); break; case DISPLAYLIST_IMAGES: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_IMAGE; { union string_list_elem_attr attr; @@ -6198,37 +6198,37 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) } break; case DISPLAYLIST_AUDIO_FILTERS: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_AUDIOFILTER; strlcpy(info->exts, "dsp", sizeof(info->exts)); break; case DISPLAYLIST_CHEAT_FILES: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_CHEAT; strlcpy(info->exts, "cht", sizeof(info->exts)); break; case DISPLAYLIST_CONTENT_HISTORY: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_PLAIN; strlcpy(info->exts, "lpl", sizeof(info->exts)); break; case DISPLAYLIST_FONTS: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_FONT; strlcpy(info->exts, "ttf", sizeof(info->exts)); break; case DISPLAYLIST_OVERLAYS: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_OVERLAY; strlcpy(info->exts, "cfg", sizeof(info->exts)); break; case DISPLAYLIST_RECORD_CONFIG_FILES: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_RECORD_CONFIG; strlcpy(info->exts, "cfg", sizeof(info->exts)); break; case DISPLAYLIST_REMAP_FILES: - filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_NONE); info->type_default = FILE_TYPE_REMAP; strlcpy(info->exts, "rmp", sizeof(info->exts)); break; diff --git a/menu/widgets/menu_filebrowser.c b/menu/widgets/menu_filebrowser.c index 645b62e2fd..4f0a7bad5c 100644 --- a/menu/widgets/menu_filebrowser.c +++ b/menu/widgets/menu_filebrowser.c @@ -37,11 +37,6 @@ static enum filebrowser_enums filebrowser_types = FILEBROWSER_NONE; -void filebrowser_clear_type(void) -{ - filebrowser_types = FILEBROWSER_NONE; -} - void filebrowser_set_type(enum filebrowser_enums type) { filebrowser_types = type; diff --git a/menu/widgets/menu_filebrowser.h b/menu/widgets/menu_filebrowser.h index 2c44a2e0ed..d8d620d24b 100644 --- a/menu/widgets/menu_filebrowser.h +++ b/menu/widgets/menu_filebrowser.h @@ -34,8 +34,6 @@ enum filebrowser_enums FILEBROWSER_SELECT_COLLECTION }; -void filebrowser_clear_type(void); - void filebrowser_set_type(enum filebrowser_enums type); void filebrowser_parse(void *data, unsigned type,