mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-21 04:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename menu_driver_resolve to menu_driver_get_ptr

Browse Source
This commit is contained in:
twinaphex 2015-03-21 23:56:42 +01:00
parent 5d0815a7b7
commit 508ade73f9
29 changed files with 211 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apple/iOS/menu.m
View File

@ -611,7 +611,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
const char *dir = NULL;
const char *label = NULL;
unsigned menu_type = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -732,7 +732,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
- (void)menuRefresh
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
if (!menu->need_refresh)
@ -745,7 +745,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
- (void)menuBack
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;

6
gfx/drivers/gx_gfx.c
View File

@ -234,7 +234,7 @@ static void gx_set_video_mode(void *data, unsigned fbWidth, unsigned lines,
unsigned modetype, level, viHeightMultiplier, viWidth, tvmode,
max_width, max_height, i;
gx_video_t *gx = (gx_video_t*)data;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -479,7 +479,7 @@ static void init_texture(void *data, unsigned width, unsigned height)
gx_video_t *gx = (gx_video_t*)data;
struct __gx_texobj *fb_ptr = (struct __gx_texobj*)&g_tex.obj;
struct __gx_texobj *menu_ptr = (struct __gx_texobj*)&menu_tex.obj;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
width &= ~3;
@ -1086,7 +1086,7 @@ static bool gx_frame(void *data, const void *frame,
if (gx->menu_texture_enable && gx->menu_data)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
{

26
menu/drivers/glui.c
View File

@ -52,7 +52,7 @@ static int glui_entry_iterate(unsigned action)
{
const char *label = NULL;
menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -205,7 +205,7 @@ static void glui_draw_cursor(gl_t *gl, float x, float y)
static void glui_get_message(const char *message)
{
glui_handle_t *glui = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -227,7 +227,7 @@ static void glui_render_messagebox(const char *message)
struct string_list *list = NULL;
glui_handle_t *glui = NULL;
gl_t *gl = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -271,7 +271,7 @@ static void glui_render(void)
{
glui_handle_t *glui = NULL;
gl_t *gl = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
settings_t *settings = config_get_ptr();
@ -331,7 +331,7 @@ static void glui_frame(void)
glui_handle_t *glui = NULL;
const char *core_name = NULL;
const char *core_version = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
const uint32_t normal_color = FONT_COLOR_ARGB_TO_RGBA(settings->menu.entry_normal_color);
const uint32_t hover_color = FONT_COLOR_ARGB_TO_RGBA(settings->menu.entry_hover_color);
@ -522,7 +522,7 @@ static void glui_free(void *data)
static void glui_context_destroy(void)
{
glui_handle_t *glui = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -539,7 +539,7 @@ static void glui_context_destroy(void)
static bool glui_load_wallpaper(void *data)
{
glui_handle_t *glui = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return false;
@ -562,7 +562,7 @@ static void glui_context_reset(void)
{
const char *path = NULL;
glui_handle_t *glui = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -601,7 +601,7 @@ static void glui_context_reset(void)
static void glui_navigation_clear(bool pending_push)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
menu->begin = 0;
}
@ -609,7 +609,7 @@ static void glui_navigation_clear(bool pending_push)
static void glui_navigation_set(bool scroll)
{
glui_handle_t *glui = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -635,21 +635,21 @@ static void glui_navigation_set(bool scroll)
static void glui_navigation_set_last(void)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
glui_navigation_set(true);
}
static void glui_navigation_descend_alphabet(size_t *unused)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
glui_navigation_set(true);
}
static void glui_navigation_ascend_alphabet(size_t *unused)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
glui_navigation_set(true);
}

2
menu/drivers/ios.c
View File

@ -28,7 +28,7 @@
static int ios_entry_iterate(unsigned action)
{
ios_handle_t *ios = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;

22
menu/drivers/rgui.c
View File

@ -57,7 +57,7 @@ static int rgui_entry_iterate(unsigned action)
{
const char *label = NULL;
menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
if (!menu)
@ -242,7 +242,7 @@ static bool rguidisp_init_font(menu_handle_t *menu)
static void rgui_render_background(void)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -273,7 +273,7 @@ static void rgui_render_messagebox(const char *message)
unsigned width, glyphs_width, height;
uint16_t color;
struct string_list *list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -356,7 +356,7 @@ static void rgui_render(void)
const char *label = NULL;
const char *core_name = NULL;
const char *core_version = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
@ -589,7 +589,7 @@ static void rgui_free(void *data)
static void rgui_set_texture(void)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
driver_t *driver = driver_get_ptr();
@ -613,14 +613,14 @@ static void rgui_set_texture(void)
static void rgui_navigation_clear(bool pending_push)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
menu->begin = 0;
}
static void rgui_navigation_set(bool scroll)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -641,21 +641,21 @@ static void rgui_navigation_set(bool scroll)
static void rgui_navigation_set_last(void)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
rgui_navigation_set(true);
}
static void rgui_navigation_descend_alphabet(size_t *unused)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
rgui_navigation_set(true);
}
static void rgui_navigation_ascend_alphabet(size_t *unused)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
rgui_navigation_set(true);
}
@ -663,7 +663,7 @@ static void rgui_navigation_ascend_alphabet(size_t *unused)
static void rgui_populate_entries(const char *path,
const char *label, unsigned k)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
rgui_navigation_set(true);
}

31
menu/drivers/rmenu.c
View File

@ -68,7 +68,7 @@ static int rmenu_entry_iterate(unsigned action)
{
const char *label = NULL;
menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -93,7 +93,7 @@ static void rmenu_render_messagebox(const char *message)
struct font_params font_parms;
size_t i, j;
struct string_list *list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -144,20 +144,19 @@ end:
static void rmenu_render(void)
{
size_t begin, end;
size_t i, j;
size_t begin, end, i, j;
struct font_params font_parms;
char title[256];
char title_buf[256], title_msg[64];
const char *dir = NULL;
const char *label = NULL;
const char *core_name = NULL;
char title[256], title_buf[256];
char title_msg[64];
const char *dir = NULL;
const char *label = NULL;
const char *core_name = NULL;
const char *core_version = NULL;
unsigned menu_type = 0;
menu_handle_t *menu = menu_driver_resolve();
global_t *global = global_get_ptr();
driver_t *driver = driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
unsigned menu_type = 0;
menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr();
driver_t *driver = driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
if (!menu)
return;
@ -298,7 +297,7 @@ static void rmenu_render(void)
static void rmenu_set_texture(void)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -340,7 +339,7 @@ static void rmenu_wallpaper_set_defaults(char *menu_bg, size_t sizeof_menu_bg)
static void rmenu_context_reset(void)
{
char menu_bg[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)

12
menu/drivers/rmenu_xui.cpp
View File

@ -62,7 +62,7 @@ static int rmenu_xui_entry_iterate(unsigned action)
{
const char *label = NULL;
menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -423,7 +423,7 @@ static void rmenu_xui_frame(void)
D3DVIEWPORT vp_full;
LPDIRECT3DDEVICE d3dr;
d3d_video_t *d3d = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -559,7 +559,7 @@ static void rmenu_xui_render(void)
char title[PATH_MAX_LENGTH];
const char *dir = NULL, *label = NULL;
unsigned menu_type = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
if (!menu)
@ -650,7 +650,7 @@ static void rmenu_xui_render(void)
static void rmenu_xui_populate_entries(const char *path,
const char *label, unsigned i)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -663,7 +663,7 @@ static void rmenu_xui_populate_entries(const char *path,
static void rmenu_xui_navigation_clear(bool pending_push)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
XuiListSetCurSelVisible(m_menulist, menu->navigation.selection_ptr);
@ -671,7 +671,7 @@ static void rmenu_xui_navigation_clear(bool pending_push)
static void rmenu_xui_navigation_set_visible(void)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
XuiListSetCurSelVisible(m_menulist, menu->navigation.selection_ptr);

54
menu/drivers/xmb.c
View File

@ -247,9 +247,9 @@ static float xmb_item_y(xmb_handle_t *xmb, int i, size_t current)
static int xmb_entry_iterate(unsigned action)
{
const char *label = NULL;
const char *label = NULL;
menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -486,8 +486,8 @@ static void xmb_frame_background(settings_t *settings,
static void xmb_render_messagebox_internal(const char *message)
{
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_resolve();
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -505,9 +505,9 @@ static void xmb_frame_messagebox(const char *message)
int x, y;
unsigned i;
struct string_list *list = NULL;
gl_t *gl = NULL;
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_resolve();
gl_t *gl = NULL;
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -547,8 +547,8 @@ end:
static void xmb_selection_pointer_changed(void)
{
unsigned i, current, end;
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_resolve();
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -590,7 +590,7 @@ static void xmb_selection_pointer_changed(void)
static void xmb_list_open_old(xmb_handle_t *xmb, file_list_t *list, int dir, size_t current)
{
unsigned i;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -617,7 +617,7 @@ static void xmb_list_open_old(xmb_handle_t *xmb, file_list_t *list, int dir, siz
static void xmb_list_open_new(xmb_handle_t *xmb, file_list_t *list, int dir, size_t current)
{
unsigned i;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -731,7 +731,7 @@ static xmb_node_t* xmb_get_userdata_from_core(xmb_handle_t *xmb, core_info_t *in
static void xmb_push_animations(xmb_node_t *node, float ia, float ix)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -744,7 +744,7 @@ static void xmb_list_switch_old(xmb_handle_t *xmb, file_list_t *list, int dir, s
{
unsigned i;
size_t end = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -768,7 +768,7 @@ static void xmb_list_switch_new(xmb_handle_t *xmb, file_list_t *list, int dir, s
{
unsigned i;
size_t end = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -797,7 +797,7 @@ static void xmb_list_switch_new(xmb_handle_t *xmb, file_list_t *list, int dir, s
static void xmb_set_title(xmb_handle_t *xmb)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -831,7 +831,7 @@ static void xmb_list_switch(xmb_handle_t *xmb)
{
unsigned j;
int dir = -1;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -881,7 +881,7 @@ static void xmb_list_open(xmb_handle_t *xmb)
{
unsigned j;
int dir = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -940,7 +940,7 @@ static void xmb_populate_entries(const char *path,
const char *label, unsigned k)
{
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -1212,7 +1212,7 @@ static void xmb_render(void)
unsigned i, current, end;
runloop_t *runloop = rarch_main_get_ptr();
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -1250,7 +1250,7 @@ static void xmb_frame(void)
const char *core_version = NULL;
xmb_handle_t *xmb = NULL;
gl_t *gl = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -1541,7 +1541,7 @@ static bool xmb_font_init_first(const gl_font_renderer_t **font_driver,
static bool xmb_load_wallpaper(void *data)
{
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return false;
@ -1576,7 +1576,7 @@ static void xmb_context_reset(void)
gl_t *gl = NULL;
xmb_handle_t *xmb = NULL;
xmb_node_t *node = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -1815,7 +1815,7 @@ static void xmb_list_insert(file_list_t *list,
int current = 0, i = list_size;
xmb_node_t *node = NULL;
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -1869,7 +1869,7 @@ static void xmb_list_cache(bool horizontal, unsigned action)
{
size_t stack_size;
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -1922,7 +1922,7 @@ static void xmb_context_destroy(void)
{
unsigned i;
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -1951,8 +1951,8 @@ static void xmb_context_destroy(void)
static void xmb_toggle(bool menu_on)
{
unsigned i;
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_resolve();
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;

4
menu/menu.c
View File

@ -333,7 +333,7 @@ void menu_free(void *data)
void menu_apply_deferred_settings(void)
{
rarch_setting_t *setting = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -412,7 +412,7 @@ int menu_iterate(retro_input_t input,
int32_t ret = 0;
unsigned action = menu_input_frame(input, trigger_input);
runloop_t *runloop = rarch_main_get_ptr();
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();

2
menu/menu_database.c
View File

@ -59,7 +59,7 @@ void menu_database_free(void *data)
bool menu_database_realloc(const char *path,
bool force)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return false;

2
menu/menu_driver.c
View File

@ -166,7 +166,7 @@ void init_menu(void)
}
}
menu_handle_t *menu_driver_resolve(void)
menu_handle_t *menu_driver_get_ptr(void)
{
driver_t *driver = driver_get_ptr();
if (!driver->menu)

2
menu/menu_driver.h
View File

@ -286,7 +286,7 @@ void find_menu_driver(void);
void init_menu(void);
menu_handle_t *menu_driver_resolve(void);
menu_handle_t *menu_driver_get_ptr(void);
#ifdef __cplusplus
}

12
menu/menu_entries_cbs.c
View File

@ -29,7 +29,7 @@
void menu_entries_common_load_content(bool persist)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -162,12 +162,12 @@ void menu_entries_cbs_init(void *data,
const char *path, const char *label,
unsigned type, size_t idx)
{
struct string_list *str_list = NULL;
char elem0[PATH_MAX_LENGTH], elem1[PATH_MAX_LENGTH];
const char *menu_label = NULL;
menu_file_list_cbs_t *cbs = NULL;
file_list_t *list = (file_list_t*)data;
menu_handle_t *menu = menu_driver_resolve();
struct string_list *str_list = NULL;
const char *menu_label = NULL;
menu_file_list_cbs_t *cbs = NULL;
file_list_t *list = (file_list_t*)data;
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;

2
menu/menu_entries_cbs_cancel.c
View File

@ -28,7 +28,7 @@ static int action_cancel_lookup_setting(const char *path,
static int action_cancel_pop_default(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;

30
menu/menu_entries_cbs_deferred_push.c
View File

@ -283,7 +283,7 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata,
file_list_t *list = NULL;
file_list_t *menu_list = NULL;
struct string_list *str_list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -564,7 +564,7 @@ static int deferred_push_core_list_deferred(void *data, void *userdata,
file_list_t *list = NULL;
file_list_t *menu_list = NULL;
global_t *global = global_get_ptr();
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -598,7 +598,7 @@ static int deferred_push_database_manager_list_deferred(void *data, void *userda
{
file_list_t *list = NULL;
file_list_t *menu_list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -627,7 +627,7 @@ static int deferred_push_cursor_manager_list_deferred(void *data, void *userdata
config_file_t *conf = NULL;
file_list_t *list = NULL;
file_list_t *menu_list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
return -1;
@ -672,7 +672,7 @@ static int deferred_push_cursor_manager_list_deferred_query_subsearch(
bool add_quotes = true;
file_list_t *list = NULL;
file_list_t *menu_list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -970,7 +970,7 @@ static int deferred_push_video_shader_parameters_common(void *data, void *userda
static int deferred_push_video_shader_preset_parameters(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
if (!menu->shader)
@ -1003,7 +1003,7 @@ static int deferred_push_settings(void *data, void *userdata,
rarch_setting_t *setting = NULL;
file_list_t *list = NULL;
file_list_t *menu_list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
@ -1073,7 +1073,7 @@ static int deferred_push_settings_subgroup(void *data, void *userdata,
struct string_list *str_list = NULL;
file_list_t *list = NULL;
file_list_t *menu_list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -1143,7 +1143,7 @@ static int deferred_push_settings_subgroup(void *data, void *userdata,
static int deferred_push_category(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -1156,7 +1156,7 @@ static int deferred_push_video_options(void *data, void *userdata,
{
file_list_t *list = NULL;
file_list_t *menu_list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -1193,7 +1193,7 @@ static int deferred_push_shader_options(void *data, void *userdata,
struct video_shader *shader = NULL;
file_list_t *list = NULL;
file_list_t *menu_list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -1335,7 +1335,7 @@ static int push_perfcounter_generic(
{
file_list_t *list = NULL;
file_list_t *menu_list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -1580,7 +1580,7 @@ static size_t core_len;
int cb_core_updater_list(void *data_, size_t len)
{
char *data = (char*)data_;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -1665,7 +1665,7 @@ static int deferred_push_content_actions(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
file_list_t *list = (file_list_t*)data;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr();
if (!menu)
return -1;
@ -1704,7 +1704,7 @@ static int deferred_push_content_actions(void *data, void *userdata,
int deferred_push_content_list(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
return menu_entries_deferred_push((file_list_t*)data, menu->menu_list->selection_buf);

26
menu/menu_entries_cbs_iterate.c
View File

@ -34,7 +34,7 @@ static int archive_open(void)
const char *menu_label = NULL;
const char* path = NULL;
unsigned int type = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -68,7 +68,7 @@ static int archive_load(void)
const char *menu_label = NULL;
const char* path = NULL;
unsigned int type = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -111,7 +111,7 @@ static int archive_load(void)
static int load_or_open_zip_iterate(unsigned action)
{
char msg[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -145,7 +145,7 @@ static int load_or_open_zip_iterate(unsigned action)
static INLINE struct video_shader *shader_manager_get_current_shader(const char *label, unsigned type)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return NULL;
@ -159,7 +159,7 @@ static INLINE struct video_shader *shader_manager_get_current_shader(const char
static int mouse_post_iterate(menu_file_list_cbs_t *cbs, const char *path,
const char *label, unsigned type, unsigned action)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -244,7 +244,7 @@ static int action_iterate_help(const char *label, unsigned action)
};
char desc[ARRAY_SIZE(binds)][64];
char msg[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
@ -305,7 +305,7 @@ static int action_iterate_info(const char *label, unsigned action)
unsigned info_type = 0;
rarch_setting_t *current_setting = NULL;
file_list_t *list = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
return 0;
@ -382,7 +382,7 @@ static int action_iterate_menu_viewport(const char *label, unsigned action)
unsigned type = 0;
global_t *global = global_get_ptr();
video_viewport_t *custom = &global->console.screen.viewports.custom_vp;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
@ -558,7 +558,7 @@ static int action_iterate_menu_viewport(const char *label, unsigned action)
static int action_iterate_custom_bind(const char *label, unsigned action)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
if (menu_input_bind_iterate())
@ -568,7 +568,7 @@ static int action_iterate_custom_bind(const char *label, unsigned action)
static int action_iterate_custom_bind_keyboard(const char *label, unsigned action)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
if (menu_input_bind_iterate_keyboard())
@ -578,7 +578,7 @@ static int action_iterate_custom_bind_keyboard(const char *label, unsigned actio
static int action_iterate_message(const char *label, unsigned action)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -597,7 +597,7 @@ static int action_iterate_message(const char *label, unsigned action)
static int mouse_iterate(unsigned *action)
{
const struct retro_keybind *binds[MAX_USERS];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
@ -684,7 +684,7 @@ static int action_iterate_main(const char *label, unsigned action)
const char *label_offset = NULL;
const char *path_offset = NULL;
menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
if (!menu)

78
menu/menu_entries_cbs_ok.c
View File

@ -46,7 +46,7 @@ static int menu_action_setting_set_current_string_path(
static int action_ok_rdb_playlist_entry(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -58,7 +58,7 @@ static int action_ok_rdb_playlist_entry(const char *path,
static int action_ok_playlist_entry(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -89,7 +89,7 @@ static int action_ok_shader_pass_load(const char *path,
const char *label, unsigned type, size_t idx)
{
const char *menu_path = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -120,7 +120,7 @@ static int action_ok_shader_pass(const char *path,
const char *label, unsigned type, size_t idx)
{
hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
return -1;
@ -136,7 +136,7 @@ static int action_ok_shader_pass(const char *path,
static int action_ok_shader_parameters(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
return menu_list_push_stack_refresh(
@ -148,7 +148,7 @@ static int action_ok_shader_parameters(const char *path,
static int action_ok_push_generic_list(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -164,7 +164,7 @@ static int action_ok_push_generic_list(const char *path,
static int action_ok_push_default(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
return menu_list_push_stack_refresh(
@ -175,7 +175,7 @@ static int action_ok_push_default(const char *path,
static int action_ok_shader_preset(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -190,7 +190,7 @@ static int action_ok_shader_preset(const char *path,
static int action_ok_push_content_list(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -205,7 +205,7 @@ static int action_ok_push_content_list(const char *path,
static int action_ok_disk_image_append_list(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -220,7 +220,7 @@ static int action_ok_configurations_list(const char *path,
const char *label, unsigned type, size_t idx)
{
settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
const char *dir = settings->menu_config_directory;
if (!menu)
return -1;
@ -234,7 +234,7 @@ static int action_ok_configurations_list(const char *path,
static int action_ok_cheat_file(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
return -1;
@ -254,7 +254,7 @@ static int action_ok_audio_dsp_plugin(const char *path,
static int action_ok_video_filter(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
return -1;
@ -270,7 +270,7 @@ static int action_ok_core_updater_list(const char *path,
const char *label, unsigned type, size_t idx)
{
char url_path[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -306,7 +306,7 @@ static int action_ok_core_updater_list(const char *path,
static int action_ok_remap_file(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -321,7 +321,7 @@ static int action_ok_remap_file(const char *path,
static int action_ok_core_list(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -338,7 +338,7 @@ static int action_ok_remap_file_load(const char *path,
{
const char *menu_path = NULL;
char remap_path[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -361,7 +361,7 @@ static int action_ok_video_filter_file_load(const char *path,
{
char filter_path[PATH_MAX_LENGTH];
const char *menu_path = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -390,7 +390,7 @@ static int action_ok_cheat_file_load(const char *path,
{
const char *menu_path = NULL;
char cheat_path[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr();
if (!menu)
return -1;
@ -422,7 +422,7 @@ static int action_ok_menu_wallpaper_load(const char *path,
const char *menu_label = NULL;
const char *menu_path = NULL;
rarch_setting_t *setting = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
return -1;
@ -455,7 +455,7 @@ static int action_ok_shader_preset_load(const char *path,
{
const char *menu_path = NULL;
char shader_path[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -514,7 +514,7 @@ static int action_ok_path_use_directory(const char *path,
const char *menu_label = NULL;
const char *menu_path = NULL;
rarch_setting_t *setting = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -538,7 +538,7 @@ static int action_ok_path_use_directory(const char *path,
static int action_ok_core_load_deferred(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -565,7 +565,7 @@ static int action_ok_rdb_entry(const char *path,
const char *label, unsigned type, size_t idx)
{
char tmp[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -589,7 +589,7 @@ static int action_ok_core_load(const char *path,
const char *label, unsigned type, size_t idx)
{
const char *menu_path = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -633,7 +633,7 @@ static int action_ok_core_download(const char *path,
static int action_ok_compressed_archive_push(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -653,7 +653,7 @@ static int action_ok_directory_push(const char *path,
const char *menu_path = NULL;
const char *menu_label = NULL;
char cat_path[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -673,7 +673,7 @@ static int action_ok_database_manager_list(const char *path,
const char *label, unsigned type, size_t idx)
{
char rdb_path[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -697,7 +697,7 @@ static int action_ok_cursor_manager_list(const char *path,
const char *label, unsigned type, size_t idx)
{
char cursor_path[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu)
@ -718,7 +718,7 @@ static int action_ok_config_load(const char *path,
{
const char *menu_path = NULL;
char config[PATH_MAX_LENGTH];
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -743,7 +743,7 @@ static int action_ok_disk_image_append(const char *path,
{
char image[PATH_MAX_LENGTH];
const char *menu_path = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -765,7 +765,7 @@ static int action_ok_file_load_with_detect_core(const char *path,
{
int ret;
const char *menu_path = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -802,7 +802,7 @@ static int action_ok_file_load(const char *path,
const char *menu_label = NULL;
const char *menu_path = NULL;
rarch_setting_t *setting = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr();
if (!menu)
@ -841,7 +841,7 @@ static int action_ok_set_path(const char *path,
const char *menu_path = NULL;
const char *menu_label = NULL;
rarch_setting_t *setting = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -866,7 +866,7 @@ static int action_ok_custom_viewport(const char *path,
/* Start with something sane. */
global_t *global = global_get_ptr();
video_viewport_t *custom = &global->console.screen.viewports.custom_vp;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
@ -980,7 +980,7 @@ static int action_ok_screenshot(const char *path,
static int action_ok_file_load_or_resume(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr();
if (!menu)
@ -1020,7 +1020,7 @@ static int action_ok_rdb_entry_submenu(const char *path,
int len = 0;
struct string_list *str_list = NULL;
struct string_list *str_list2 = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -1082,7 +1082,7 @@ static int action_ok_rdb_entry_submenu(const char *path,
static int action_ok_help(const char *path,
const char *label, unsigned type, size_t idx)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -1166,7 +1166,7 @@ void menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
const char *elem0, const char *elem1, const char *menu_label)
{
rarch_setting_t *setting = menu_setting_find(label);
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;

4
menu/menu_entries_cbs_refresh.c
View File

@ -19,8 +19,8 @@
static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
{
int ret = 0;
menu_handle_t *menu = menu_driver_resolve();
int ret = 0;
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;

10
menu/menu_entries_cbs_representation.c
View File

@ -89,7 +89,7 @@ static void menu_action_setting_disp_set_label_shader_filter_pass(
"Linear",
"Nearest"
};
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -142,7 +142,7 @@ static void menu_action_setting_disp_set_label_shader_num_passes(
const char *path,
char *path_buf, size_t path_buf_size)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -166,7 +166,7 @@ static void menu_action_setting_disp_set_label_shader_pass(
char *path_buf, size_t path_buf_size)
{
unsigned pass = (type - MENU_SETTINGS_SHADER_PASS_0);
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -255,7 +255,7 @@ static void menu_action_setting_disp_set_label_shader_preset_parameter(
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
const struct video_shader_parameter *param = NULL;
#endif
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -290,7 +290,7 @@ static void menu_action_setting_disp_set_label_shader_scale_pass(
{
unsigned pass = 0;
unsigned scale_value = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;

2
menu/menu_entries_cbs_select.c
View File

@ -20,7 +20,7 @@
static int action_select_default(unsigned type, const char *label,
unsigned action)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return 0;
menu_list_push_stack(menu->menu_list, "", "info_screen",

12
menu/menu_entries_cbs_start.c
View File

@ -105,7 +105,7 @@ static int action_start_shader_action_preset_parameter(unsigned type, const char
#ifdef HAVE_SHADER_MANAGER
struct video_shader *shader = NULL;
struct video_shader_parameter *param = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -127,7 +127,7 @@ static int action_start_shader_pass(unsigned type, const char *label,
hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0;
struct video_shader *shader = NULL;
struct video_shader_pass *shader_pass = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -151,7 +151,7 @@ static int action_start_shader_scale_pass(unsigned type, const char *label,
struct video_shader *shader = NULL;
struct video_shader_pass *shader_pass = NULL;
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -179,7 +179,7 @@ static int action_start_shader_filter_pass(unsigned type, const char *label,
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
struct video_shader *shader = NULL;
struct video_shader_pass *shader_pass = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -201,7 +201,7 @@ static int action_start_shader_num_passes(unsigned type, const char *label,
{
#ifdef HAVE_SHADER_MANAGER
struct video_shader *shader = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -222,7 +222,7 @@ static int action_start_cheat_num_passes(unsigned type, const char *label,
{
global_t *global = global_get_ptr();
cheat_manager_t *cheat = global->cheat;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;

14
menu/menu_entries_cbs_toggle.c
View File

@ -61,7 +61,7 @@ static int shader_action_parameter_preset_toggle(unsigned type, const char *labe
#ifdef HAVE_SHADER_MANAGER
struct video_shader *shader = NULL;
struct video_shader_parameter *param = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -159,7 +159,7 @@ static int action_toggle_scroll(unsigned type, const char *label,
unsigned action, bool wraparound)
{
unsigned scroll_speed = 0, fast_scroll_speed = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -200,7 +200,7 @@ static int action_toggle_mainmenu(unsigned type, const char *label,
menu_file_list_cbs_t *cbs = NULL;
unsigned push_list = 0;
driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -265,7 +265,7 @@ static int action_toggle_shader_scale_pass(unsigned type, const char *label,
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
struct video_shader *shader = NULL;
struct video_shader_pass *shader_pass = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -302,7 +302,7 @@ static int action_toggle_shader_filter_pass(unsigned type, const char *label,
unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
struct video_shader *shader = NULL;
struct video_shader_pass *shader_pass = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -345,7 +345,7 @@ static int action_toggle_cheat_num_passes(unsigned type, const char *label,
unsigned new_size = 0;
global_t *global = global_get_ptr();
cheat_manager_t *cheat = global->cheat;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;
@ -377,7 +377,7 @@ static int action_toggle_shader_num_passes(unsigned type, const char *label,
{
#ifdef HAVE_SHADER_MANAGER
struct video_shader *shader = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;

2
menu/menu_entries_cbs_up_or_down.c
View File

@ -22,7 +22,7 @@ static int action_bind_up_or_down_generic(unsigned type, const char *label,
unsigned action)
{
unsigned scroll_speed = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return -1;

20
menu/menu_input.c
View File

@ -37,7 +37,7 @@ void menu_input_key_start_line(const char *label,
const char *label_setting, unsigned type, unsigned idx,
input_keyboard_line_complete_t cb)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -52,7 +52,7 @@ void menu_input_key_start_line(const char *label,
static void menu_input_key_end_line(void)
{
driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -67,7 +67,7 @@ static void menu_input_key_end_line(void)
static void menu_input_search_callback(void *userdata, const char *str)
{
size_t idx;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -80,7 +80,7 @@ static void menu_input_search_callback(void *userdata, const char *str)
void menu_input_st_uint_callback(void *userdata, const char *str)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -99,7 +99,7 @@ void menu_input_st_uint_callback(void *userdata, const char *str)
void menu_input_st_hex_callback(void *userdata, const char *str)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -121,7 +121,7 @@ void menu_input_st_hex_callback(void *userdata, const char *str)
void menu_input_st_string_callback(void *userdata, const char *str)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -173,7 +173,7 @@ void menu_input_st_cheat_callback(void *userdata, const char *str)
void menu_input_search_start(void)
{
driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -381,7 +381,7 @@ int menu_input_bind_iterate(void)
{
char msg[PATH_MAX_LENGTH];
struct menu_bind_state binds;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -430,7 +430,7 @@ int menu_input_bind_iterate_keyboard(void)
int64_t current;
int timeout = 0;
bool timed_out = false;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
@ -491,7 +491,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
| (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT)
| (1ULL << RETRO_DEVICE_ID_JOYPAD_L)
| (1ULL << RETRO_DEVICE_ID_JOYPAD_R);
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)

18
menu/menu_list.c
View File

@ -31,7 +31,7 @@
**/
static void menu_entries_refresh(file_list_t *list)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
if (!list)
@ -100,7 +100,7 @@ static void menu_entries_build_scroll_indices(file_list_t *list)
int current;
bool current_is_dir;
menu_navigation_t *nav = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu || !list)
return;
@ -243,7 +243,7 @@ void menu_list_flush_stack(menu_list_t *list,
const char *path = NULL;
const char *label = NULL;
unsigned type = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu || !list)
return;
@ -263,7 +263,7 @@ void menu_list_flush_stack_by_needle(menu_list_t *list,
const char *path = NULL;
const char *label = NULL;
unsigned type = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu || !list)
return;
@ -279,7 +279,7 @@ void menu_list_flush_stack_by_needle(menu_list_t *list,
void menu_list_pop_stack(menu_list_t *list)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu || !list)
return;
@ -300,7 +300,7 @@ void menu_list_pop_stack_by_needle(menu_list_t *list,
const char *path = NULL;
const char *label = NULL;
unsigned type = 0;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu || !list)
return;
@ -384,7 +384,7 @@ void menu_list_push_refresh(file_list_t *list,
const char *path, const char *label,
unsigned type, size_t directory_ptr)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu || !list)
return;
@ -403,7 +403,7 @@ void menu_list_push_stack(menu_list_t *list, const char *path, const char *label
int menu_list_push_stack_refresh(menu_list_t *list, const char *path, const char *label,
unsigned type, size_t directory_ptr)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
return -1;
@ -440,7 +440,7 @@ void menu_list_sort_on_alt(file_list_t *list)
int menu_list_populate_generic(file_list_t *list, const char *path,
const char *label, unsigned type)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)

4
menu/menu_navigation.c
View File

@ -125,8 +125,8 @@ void menu_navigation_set(menu_navigation_t *nav,
**/
void menu_navigation_set_last(menu_navigation_t *nav)
{
driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_resolve();
driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu || !nav)
return;

8
retroarch.c
View File

@ -2048,7 +2048,7 @@ void rarch_main_set_state(unsigned cmd)
case RARCH_ACTION_STATE_MENU_RUNNING:
#ifdef HAVE_MENU
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
@ -2312,7 +2312,7 @@ bool rarch_main_command(unsigned cmd)
rarch_main_command(RARCH_CMD_LOAD_CORE_DEINIT);
{
#ifdef HAVE_MENU
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
rarch_update_system_info(&global->menu.info,
&menu->load_no_content);
@ -2378,7 +2378,7 @@ bool rarch_main_command(unsigned cmd)
break;
case RARCH_CMD_PREPARE_DUMMY:
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
*global->fullpath = '\0';
(void)menu;
@ -3011,7 +3011,7 @@ void rarch_playlist_load_content(content_playlist_t *playlist,
{
const char *path = NULL;
const char *core_path = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
content_playlist_get_index(playlist,

2
runloop.c
View File

@ -1125,7 +1125,7 @@ int rarch_main_iterate(void)
#ifdef HAVE_MENU
if (runloop->is_menu)
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
if (menu_iterate(input, old_input, trigger_input) == -1)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);

10
settings.c
View File

@ -854,7 +854,7 @@ static int load_content_action_toggle(void *data, unsigned action,
static int setting_action_ok_bind_all(void *data, unsigned action)
{
rarch_setting_t *setting = (rarch_setting_t*)data;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -898,7 +898,7 @@ static int setting_action_ok_bind_defaults(void *data, unsigned action)
struct retro_keybind *target = NULL;
const struct retro_keybind *def_binds = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
@ -1063,7 +1063,7 @@ static int setting_bind_action_ok(void *data, unsigned action)
{
struct retro_keybind *keybind = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr();
if (!setting)
@ -2936,7 +2936,7 @@ void setting_get_label(file_list_t *list, char *type_str,
{
rarch_setting_t *setting_data = NULL;
rarch_setting_t *setting = NULL;
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu || !menu->menu_list || !label)
return;
@ -3017,7 +3017,7 @@ static void general_write_handler(void *data)
if (!strcmp(setting->name, "help"))
{
menu_handle_t *menu = menu_driver_resolve();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu || !menu->menu_list)
return;