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

Add camera_driver_find_handle/camera_driver_find_ident

Browse Source
This commit is contained in:
twinaphex 2015-01-12 17:03:01 +01:00
parent 1194111951
commit 710d52ecc8
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

@ -474,6 +474,36 @@ static const camera_driver_t *camera_drivers[] = {
NULL, NULL,
}; };
/**
* camera_driver_find_handle:
* @index : index of driver to get handle to.
*
* Returns: handle to camera driver at index. Can be NULL
* if nothing found.
**/
static const void *camera_driver_find_handle(int index)
{
const void *drv = camera_drivers[index];
if (!drv)
return NULL;
return drv;
}
/**
* camera_driver_find_ident:
* @index : index of driver to get handle to.
*
* Returns: Human-readable identifier of camera driver at index. Can be NULL
* if nothing found.
**/
static const char *camera_driver_find_ident(int index)
{
const camera_driver_t *drv = camera_drivers[index];
if (!drv)
return NULL;
return drv->ident;
}
/** /**
* config_get_camera_driver_options: * config_get_camera_driver_options:
* *
@ -493,9 +523,9 @@ const char* config_get_camera_driver_options(void)
attr.i = 0; attr.i = 0;
for (option_k = 0; camera_drivers[option_k]; option_k++) for (option_k = 0; camera_driver_find_handle(option_k); option_k++)
{ {
const char *opt = camera_drivers[option_k]->ident; const char *opt = camera_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);
} }
@ -643,9 +673,9 @@ static const void *find_driver_nonempty(const char *label, int i,
if (!strcmp(label, "camera_driver")) if (!strcmp(label, "camera_driver"))
{ {
drv = camera_drivers[i]; drv = camera_driver_find_handle(i);
if (drv) if (drv)
strlcpy(str, camera_drivers[i]->ident, sizeof_str); strlcpy(str, camera_driver_find_ident(i), sizeof_str);
} }
else if (!strcmp(label, "location_driver")) else if (!strcmp(label, "location_driver"))
{ {
@ -820,19 +850,19 @@ static void find_camera_driver(void)
{ {
int i = find_driver_index("camera_driver", g_settings.camera.driver); int i = find_driver_index("camera_driver", g_settings.camera.driver);
if (i >= 0) if (i >= 0)
driver.camera = camera_drivers[i]; driver.camera = camera_driver_find_handle(i);
else else
{ {
unsigned d; unsigned d;
RARCH_ERR("Couldn't find any camera driver named \"%s\"\n", RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
g_settings.camera.driver); g_settings.camera.driver);
RARCH_LOG_OUTPUT("Available camera drivers are:\n"); RARCH_LOG_OUTPUT("Available camera drivers are:\n");
for (d = 0; camera_drivers[d]; d++) for (d = 0; camera_driver_find_handle(d); d++)
RARCH_LOG_OUTPUT("\t%s\n", camera_drivers[d]->ident); RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));
RARCH_WARN("Going to default to first camera driver...\n"); RARCH_WARN("Going to default to first camera driver...\n");
driver.camera = camera_drivers[0]; driver.camera = camera_driver_find_handle(0);
if (!driver.camera) if (!driver.camera)
rarch_fail(1, "find_camera_driver()"); rarch_fail(1, "find_camera_driver()");