mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename FILEBROWSER_SELECT_IMAGE to FILEBROWSER_SELECT_FILE

Browse Source
This commit is contained in:
twinaphex 2017-01-07 18:10:17 +01:00
parent f18bc0e814
commit 689eb71795
4 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_ok.c
View File

@ -1645,7 +1645,7 @@ static int action_ok_lookup_setting(const char *path,
static int action_ok_menu_wallpaper(const char *path, static int action_ok_menu_wallpaper(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
filebrowser_set_type(FILEBROWSER_SELECT_IMAGE); filebrowser_set_type(FILEBROWSER_SELECT_FILE);
return action_ok_lookup_setting(path, label, type, idx, entry_idx); return action_ok_lookup_setting(path, label, type, idx, entry_idx);
} }

2
menu/menu_displaylist.c
View File

@ -6171,7 +6171,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
strlcpy(info->exts, "filt", sizeof(info->exts)); strlcpy(info->exts, "filt", sizeof(info->exts));
break; break;
case DISPLAYLIST_IMAGES: case DISPLAYLIST_IMAGES:
if (filebrowser_get_type() != FILEBROWSER_SELECT_IMAGE) if (filebrowser_get_type() != FILEBROWSER_SELECT_FILE)
filebrowser_clear_type(); filebrowser_clear_type();
info->type_default = FILE_TYPE_IMAGE; info->type_default = FILE_TYPE_IMAGE;
{ {

19
menu/widgets/menu_filebrowser.c
View File

@ -35,10 +35,6 @@
#include "../../configuration.h" #include "../../configuration.h"
#include "../../paths.h" #include "../../paths.h"
#if 0
#define FILEBROWSER_DEBUG
#endif
static enum filebrowser_enums filebrowser_types = FILEBROWSER_NONE; static enum filebrowser_enums filebrowser_types = FILEBROWSER_NONE;
enum filebrowser_enums filebrowser_get_type(void) enum filebrowser_enums filebrowser_get_type(void)
@ -48,24 +44,13 @@ enum filebrowser_enums filebrowser_get_type(void)
void filebrowser_clear_type(void) void filebrowser_clear_type(void)
{ {
#ifdef FILEBROWSER_DEBUG
RARCH_LOG("filebrowser_clear_type \n");
#endif
filebrowser_types = FILEBROWSER_NONE; filebrowser_types = FILEBROWSER_NONE;
} }
void filebrowser_set_type(enum filebrowser_enums type) void filebrowser_set_type(enum filebrowser_enums type)
{ {
#ifdef FILEBROWSER_DEBUG if (filebrowser_types != FILEBROWSER_SELECT_FILE)
RARCH_LOG("filebrowser_set_type: %d \n", type);
#endif
if (filebrowser_types != FILEBROWSER_SELECT_IMAGE)
{
filebrowser_types = type; filebrowser_types = type;
#ifdef FILEBROWSER_DEBUG
RARCH_LOG("filebrowser_set_type MODIFIED: %d \n", type);
#endif
}
} }
void filebrowser_parse(void *data, unsigned type_data, bool extensions_honored) void filebrowser_parse(void *data, unsigned type_data, bool extensions_honored)
@ -224,7 +209,7 @@ void filebrowser_parse(void *data, unsigned type_data, bool extensions_honored)
else else
file_type = FILE_TYPE_IMAGE; file_type = FILE_TYPE_IMAGE;
#endif #endif
if (filebrowser_types == FILEBROWSER_SELECT_IMAGE) if (filebrowser_types == FILEBROWSER_SELECT_FILE)
file_type = FILE_TYPE_IMAGE; file_type = FILE_TYPE_IMAGE;
break; break;
default: default:

2
menu/widgets/menu_filebrowser.h
View File

@ -31,7 +31,7 @@ enum filebrowser_enums
FILEBROWSER_NONE = 0, FILEBROWSER_NONE = 0,
FILEBROWSER_SELECT_DIR, FILEBROWSER_SELECT_DIR,
FILEBROWSER_SCAN_DIR, FILEBROWSER_SCAN_DIR,
FILEBROWSER_SELECT_IMAGE, FILEBROWSER_SELECT_FILE,
FILEBROWSER_SELECT_COLLECTION FILEBROWSER_SELECT_COLLECTION
}; };