Cleanups
This commit is contained in:
parent
cfc56bbad3
commit
45abbc6ac5
35
retroarch.c
35
retroarch.c
|
@ -4846,27 +4846,6 @@ bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data)
|
||||||
|
|
||||||
/* UI COMPANION */
|
/* UI COMPANION */
|
||||||
|
|
||||||
/**
|
|
||||||
* ui_companion_find_driver:
|
|
||||||
* @ident : Identifier name of driver to find.
|
|
||||||
*
|
|
||||||
* Finds driver with @ident. Does not initialize.
|
|
||||||
*
|
|
||||||
* Returns: pointer to driver if successful, otherwise NULL.
|
|
||||||
**/
|
|
||||||
const ui_companion_driver_t *ui_companion_find_driver(const char *ident)
|
|
||||||
{
|
|
||||||
unsigned i;
|
|
||||||
|
|
||||||
for (i = 0; ui_companion_drivers[i]; i++)
|
|
||||||
{
|
|
||||||
if (string_is_equal(ui_companion_drivers[i]->ident, ident))
|
|
||||||
return ui_companion_drivers[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ui_companion_set_foreground(unsigned enable)
|
void ui_companion_set_foreground(unsigned enable)
|
||||||
{
|
{
|
||||||
main_ui_companion_is_on_foreground = enable;
|
main_ui_companion_is_on_foreground = enable;
|
||||||
|
@ -4877,18 +4856,6 @@ bool ui_companion_is_on_foreground(void)
|
||||||
return main_ui_companion_is_on_foreground;
|
return main_ui_companion_is_on_foreground;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* ui_companion_init_first:
|
|
||||||
*
|
|
||||||
* Finds first suitable driver and initialize.
|
|
||||||
*
|
|
||||||
* Returns: pointer to first suitable driver, otherwise NULL.
|
|
||||||
**/
|
|
||||||
const ui_companion_driver_t *ui_companion_init_first(void)
|
|
||||||
{
|
|
||||||
return ui_companion_drivers[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
void ui_companion_event_command(enum event_command action)
|
void ui_companion_event_command(enum event_command action)
|
||||||
{
|
{
|
||||||
const ui_companion_driver_t *ui = ui_companion;
|
const ui_companion_driver_t *ui = ui_companion;
|
||||||
|
@ -4924,7 +4891,7 @@ void ui_companion_driver_init_first(void)
|
||||||
{
|
{
|
||||||
settings_t *settings = configuration_settings;
|
settings_t *settings = configuration_settings;
|
||||||
|
|
||||||
ui_companion = (ui_companion_driver_t*)ui_companion_init_first();
|
ui_companion = (ui_companion_driver_t*)ui_companion_drivers[0];
|
||||||
|
|
||||||
#ifdef HAVE_QT
|
#ifdef HAVE_QT
|
||||||
if (settings->bools.desktop_menu_enable && settings->bools.ui_companion_toggle)
|
if (settings->bools.desktop_menu_enable && settings->bools.ui_companion_toggle)
|
||||||
|
|
|
@ -171,27 +171,8 @@ extern ui_companion_driver_t ui_companion_cocoatouch;
|
||||||
extern ui_companion_driver_t ui_companion_qt;
|
extern ui_companion_driver_t ui_companion_qt;
|
||||||
extern ui_companion_driver_t ui_companion_win32;
|
extern ui_companion_driver_t ui_companion_win32;
|
||||||
|
|
||||||
/**
|
|
||||||
* ui_companion_find_driver:
|
|
||||||
* @ident : Identifier name of driver to find.
|
|
||||||
*
|
|
||||||
* Finds driver with @ident. Does not initialize.
|
|
||||||
*
|
|
||||||
* Returns: pointer to driver if successful, otherwise NULL.
|
|
||||||
**/
|
|
||||||
const ui_companion_driver_t *ui_companion_find_driver(const char *ident);
|
|
||||||
|
|
||||||
const ui_companion_driver_t *ui_companion_get_ptr(void);
|
const ui_companion_driver_t *ui_companion_get_ptr(void);
|
||||||
|
|
||||||
/**
|
|
||||||
* ui_companion_init_first:
|
|
||||||
*
|
|
||||||
* Finds first suitable driver and initialize.
|
|
||||||
*
|
|
||||||
* Returns: pointer to first suitable driver, otherwise NULL.
|
|
||||||
**/
|
|
||||||
const ui_companion_driver_t *ui_companion_init_first(void);
|
|
||||||
|
|
||||||
void ui_companion_driver_init_first(void);
|
void ui_companion_driver_init_first(void);
|
||||||
|
|
||||||
bool ui_companion_is_on_foreground(void);
|
bool ui_companion_is_on_foreground(void);
|
||||||
|
|
Loading…
Reference in New Issue