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

Pass userdata to toggle callback

Browse Source
This commit is contained in:
twinaphex 2015-12-10 16:54:46 +01:00
parent 19f0a23e7e
commit 71548e2e10
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
menu/drivers/xmb.c
View File

@ -2499,16 +2499,10 @@ static void xmb_context_destroy(void)
menu_display_free_main_font();
}
static void xmb_toggle(bool menu_on)
static void xmb_toggle(void *userdata, bool menu_on)
{
bool tmp = false;
xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
xmb = (xmb_handle_t*)menu->userdata;
xmb_handle_t *xmb = (xmb_handle_t*)userdata;
if (!xmb)
return;

3
menu/menu_driver.c
View File

@ -278,9 +278,10 @@ static void menu_driver_toggle(bool latch)
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
rarch_system_info_t *system = rarch_system_info_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
if (menu_driver->toggle)
menu_driver->toggle(latch);
menu_driver->toggle(menu->userdata, latch);
if (latch)
menu_driver_ctl(RARCH_MENU_CTL_SET_ALIVE, NULL);

2
menu/menu_driver.h
View File

@ -260,7 +260,7 @@ typedef struct menu_ctx_driver
void (*populate_entries)(void *data,
const char *path, const char *label,
unsigned k);
void (*toggle)(bool);
void (*toggle)(void *userdata, bool);
void (*navigation_clear)(bool);
void (*navigation_decrement)(void);
void (*navigation_increment)(void);