mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(configuration.c) Cleanup

Browse Source
This commit is contained in:
twinaphex 2016-09-17 01:40:11 +02:00
parent 7c0ba42c09
commit 9d7798d52a
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
configuration.c
View File

@ -407,38 +407,6 @@ const char *config_get_default_joypad(void)
return "null"; return "null";
} }
#ifdef HAVE_MENU
/**
* config_get_default_menu:
*
* Gets default menu driver.
*
* Returns: Default menu driver.
**/
const char *config_get_default_menu(void)
{
if (!string_is_empty(g_defaults.settings.menu))
return g_defaults.settings.menu;
switch (MENU_DEFAULT_DRIVER)
{
case MENU_RGUI:
return "rgui";
case MENU_XUI:
return "xui";
case MENU_MATERIALUI:
return "glui";
case MENU_XMB:
return "xmb";
case MENU_NUKLEAR:
return "nuklear";
default:
break;
}
return "null";
}
#endif
/** /**
* config_get_default_camera: * config_get_default_camera:
@ -488,14 +456,38 @@ const char *config_get_default_location(void)
return "null"; return "null";
} }
bool config_overlay_enable_default(void) #ifdef HAVE_MENU
/**
* config_get_default_menu:
*
* Gets default menu driver.
*
* Returns: Default menu driver.
**/
const char *config_get_default_menu(void)
{ {
if (g_defaults.overlay.set) if (!string_is_empty(g_defaults.settings.menu))
return g_defaults.overlay.enable; return g_defaults.settings.menu;
return true;
switch (MENU_DEFAULT_DRIVER)
{
case MENU_RGUI:
return "rgui";
case MENU_XUI:
return "xui";
case MENU_MATERIALUI:
return "glui";
case MENU_XMB:
return "xmb";
case MENU_NUKLEAR:
return "nuklear";
default:
break;
}
return "null";
} }
#ifdef HAVE_MENU
static unsigned config_menu_btn_ok_default(void) static unsigned config_menu_btn_ok_default(void)
{ {
if (g_defaults.menu.controls.set) if (g_defaults.menu.controls.set)
@ -511,6 +503,13 @@ static unsigned config_menu_btn_cancel_default(void)
} }
#endif #endif
bool config_overlay_enable_default(void)
{
if (g_defaults.overlay.set)
return g_defaults.overlay.enable;
return true;
}
static int populate_settings_array(settings_t *settings, struct config_array_setting **out) static int populate_settings_array(settings_t *settings, struct config_array_setting **out)
{ {
unsigned count = 0; unsigned count = 0;