mirror of
https://github.com/libretro/RetroArch
synced 2025-03-02 19:13:34 +00:00
Move function pointer around
This commit is contained in:
parent
c91de95236
commit
798e7fa7fa
@ -838,7 +838,6 @@ menu_ctx_driver_t menu_ctx_glui = {
|
||||
glui_get_message,
|
||||
glui_render,
|
||||
glui_frame,
|
||||
generic_menu_init_list,
|
||||
glui_init,
|
||||
glui_free,
|
||||
glui_context_reset,
|
||||
@ -852,6 +851,7 @@ menu_ctx_driver_t menu_ctx_glui = {
|
||||
glui_navigation_set_last,
|
||||
glui_navigation_alphabet,
|
||||
glui_navigation_alphabet,
|
||||
generic_menu_init_list,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
|
@ -28,7 +28,6 @@ menu_ctx_driver_t menu_ctx_null = {
|
||||
NULL, /* render_messagebox */
|
||||
NULL, /* render */
|
||||
NULL, /* frame */
|
||||
NULL, /* init_list */
|
||||
NULL, /* init */
|
||||
NULL, /* free */
|
||||
NULL, /* context_reset */
|
||||
@ -42,6 +41,7 @@ menu_ctx_driver_t menu_ctx_null = {
|
||||
NULL, /* navigation_set_last */
|
||||
NULL, /* navigation_descend_alphabet */
|
||||
NULL, /* navigation_ascend_alphabet */
|
||||
NULL, /* lists_init */
|
||||
NULL, /* list_insert */
|
||||
NULL, /* list_delete */
|
||||
NULL, /* list_clear */
|
||||
|
@ -854,7 +854,6 @@ menu_ctx_driver_t menu_ctx_rgui = {
|
||||
rgui_set_message,
|
||||
rgui_render,
|
||||
NULL,
|
||||
generic_menu_init_list,
|
||||
rgui_init,
|
||||
rgui_free,
|
||||
NULL,
|
||||
@ -868,6 +867,7 @@ menu_ctx_driver_t menu_ctx_rgui = {
|
||||
rgui_navigation_set_last,
|
||||
rgui_navigation_descend_alphabet,
|
||||
rgui_navigation_ascend_alphabet,
|
||||
generic_menu_init_list,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
|
@ -330,7 +330,6 @@ menu_ctx_driver_t menu_ctx_rmenu = {
|
||||
rmenu_render_messagebox,
|
||||
rmenu_render,
|
||||
NULL,
|
||||
generic_menu_init_list,
|
||||
rmenu_init,
|
||||
rmenu_free,
|
||||
rmenu_context_reset,
|
||||
@ -344,6 +343,7 @@ menu_ctx_driver_t menu_ctx_rmenu = {
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
generic_menu_init_list,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
|
@ -697,7 +697,6 @@ menu_ctx_driver_t menu_ctx_rmenu_xui = {
|
||||
rmenu_xui_render_messagebox,
|
||||
rmenu_xui_render,
|
||||
rmenu_xui_frame,
|
||||
generic_menu_init_list,
|
||||
rmenu_xui_init,
|
||||
rmenu_xui_free,
|
||||
NULL,
|
||||
@ -711,6 +710,7 @@ menu_ctx_driver_t menu_ctx_rmenu_xui = {
|
||||
rmenu_xui_navigation_set_visible,
|
||||
rmenu_xui_navigation_alphabet,
|
||||
rmenu_xui_navigation_alphabet,
|
||||
generic_menu_init_list,
|
||||
rmenu_xui_list_insert,
|
||||
rmenu_xui_list_free,
|
||||
rmenu_xui_list_clear,
|
||||
|
@ -2549,7 +2549,6 @@ menu_ctx_driver_t menu_ctx_xmb = {
|
||||
xmb_render_messagebox_internal,
|
||||
xmb_render,
|
||||
xmb_frame,
|
||||
generic_menu_init_list,
|
||||
xmb_init,
|
||||
xmb_free,
|
||||
xmb_context_reset,
|
||||
@ -2563,6 +2562,7 @@ menu_ctx_driver_t menu_ctx_xmb = {
|
||||
xmb_navigation_pointer_changed,
|
||||
xmb_navigation_alphabet,
|
||||
xmb_navigation_alphabet,
|
||||
generic_menu_init_list,
|
||||
xmb_list_insert,
|
||||
xmb_list_free,
|
||||
xmb_list_clear,
|
||||
|
@ -1010,7 +1010,6 @@ menu_ctx_driver_t menu_ctx_zarch = {
|
||||
zarch_get_message,
|
||||
zarch_render,
|
||||
zarch_frame,
|
||||
generic_menu_init_list,
|
||||
zarch_init,
|
||||
zarch_free,
|
||||
zarch_context_reset,
|
||||
@ -1024,6 +1023,7 @@ menu_ctx_driver_t menu_ctx_zarch = {
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
generic_menu_init_list,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
|
@ -208,8 +208,8 @@ void init_menu(void)
|
||||
if (!(driver->menu = (menu_handle_t*)menu_init(driver->menu_ctx)))
|
||||
rarch_fail(1, "init_menu()");
|
||||
|
||||
if (driver->menu_ctx->init_list)
|
||||
if (!driver->menu_ctx->init_list(driver->menu))
|
||||
if (driver->menu_ctx->lists_init)
|
||||
if (!driver->menu_ctx->lists_init(driver->menu))
|
||||
rarch_fail(1, "init_menu()");
|
||||
}
|
||||
|
||||
|
@ -110,7 +110,6 @@ typedef struct menu_ctx_driver
|
||||
void (*render_messagebox)(const char *msg);
|
||||
void (*render)(void);
|
||||
void (*frame)(void);
|
||||
bool (*init_list)(void*);
|
||||
void* (*init)(void);
|
||||
void (*free)(void*);
|
||||
void (*context_reset)(void);
|
||||
@ -125,6 +124,7 @@ typedef struct menu_ctx_driver
|
||||
void (*navigation_set_last)(void);
|
||||
void (*navigation_descend_alphabet)(size_t *);
|
||||
void (*navigation_ascend_alphabet)(size_t *);
|
||||
bool (*lists_init)(void*);
|
||||
void (*list_insert)(file_list_t *list, const char *, const char *, size_t);
|
||||
void (*list_free)(file_list_t *list, size_t, size_t);
|
||||
void (*list_clear)(file_list_t *list);
|
||||
|
Loading…
x
Reference in New Issue
Block a user