Get rid of header include

This commit is contained in:
twinaphex 2020-02-16 16:54:58 +01:00
parent f74225721d
commit b7ced5763b
4 changed files with 11 additions and 9 deletions

View File

@ -392,7 +392,6 @@
#ifdef HAVE_MENU
#include "menu/menu_driver.h"
#include "gfx/gfx_animation.h"
#ifdef HAVE_LIBNX
#define DEFAULT_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME true
@ -505,7 +504,7 @@ static const bool menu_show_core_updater = true;
static const bool menu_show_legacy_thumbnail_updater = false;
static const bool menu_show_sublabels = true;
static const unsigned menu_ticker_type = TICKER_TYPE_BOUNCE;
#define DEFAULT_MENU_TICKER_TYPE (TICKER_TYPE_BOUNCE)
static const float menu_ticker_speed = 1.0f;
#define DEFAULT_MENU_TICKER_SMOOTH true

View File

@ -47,6 +47,8 @@
#include "verbosity.h"
#include "lakka.h"
#include "gfx/gfx_animation.h"
#include "tasks/task_content.h"
#include "tasks/tasks_internal.h"
@ -1786,7 +1788,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
SETTING_UINT("menu_left_thumbnails", &settings->uints.menu_left_thumbnails, true, menu_left_thumbnails_default, false);
SETTING_UINT("menu_thumbnail_upscale_threshold", &settings->uints.gfx_thumbnail_upscale_threshold, true, gfx_thumbnail_upscale_threshold, false);
SETTING_UINT("menu_timedate_style", &settings->uints.menu_timedate_style, true, menu_timedate_style, false);
SETTING_UINT("menu_ticker_type", &settings->uints.menu_ticker_type, true, menu_ticker_type, false);
SETTING_UINT("menu_ticker_type", &settings->uints.menu_ticker_type, true, DEFAULT_MENU_TICKER_TYPE, false);
#ifdef HAVE_RGUI
SETTING_UINT("rgui_menu_color_theme", &settings->uints.menu_rgui_color_theme, true, DEFAULT_RGUI_COLOR_THEME, false);
SETTING_UINT("rgui_thumbnail_downscaler", &settings->uints.menu_rgui_thumbnail_downscaler, true, rgui_thumbnail_downscaler, false);

View File

@ -12699,7 +12699,7 @@ static bool setting_append_list(
&settings->uints.menu_xmb_animation_horizontal_highlight,
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_HORIZONTAL_HIGHLIGHT,
MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_HORIZONTAL_HIGHLIGHT,
menu_ticker_type,
DEFAULT_MENU_TICKER_TYPE,
&group_info,
&subgroup_info,
parent_group,
@ -12716,7 +12716,7 @@ static bool setting_append_list(
&settings->uints.menu_xmb_animation_move_up_down,
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
menu_ticker_type,
DEFAULT_MENU_TICKER_TYPE, /* TODO/FIXME - is this correct? */
&group_info,
&subgroup_info,
parent_group,
@ -12733,7 +12733,7 @@ static bool setting_append_list(
&settings->uints.menu_xmb_animation_opening_main_menu,
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
MENU_ENUM_LABEL_VALUE_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
menu_ticker_type,
DEFAULT_MENU_TICKER_TYPE,
&group_info,
&subgroup_info,
parent_group,
@ -12751,7 +12751,7 @@ static bool setting_append_list(
&settings->uints.menu_ticker_type,
MENU_ENUM_LABEL_MENU_TICKER_TYPE,
MENU_ENUM_LABEL_VALUE_MENU_TICKER_TYPE,
menu_ticker_type,
DEFAULT_MENU_TICKER_TYPE,
&group_info,
&subgroup_info,
parent_group,

View File

@ -131,10 +131,11 @@
#include <audio/audio_resampler.h>
#ifdef HAVE_MENU
#include "menu/menu_driver.h"
#include "gfx/gfx_animation.h"
#include "gfx/gfx_display.h"
#ifdef HAVE_MENU
#include "menu/menu_driver.h"
#include "menu/menu_input.h"
#include "menu/widgets/menu_dialog.h"
#include "menu/widgets/menu_input_bind_dialog.h"