(Menu) Get rid of MENU_SETTINGS_OVERLAY_PRESET enum

This commit is contained in:
twinaphex 2014-09-04 05:31:54 +02:00
parent c61e552f08
commit 9617121eab
3 changed files with 3 additions and 5 deletions

View File

@ -76,7 +76,7 @@ static void get_title(const char *label, const char *dir,
strlcpy(title, "LOAD HISTORY", sizeof_title);
else if (!strcmp(label, "info_screen"))
strlcpy(title, "INFO", sizeof_title);
else if (menu_type == MENU_SETTINGS_OVERLAY_PRESET)
else if (!strcmp(label, "input_overlay"))
snprintf(title, sizeof_title, "OVERLAY %s", dir);
else if (!strcmp(label, "video_filter"))
snprintf(title, sizeof_title, "FILTER %s", dir);

View File

@ -120,7 +120,6 @@ typedef enum
MENU_SETTINGS_DISK_APPEND,
MENU_CONTENT_HISTORY_PATH,
MENU_SETTINGS_OVERLAY_PRESET,
MENU_SETTINGS_BIND_PLAYER,
MENU_SETTINGS_BIND_DEVICE,
MENU_SETTINGS_BIND_DEVICE_TYPE,

View File

@ -470,8 +470,7 @@ int menu_entries_push_list(menu_handle_t *menu,
break;
case MENU_SETTINGS_OVERLAY_OPTIONS:
file_list_clear(list);
add_setting_entry(menu,list,"input_overlay", MENU_SETTINGS_OVERLAY_PRESET,
setting_data);
add_setting_entry(menu,list,"input_overlay", 0, setting_data);
add_setting_entry(menu,list,"input_overlay_opacity", 0, setting_data);
add_setting_entry(menu,list,"input_overlay_scale", 0, setting_data);
break;
@ -567,7 +566,7 @@ int menu_parse_check(const char *label, unsigned menu_type)
if (!((menu_type == MENU_FILE_DIRECTORY ||
menu_common_type_is(label, menu_type) == MENU_SETTINGS_SHADER_OPTIONS ||
menu_common_type_is(label, menu_type) == MENU_FILE_DIRECTORY ||
menu_type == MENU_SETTINGS_OVERLAY_PRESET ||
!strcmp(label, "input_overlay") ||
menu_type == MENU_CONTENT_HISTORY_PATH ||
!strcmp(label, "video_filter") ||
!strcmp(label, "audio_dsp_plugin") ||