mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-02-10 05:21:44 +01:00
parent 33f0f72adc
commit 5164b8a058
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
menu/menu_driver.c
View File

@ -237,8 +237,7 @@ void menu_driver_list_insert(file_list_t *list, const char *path,
{ {
if (!menu_driver_ctx || !menu_driver_ctx->list_insert) if (!menu_driver_ctx || !menu_driver_ctx->list_insert)
return; return;
menu_driver_ctx->list_insert(menu_userdata ? menu_driver_ctx->list_insert(menu_userdata, list, path, label, idx);
menu_userdata : NULL, list, path, label, idx);
} }
void menu_driver_list_free(file_list_t *list, size_t idx, size_t list_size) void menu_driver_list_free(file_list_t *list, size_t idx, size_t list_size)
@ -259,8 +258,7 @@ void menu_driver_list_free(file_list_t *list, size_t idx, size_t list_size)
size_t menu_driver_list_get_selection(void) size_t menu_driver_list_get_selection(void)
{ {
if (menu_driver_ctx && menu_driver_ctx->list_get_selection) if (menu_driver_ctx && menu_driver_ctx->list_get_selection)
return menu_driver_ctx->list_get_selection( return menu_driver_ctx->list_get_selection(menu_userdata);
menu_userdata ? menu_userdata : NULL);
return 0; return 0;
} }
@ -268,8 +266,7 @@ bool menu_driver_list_push(menu_displaylist_info_t *info, unsigned type)
{ {
if (menu_driver_ctx->list_push) if (menu_driver_ctx->list_push)
if (menu_driver_ctx->list_push(menu_driver_data, if (menu_driver_ctx->list_push(menu_driver_data,
menu_userdata ? menu_userdata : NULL, menu_userdata, info, type) == 0)
info, type) == 0)
return true; return true;
return false; return false;
} }
@ -277,24 +274,21 @@ bool menu_driver_list_push(menu_displaylist_info_t *info, unsigned type)
void menu_driver_list_cache(menu_list_type_t type, unsigned action) void menu_driver_list_cache(menu_list_type_t type, unsigned action)
{ {
if (menu_driver_ctx->list_cache) if (menu_driver_ctx->list_cache)
menu_driver_ctx->list_cache( menu_driver_ctx->list_cache(menu_userdata, type, action);
menu_userdata ? menu_userdata : NULL, type, action);
} }
size_t menu_driver_list_get_size(menu_list_type_t type) size_t menu_driver_list_get_size(menu_list_type_t type)
{ {
if (menu_driver_ctx && menu_driver_ctx->list_get_size) if (!menu_driver_ctx || !menu_driver_ctx->list_get_size)
return menu_driver_ctx->list_get_size( return 0;
menu_userdata ? menu_userdata : NULL, type); return menu_driver_ctx->list_get_size(menu_userdata, type);
return 0;
} }
void *menu_driver_list_get_entry(menu_list_type_t type, unsigned i) void *menu_driver_list_get_entry(menu_list_type_t type, unsigned i)
{ {
if (menu_driver_ctx && menu_driver_ctx->list_get_entry) if (!menu_driver_ctx || !menu_driver_ctx->list_get_entry)
return menu_driver_ctx->list_get_entry(menu_userdata ? return NULL;
menu_userdata : NULL, type, i); return menu_driver_ctx->list_get_entry(menu_userdata, type, i);
return NULL;
} }
int menu_driver_bind_init(menu_file_list_cbs_t *cbs, int menu_driver_bind_init(menu_file_list_cbs_t *cbs,
@ -305,7 +299,8 @@ int menu_driver_bind_init(menu_file_list_cbs_t *cbs,
int ret = 0; int ret = 0;
if (menu_driver_ctx && menu_driver_ctx->bind_init) if (menu_driver_ctx && menu_driver_ctx->bind_init)
ret = menu_driver_ctx->bind_init(cbs, path, label, type, idx, elem0, elem1, ret = menu_driver_ctx->bind_init(cbs, path, label,
type, idx, elem0, elem1,
label_hash, menu_label_hash); label_hash, menu_label_hash);
return ret; return ret;
@ -315,8 +310,7 @@ int menu_driver_iterate(enum menu_action action)
{ {
if (!menu_driver_ctx || !menu_driver_ctx->iterate) if (!menu_driver_ctx || !menu_driver_ctx->iterate)
return -1; return -1;
return menu_driver_ctx->iterate(menu_driver_data, return menu_driver_ctx->iterate(menu_driver_data, menu_userdata, action);
menu_userdata ? menu_userdata : NULL, action);
} }
static void menu_input_key_event(bool down, unsigned keycode, static void menu_input_key_event(bool down, unsigned keycode,
@ -393,17 +387,14 @@ bool menu_driver_load_image(void *data, menu_image_type_t type)
{ {
if (!menu_driver_ctx || !menu_driver_ctx->load_image) if (!menu_driver_ctx || !menu_driver_ctx->load_image)
return false; return false;
return menu_driver_ctx->load_image(menu_userdata ? return menu_driver_ctx->load_image(menu_userdata, data, type);
menu_userdata : NULL, data, type);
} }
bool menu_environment_cb(menu_environ_cb_t type, void *data) bool menu_environment_cb(menu_environ_cb_t type, void *data)
{ {
if (menu_driver_ctx->environ_cb) if (menu_driver_ctx->environ_cb)
{ {
int ret = menu_driver_ctx->environ_cb( int ret = menu_driver_ctx->environ_cb(type, data, menu_userdata);
type, data, menu_userdata
? menu_userdata : NULL);
if (ret == 0) if (ret == 0)
return true; return true;
@ -418,8 +409,8 @@ int menu_driver_pointer_tap(unsigned x, unsigned y, unsigned ptr,
{ {
if (!menu_driver_ctx || !menu_driver_ctx->pointer_tap) if (!menu_driver_ctx || !menu_driver_ctx->pointer_tap)
return 0; return 0;
return menu_driver_ctx->pointer_tap(menu_userdata return menu_driver_ctx->pointer_tap(menu_userdata,
? menu_userdata : NULL, x, y, ptr, cbs, entry, action); x, y, ptr, cbs, entry, action);
} }
bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
@ -680,8 +671,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
if (!pending_push) if (!pending_push)
return false; return false;
if (menu_driver_ctx->navigation_clear) if (menu_driver_ctx->navigation_clear)
menu_driver_ctx->navigation_clear(menu_userdata ? menu_driver_ctx->navigation_clear(menu_userdata, pending_push);
menu_userdata : NULL, pending_push);
} }
break; break;
case RARCH_MENU_CTL_POPULATE_ENTRIES: case RARCH_MENU_CTL_POPULATE_ENTRIES:
@ -727,11 +717,11 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
break; break;
case RARCH_MENU_CTL_CONTEXT_RESET: case RARCH_MENU_CTL_CONTEXT_RESET:
if (menu_driver_ctx->context_reset) if (menu_driver_ctx->context_reset)
menu_driver_ctx->context_reset(menu_userdata ? menu_userdata : NULL); menu_driver_ctx->context_reset(menu_userdata);
break; break;
case RARCH_MENU_CTL_CONTEXT_DESTROY: case RARCH_MENU_CTL_CONTEXT_DESTROY:
if (menu_driver_ctx && menu_driver_ctx->context_destroy) if (menu_driver_ctx && menu_driver_ctx->context_destroy)
menu_driver_ctx->context_destroy(menu_userdata ? menu_userdata : NULL); menu_driver_ctx->context_destroy(menu_userdata);
break; break;
case RARCH_MENU_CTL_SHADER_MANAGER_INIT: case RARCH_MENU_CTL_SHADER_MANAGER_INIT:
menu_shader_manager_init(menu_driver_data); menu_shader_manager_init(menu_driver_data);
@ -746,7 +736,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
if (!menu_driver_ctx || !menu_driver_ctx->list_set_selection) if (!menu_driver_ctx || !menu_driver_ctx->list_set_selection)
return false; return false;
menu_driver_ctx->list_set_selection(menu_userdata ? menu_userdata : NULL, list); menu_driver_ctx->list_set_selection(menu_userdata, list);
} }
break; break;
default: default: