CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-24 11:45:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-12-16 09:32:28 +01:00
parent 02e1c141a1
commit 75334902a2
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
menu/menu_displaylist.c
View File

@ -1575,7 +1575,6 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info)
return 0; return 0;
} }
#ifdef HAVE_LIBRETRODB #ifdef HAVE_LIBRETRODB
static int create_string_list_rdb_entry_string( static int create_string_list_rdb_entry_string(
enum msg_hash_enums enum_idx, enum msg_hash_enums enum_idx,
@ -1676,11 +1675,9 @@ static int create_string_list_rdb_entry_int(
return 0; return 0;
} }
#endif
static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info) static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
{ {
#ifdef HAVE_LIBRETRODB
unsigned i, j, k; unsigned i, j, k;
char path_playlist[PATH_MAX_LENGTH]; char path_playlist[PATH_MAX_LENGTH];
char path_base[PATH_MAX_LENGTH]; char path_base[PATH_MAX_LENGTH];
@ -2101,15 +2098,11 @@ error:
playlist_free(playlist); playlist_free(playlist);
return -1; return -1;
#else
return 0;
#endif
} }
static int menu_database_parse_query(file_list_t *list, const char *path, static int menu_database_parse_query(file_list_t *list, const char *path,
const char *query) const char *query)
{ {
#ifdef HAVE_LIBRETRODB
unsigned i; unsigned i;
database_info_list_t *db_list = database_info_list_new(path, query); database_info_list_t *db_list = database_info_list_new(path, query);
@ -2125,10 +2118,11 @@ static int menu_database_parse_query(file_list_t *list, const char *path,
database_info_list_free(db_list); database_info_list_free(db_list);
free(db_list); free(db_list);
#endif
return 0; return 0;
} }
#endif
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
static int deferred_push_video_shader_parameters_common( static int deferred_push_video_shader_parameters_common(
@ -5376,14 +5370,23 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
string_list_free(str_list); string_list_free(str_list);
} }
#ifdef HAVE_LIBRETRODB
ret = menu_displaylist_parse_database_entry(info); ret = menu_displaylist_parse_database_entry(info);
#else
ret = 0;
#endif
info->need_push = true; info->need_push = true;
break; break;
case DISPLAYLIST_DATABASE_QUERY: case DISPLAYLIST_DATABASE_QUERY:
#ifdef HAVE_LIBRETRODB
ret = menu_database_parse_query(info->list, ret = menu_database_parse_query(info->list,
info->path, string_is_empty(info->path_c) info->path, string_is_empty(info->path_c)
? NULL : info->path_c); ? NULL : info->path_c);
#else
ret = 0;
#endif
strlcpy(info->path, info->path_b, sizeof(info->path)); strlcpy(info->path, info->path_b, sizeof(info->path));
info->need_sort = true; info->need_sort = true;