(Menu) Get rid of some unnecessary HAVE_OVERLAY ifdefs

This commit is contained in:
twinaphex 2014-09-03 03:54:12 +02:00
parent 948b031f52
commit 584c276312
4 changed files with 0 additions and 10 deletions

View File

@ -418,9 +418,7 @@ static void rgui_render(void)
}
}
else if (menu_type == MENU_SETTINGS_CONFIG ||
#ifdef HAVE_OVERLAY
menu_type == MENU_SETTINGS_OVERLAY_PRESET ||
#endif
!strcmp(label, "video_filter") ||
!strcmp(label, "audio_dsp_plugin") ||
menu_type == MENU_SETTINGS_DISK_APPEND ||

View File

@ -287,9 +287,7 @@ static void rmenu_render(void)
}
}
else if (menu_type == MENU_SETTINGS_CONFIG ||
#ifdef HAVE_OVERLAY
menu_type == MENU_SETTINGS_OVERLAY_PRESET ||
#endif
!strcmp(label, "video_filter") ||
!strcmp(label, "audio_dsp_plugin") ||
menu_type == MENU_SETTINGS_DISK_APPEND ||

View File

@ -504,9 +504,7 @@ static void rmenu_xui_render(void)
}
}
else if (menu_type == MENU_SETTINGS_CONFIG ||
#ifdef HAVE_OVERLAY
menu_type == MENU_SETTINGS_OVERLAY_PRESET ||
#endif
!strcmp(label, "video_filter") ||
!strcmp(label, "audio_dsp_plugin") ||
menu_type == MENU_SETTINGS_DISK_APPEND ||

View File

@ -76,10 +76,8 @@ 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);
#ifdef HAVE_OVERLAY
else if (menu_type == MENU_SETTINGS_OVERLAY_PRESET)
snprintf(title, sizeof_title, "OVERLAY %s", dir);
#endif
else if (!strcmp(label, "video_filter"))
snprintf(title, sizeof_title, "FILTER %s", dir);
else if (!strcmp(label, "audio_dsp_plugin"))
@ -108,10 +106,8 @@ static void get_title(const char *label, const char *dir,
snprintf(title, sizeof_title, "CONFIG DIR %s", dir);
else if (menu_type == MENU_SAVEFILE_DIR_PATH)
snprintf(title, sizeof_title, "SAVEFILE DIR %s", dir);
#ifdef HAVE_OVERLAY
else if (menu_type == MENU_OVERLAY_DIR_PATH)
snprintf(title, sizeof_title, "OVERLAY DIR %s", dir);
#endif
else if (menu_type == MENU_SYSTEM_DIR_PATH)
snprintf(title, sizeof_title, "SYSTEM DIR %s", dir);
else if (menu_type == MENU_ASSETS_DIR_PATH)