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

Add menu_driver_find_handle/menu_driver_find_ident

Browse Source
This commit is contained in:
twinaphex 2015-01-12 17:08:22 +01:00
parent af08a3f617
commit 483b8bec10
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
driver.c
View File

@ -645,6 +645,36 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
NULL NULL
}; };
/**
* menu_driver_find_handle:
* @index : index of driver to get handle to.
*
* Returns: handle to menu driver at index. Can be NULL
* if nothing found.
**/
static const void *menu_driver_find_handle(int index)
{
const void *drv = menu_ctx_drivers[index];
if (!drv)
return NULL;
return drv;
}
/**
* menu_driver_find_ident:
* @index : index of driver to get handle to.
*
* Returns: Human-readable identifier of menu driver at index. Can be NULL
* if nothing found.
**/
static const char *menu_driver_find_ident(int index)
{
const menu_ctx_driver_t *drv = menu_ctx_drivers[index];
if (!drv)
return NULL;
return drv->ident;
}
/** /**
* config_get_menu_driver_options: * config_get_menu_driver_options:
* *
@ -664,9 +694,9 @@ const char* config_get_menu_driver_options(void)
attr.i = 0; attr.i = 0;
for (option_k = 0; menu_ctx_drivers[option_k]; option_k++) for (option_k = 0; menu_driver_find_handle(option_k); option_k++)
{ {
const char *opt = menu_ctx_drivers[option_k]->ident; const char *opt = menu_driver_find_ident(option_k);
options_len += strlen(opt) + 1; options_len += strlen(opt) + 1;
string_list_append(options_l, opt, attr); string_list_append(options_l, opt, attr);
} }
@ -722,9 +752,9 @@ static const void *find_driver_nonempty(const char *label, int i,
#ifdef HAVE_MENU #ifdef HAVE_MENU
else if (!strcmp(label, "menu_driver")) else if (!strcmp(label, "menu_driver"))
{ {
drv = menu_ctx_drivers[i]; drv = menu_driver_find_handle(i);
if (drv) if (drv)
strlcpy(str, menu_ctx_drivers[i]->ident, sizeof_str); strlcpy(str, menu_driver_find_ident(i), sizeof_str);
} }
#endif #endif
else if (!strcmp(label, "input_driver")) else if (!strcmp(label, "input_driver"))
@ -1129,18 +1159,18 @@ static void find_menu_driver(void)
{ {
int i = find_driver_index("menu_driver", g_settings.menu.driver); int i = find_driver_index("menu_driver", g_settings.menu.driver);
if (i >= 0) if (i >= 0)
driver.menu_ctx = menu_ctx_drivers[i]; driver.menu_ctx = menu_driver_find_handle(i);
else else
{ {
unsigned d; unsigned d;
RARCH_WARN("Couldn't find any menu driver named \"%s\"\n", RARCH_WARN("Couldn't find any menu driver named \"%s\"\n",
g_settings.menu.driver); g_settings.menu.driver);
RARCH_LOG_OUTPUT("Available menu drivers are:\n"); RARCH_LOG_OUTPUT("Available menu drivers are:\n");
for (d = 0; menu_ctx_drivers[d]; d++) for (d = 0; menu_driver_find_handle(d); d++)
RARCH_LOG_OUTPUT("\t%s\n", menu_ctx_drivers[d]->ident); RARCH_LOG_OUTPUT("\t%s\n", menu_driver_find_ident(d));
RARCH_WARN("Going to default to first menu driver...\n"); RARCH_WARN("Going to default to first menu driver...\n");
driver.menu_ctx = menu_ctx_drivers[0]; driver.menu_ctx = menu_driver_find_handle(0);
if (!driver.menu_ctx) if (!driver.menu_ctx)
rarch_fail(1, "find_menu_driver()"); rarch_fail(1, "find_menu_driver()");