From d7b97025061d1045a837b0803b08022cdcc42bd1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Oct 2015 20:04:10 +0200 Subject: [PATCH] Hook up some more idents for menu action callbacks --- menu/menu_cbs.c | 34 ++++------------------------------ menu/menu_list.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c index be84f5a00e..5172c7be09 100644 --- a/menu/menu_cbs.c +++ b/menu/menu_cbs.c @@ -100,81 +100,55 @@ void menu_cbs_init(void *data, ret = menu_cbs_init_bind_scan(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 menu_cbs_init_log(repr_label, "SCAN", cbs->action_scan_ident); -#endif ret = menu_cbs_init_bind_start(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 menu_cbs_init_log(repr_label, "START", cbs->action_start_ident); -#endif ret = menu_cbs_init_bind_select(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 menu_cbs_init_log(repr_label, "SELECT", cbs->action_select_ident); -#endif ret = menu_cbs_init_bind_info(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 menu_cbs_init_log(repr_label, "INFO", cbs->action_info_ident); -#endif ret = menu_cbs_init_bind_content_list_switch(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 - menu_cbs_init_log(repr_label, "CONTENT SWITCH", cbs->action_content_switch_ident); -#endif + menu_cbs_init_log(repr_label, "CONTENT SWITCH", cbs->action_content_list_switch_ident); ret = menu_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 menu_cbs_init_log(repr_label, "UP", cbs->action_up_ident); -#endif ret = menu_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 menu_cbs_init_log(repr_label, "DOWN", cbs->action_down_ident); -#endif ret = menu_cbs_init_bind_left(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash); -#if 0 menu_cbs_init_log(repr_label, "LEFT", cbs->action_left_ident); -#endif ret = menu_cbs_init_bind_right(cbs, path, label, type, idx, elem0, elem1, menu_label, label_hash, menu_label_hash); -#if 0 menu_cbs_init_log(repr_label, "RIGHT", cbs->action_right_ident); -#endif ret = menu_cbs_init_bind_deferred_push(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 - menu_cbs_init_log(repr_label, "DEFERRED PUSH", cbs->deferred_push_ident); -#endif + menu_cbs_init_log(repr_label, "DEFERRED PUSH", cbs->action_deferred_push_ident); ret = menu_cbs_init_bind_refresh(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 menu_cbs_init_log(repr_label, "REFRESH", cbs->action_refresh_ident); -#endif ret = menu_cbs_init_bind_get_string_representation(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 - menu_cbs_init_log(repr_label, "REPRESENTATION", cbs->action_representation_ident); -#endif + menu_cbs_init_log(repr_label, "GET VALUE", cbs->action_get_value_ident); ret = menu_cbs_init_bind_title(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); -#if 0 - menu_cbs_init_log(repr_label, "TITLE", cbs->action_title_ident); -#endif + menu_cbs_init_log(repr_label, "GET TITLE", cbs->action_get_title_ident); ret = menu_driver_bind_init(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); diff --git a/menu/menu_list.h b/menu/menu_list.h index 022a2e3996..6651f27c2a 100644 --- a/menu/menu_list.h +++ b/menu/menu_list.h @@ -40,35 +40,66 @@ typedef enum typedef struct menu_file_list_cbs { rarch_setting_t *setting; + int (*action_iterate)(const char *label, unsigned action); + const char *action_iterate_ident; + int (*action_deferred_push)(menu_displaylist_info_t *info); + const char *action_deferred_push_ident; + int (*action_select)(const char *path, const char *label, unsigned type, size_t idx); + const char *action_select_ident; + int (*action_get_title)(const char *path, const char *label, unsigned type, char *s, size_t len); + const char *action_get_title_ident; + int (*action_ok)(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx); const char *action_ok_ident; + int (*action_cancel)(const char *path, const char *label, unsigned type, size_t idx); const char *action_cancel_ident; + int (*action_scan)(const char *path, const char *label, unsigned type, size_t idx); + const char *action_scan_ident; + int (*action_start)(unsigned type, const char *label); + const char *action_start_ident; + int (*action_info)(unsigned type, const char *label); + const char *action_info_ident; + int (*action_content_list_switch)(void *data, void *userdata, const char *path, const char *label, unsigned type); + const char *action_content_list_switch_ident; + int (*action_left)(unsigned type, const char *label, bool wraparound); + const char *action_left_ident; + int (*action_right)(unsigned type, const char *label, bool wraparound); + const char *action_right_ident; + int (*action_refresh)(file_list_t *list, file_list_t *menu_list); + const char *action_refresh_ident; + int (*action_up)(unsigned type, const char *label); + const char *action_up_ident; + int (*action_down)(unsigned type, const char *label); + const char *action_down_ident; + void (*action_get_value)(file_list_t* list, unsigned *w, unsigned type, unsigned i, const char *label, char *s, size_t len, const char *entry_label, const char *path, char *path_buf, size_t path_buf_size); + const char *action_get_value_ident; + } menu_file_list_cbs_t; menu_list_t *menu_list_get_ptr(void);