mirror of
https://github.com/libretro/RetroArch
synced 2025-03-02 19:13:34 +00:00
(Menu) init_lists was not used either
This commit is contained in:
parent
274cfe0f9f
commit
e330f03124
@ -631,7 +631,6 @@ menu_ctx_driver_t menu_ctx_glui = {
|
||||
NULL,
|
||||
glui_frame,
|
||||
glui_init,
|
||||
NULL,
|
||||
glui_free,
|
||||
glui_context_reset,
|
||||
NULL,
|
||||
|
@ -95,7 +95,6 @@ menu_ctx_driver_t menu_ctx_ios = {
|
||||
NULL, // render
|
||||
NULL, // frame
|
||||
ios_init, // init
|
||||
NULL, // init_lists
|
||||
ios_free, // free
|
||||
NULL, // context_reset
|
||||
NULL, // context_destroy
|
||||
|
@ -660,7 +660,6 @@ menu_ctx_driver_t menu_ctx_rgui = {
|
||||
rgui_render,
|
||||
NULL,
|
||||
rgui_init,
|
||||
NULL,
|
||||
rgui_free,
|
||||
NULL,
|
||||
NULL,
|
||||
|
@ -373,7 +373,6 @@ menu_ctx_driver_t menu_ctx_rmenu = {
|
||||
rmenu_render,
|
||||
NULL,
|
||||
rmenu_init,
|
||||
NULL,
|
||||
rmenu_free,
|
||||
rmenu_context_reset,
|
||||
rmenu_context_destroy,
|
||||
|
@ -694,7 +694,6 @@ menu_ctx_driver_t menu_ctx_rmenu_xui = {
|
||||
rmenu_xui_render,
|
||||
rmenu_xui_frame,
|
||||
rmenu_xui_init,
|
||||
NULL,
|
||||
rmenu_xui_free,
|
||||
NULL,
|
||||
NULL,
|
||||
|
@ -1698,7 +1698,6 @@ menu_ctx_driver_t menu_ctx_xmb = {
|
||||
NULL,
|
||||
xmb_frame,
|
||||
xmb_init,
|
||||
NULL,
|
||||
xmb_free,
|
||||
xmb_context_reset,
|
||||
xmb_context_destroy,
|
||||
|
26
menu/menu.c
26
menu/menu.c
@ -215,32 +215,6 @@ void menu_free_list(void *data)
|
||||
menu->list_settings = NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* menu_init_list:
|
||||
* @data : Menu handle.
|
||||
*
|
||||
* Initialize menu lists.
|
||||
* Will be performed after menu_init().
|
||||
*
|
||||
* Returns: true (1) if successful, otherwise false (0).
|
||||
**/
|
||||
bool menu_init_list(void *data)
|
||||
{
|
||||
menu_handle_t *menu = (menu_handle_t*)data;
|
||||
|
||||
if (!menu)
|
||||
return false;
|
||||
|
||||
if (!menu_entries_init(menu))
|
||||
return false;
|
||||
|
||||
if (driver.menu_ctx && driver.menu_ctx->init_lists)
|
||||
if (!(driver.menu_ctx->init_lists(menu)))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* menu_free:
|
||||
* @info : Menu handle.
|
||||
|
11
menu/menu.h
11
menu/menu.h
@ -155,17 +155,6 @@ void *menu_init(const void *data);
|
||||
**/
|
||||
void menu_free_list(void *data);
|
||||
|
||||
/**
|
||||
* menu_init_list:
|
||||
* @data : Menu handle.
|
||||
*
|
||||
* Initialize menu lists.
|
||||
* Will be performed after menu_init().
|
||||
*
|
||||
* Returns: true (1) if successful, otherwise false (0).
|
||||
**/
|
||||
bool menu_init_list(void *data);
|
||||
|
||||
/**
|
||||
* menu_iterate:
|
||||
* @input : input sample for this frame
|
||||
|
@ -18,6 +18,7 @@
|
||||
#include <string/string_list.h>
|
||||
#include "menu_driver.h"
|
||||
#include "menu.h"
|
||||
#include "menu_entries.h"
|
||||
#include "../driver.h"
|
||||
#include "../general.h"
|
||||
|
||||
@ -153,7 +154,7 @@ void init_menu(void)
|
||||
rarch_fail(1, "init_menu()");
|
||||
}
|
||||
|
||||
if (!(menu_init_list(driver.menu)))
|
||||
if (!(menu_entries_init(driver.menu)))
|
||||
{
|
||||
RARCH_ERR("Cannot initialize menu lists.\n");
|
||||
rarch_fail(1, "init_menu()");
|
||||
|
@ -180,7 +180,6 @@ typedef struct menu_ctx_driver
|
||||
void (*render)(void);
|
||||
void (*frame)(void);
|
||||
void* (*init)(void);
|
||||
bool (*init_lists)(void*);
|
||||
void (*free)(void*);
|
||||
void (*context_reset)(void*);
|
||||
void (*context_destroy)(void*);
|
||||
|
Loading…
x
Reference in New Issue
Block a user