From 3d8e1e0f6c2bd5326757ad8c0986e1c44f613971 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 4 Mar 2016 07:23:07 +0100 Subject: [PATCH] Revert "Change signature of menu_displaylist_parse_settings" This reverts commit 280431114e7e7d1912512e229d1ae754dab905d9. --- menu/menu_displaylist.c | 6 +++--- menu/menu_displaylist.h | 16 ++-------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index b3ade6916d..6af74f11ff 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1806,7 +1806,7 @@ static int deferred_push_video_shader_parameters_common( } #endif -bool menu_displaylist_parse_settings(void *data, +int menu_displaylist_parse_settings(void *data, menu_displaylist_info_t *info, const char *info_label, enum menu_displaylist_parse_type parse_type, @@ -1819,7 +1819,7 @@ bool menu_displaylist_parse_settings(void *data, uint64_t flags = menu_setting_get_flags(setting); if (!setting) - return false; + return -1; switch (parse_type) { @@ -1946,7 +1946,7 @@ loop: menu_hash_to_str(MENU_LABEL_NO_SETTINGS_FOUND), 0, 0, 0); - return true; + return 0; } static int menu_displaylist_sort_playlist(const content_playlist_entry_t *a, diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index 9ab9fadb11..ff46de8105 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -142,22 +142,10 @@ typedef struct menu_displaylist_ctx_entry file_list_t *list; } menu_displaylist_ctx_entry_t; -typedef struct menu_displaylist_ctx_parse_entry -{ - void *data; - menu_displaylist_info_t *info; - const char *info_label; - enum menu_displaylist_parse_type parse_type; - bool add_empty_entry; -} menu_displaylist_ctx_parse_entry_t; - bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data); -bool menu_displaylist_parse_settings(void *data, - menu_displaylist_info_t *info, - const char *info_label, - enum menu_displaylist_parse_type parse_type, - bool add_empty_entry); +int menu_displaylist_parse_settings(void *data, menu_displaylist_info_t *info, + const char *info_label, enum menu_displaylist_parse_type parse_type, bool add_empty_entry); #ifdef __cplusplus }