(menu_entries_cbs_title.c) Refactors

This commit is contained in:
twinaphex 2015-06-08 00:02:04 +02:00
parent 295025eba6
commit 1ed787cc80

View File

@ -45,6 +45,7 @@ static int action_get_title_default(const char *path, const char *label,
char elem0_path[PATH_MAX_LENGTH], elem1_path[PATH_MAX_LENGTH]; char elem0_path[PATH_MAX_LENGTH], elem1_path[PATH_MAX_LENGTH];
struct string_list *list_label = string_split(label, "|"); struct string_list *list_label = string_split(label, "|");
struct string_list *list_path = string_split(path, "|"); struct string_list *list_path = string_split(path, "|");
driver_t *driver = driver_get_ptr();
*elem0 = *elem1 = *elem0_path = *elem1_path = 0; *elem0 = *elem1 = *elem0_path = *elem1_path = 0;
@ -283,36 +284,36 @@ static int action_get_title_default(const char *path, const char *label,
snprintf(s, len, "AUTOCONFIG DIR %s", path); snprintf(s, len, "AUTOCONFIG DIR %s", path);
break; break;
default: default:
if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT || switch (menu_type)
menu_type == MENU_SETTINGS)
snprintf(s, len, "MENU %s", path);
else if (menu_type == MENU_SETTINGS_CUSTOM_BIND ||
menu_type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD)
{ {
strlcpy(s, "INPUT SETTINGS", len); case MENU_SETTINGS_CUSTOM_VIEWPORT:
if (elem1[0] != '\0') case MENU_SETTINGS:
{ snprintf(s, len, "MENU %s", path);
strlcat(s, " - ", len); break;
strlcat(s, string_to_upper(elem1), len); case MENU_SETTINGS_CUSTOM_BIND:
} case MENU_SETTINGS_CUSTOM_BIND_KEYBOARD:
} strlcpy(s, "INPUT SETTINGS", len);
else if (elem1[0] != '\0')
{ {
driver_t *driver = driver_get_ptr(); strlcat(s, " - ", len);
strlcat(s, string_to_upper(elem1), len);
}
break;
default:
if (driver->menu->defer_core)
snprintf(s, len, "CONTENT %s", path);
else
{
global_t *global = global_get_ptr();
const char *core_name = global->menu.info.library_name;
if (driver->menu->defer_core) if (!core_name)
snprintf(s, len, "CONTENT %s", path); core_name = global->system.info.library_name;
else if (!core_name)
{ core_name = "No Core";
global_t *global = global_get_ptr(); snprintf(s, len, "CONTENT (%s) %s", core_name, path);
const char *core_name = global->menu.info.library_name; }
break;
if (!core_name)
core_name = global->system.info.library_name;
if (!core_name)
core_name = "No Core";
snprintf(s, len, "CONTENT (%s) %s", core_name, path);
}
} }
break; break;
} }