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

Rename the two variables

Browse Source
This commit is contained in:
twinaphex 2015-12-05 13:09:27 +01:00
parent d3bc47c6dc
commit 688ddcfd9e
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
driver.h
View File

@ -201,8 +201,8 @@ typedef struct driver
bool location_active;
#ifdef HAVE_MENU
menu_handle_t *menu;
const menu_ctx_driver_t *menu_ctx;
menu_handle_t *menu_driver_data;
const menu_ctx_driver_t *menu_driver_ctx;
#endif
/* Set this to true if the platform in question needs to 'own'

30
menu/menu_driver.c
View File

@ -97,7 +97,7 @@ void find_menu_driver(void)
int i = find_driver_index("menu_driver", settings->menu.driver);
if (i >= 0)
driver->menu_ctx = (const menu_ctx_driver_t*)menu_driver_find_handle(i);
driver->menu_driver_ctx = (const menu_ctx_driver_t*)menu_driver_find_handle(i);
else
{
unsigned d;
@ -108,9 +108,9 @@ void find_menu_driver(void)
RARCH_LOG_OUTPUT("\t%s\n", menu_driver_find_ident(d));
RARCH_WARN("Going to default to first menu driver...\n");
driver->menu_ctx = (const menu_ctx_driver_t*)menu_driver_find_handle(0);
driver->menu_driver_ctx = (const menu_ctx_driver_t*)menu_driver_find_handle(0);
if (!driver->menu_ctx)
if (!driver->menu_driver_ctx)
retro_fail(1, "find_menu_driver()");
}
}
@ -118,33 +118,33 @@ void find_menu_driver(void)
menu_handle_t *menu_driver_get_ptr(void)
{
driver_t *driver = driver_get_ptr();
if (!driver || !driver->menu)
if (!driver || !driver->menu_driver_data)
return NULL;
return driver->menu;
return driver->menu_driver_data;
}
const menu_ctx_driver_t *menu_ctx_driver_get_ptr(void)
{
driver_t *driver = driver_get_ptr();
if (!driver || !driver->menu_ctx)
if (!driver || !driver->menu_driver_ctx)
return NULL;
return driver->menu_ctx;
return driver->menu_driver_ctx;
}
void init_menu(void)
{
driver_t *driver = driver_get_ptr();
if (driver->menu)
if (driver->menu_driver_data)
return;
find_menu_driver();
if (!(driver->menu = (menu_handle_t*)menu_init(driver->menu_ctx)))
if (!(driver->menu_driver_data = (menu_handle_t*)menu_init(driver->menu_driver_ctx)))
retro_fail(1, "init_menu()");
if (driver->menu_ctx->lists_init)
if (!driver->menu_ctx->lists_init(driver->menu))
if (driver->menu_driver_ctx->lists_init)
if (!driver->menu_driver_ctx->lists_init(driver->menu_driver_data))
retro_fail(1, "init_menu()");
}
@ -388,14 +388,14 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
menu_driver_data_own = false;
break;
case RARCH_MENU_CTL_IS_SET_TEXTURE:
if (!driver || !driver->menu_ctx)
if (!driver || !driver->menu_driver_ctx)
return false;
return driver->menu_ctx->set_texture;
return driver->menu_driver_ctx->set_texture;
case RARCH_MENU_CTL_OWNS_DRIVER:
return menu_driver_data_own;
case RARCH_MENU_CTL_DEINIT:
menu_free(driver->menu);
driver->menu = NULL;
menu_free(driver->menu_driver_data);
driver->menu_driver_data = NULL;
break;
default:
case RARCH_MENU_CTL_NONE: