mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-07-02 07:22:06 +02:00
parent 18e3843db7
commit d9bf45d2e7
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
menu/cbs/menu_cbs_cancel.c
View File

@ -48,26 +48,25 @@ static int action_cancel_core_content(const char *path,
} }
static int menu_cbs_init_bind_cancel_compare_label(menu_file_list_cbs_t *cbs, static int menu_cbs_init_bind_cancel_compare_label(menu_file_list_cbs_t *cbs,
const char *label, const char *menu_label) const char *label)
{ {
if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_LIST)))
{
BIND_ACTION_CANCEL(cbs, action_cancel_core_content);
return 0;
}
return -1; return -1;
} }
static int menu_cbs_init_bind_cancel_compare_type( static int menu_cbs_init_bind_cancel_compare_type(
menu_file_list_cbs_t *cbs, unsigned type) menu_file_list_cbs_t *cbs, unsigned type)
{ {
switch (type)
{
case FILE_TYPE_DOWNLOAD_CORE_CONTENT:
BIND_ACTION_CANCEL(cbs, action_cancel_core_content);
return 0;
}
return -1; return -1;
} }
int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx)
const char *menu_label)
{ {
if (!cbs) if (!cbs)
return -1; return -1;
@ -75,7 +74,7 @@ int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
BIND_ACTION_CANCEL(cbs, action_cancel_pop_default); BIND_ACTION_CANCEL(cbs, action_cancel_pop_default);
if (menu_cbs_init_bind_cancel_compare_label(cbs, label, menu_label) == 0) if (menu_cbs_init_bind_cancel_compare_label(cbs, label) == 0)
return 0; return 0;
if (menu_cbs_init_bind_cancel_compare_type( if (menu_cbs_init_bind_cancel_compare_type(

2
menu/menu_cbs.c
View File

@ -70,7 +70,7 @@ void menu_cbs_init(void *data,
menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident); menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident);
menu_cbs_init_bind_cancel(cbs, path, label, type, idx, menu_label); menu_cbs_init_bind_cancel(cbs, path, label, type, idx);
menu_cbs_init_log(repr_label, "CANCEL", cbs->action_cancel_ident); menu_cbs_init_log(repr_label, "CANCEL", cbs->action_cancel_ident);

3
menu/menu_cbs.h
View File

@ -148,8 +148,7 @@ int menu_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx); const char *path, const char *label, unsigned type, size_t idx);
int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx);
const char *menu_label);
int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx,