(Ozone) Move these static variables outside of the header

This commit is contained in:
twinaphex 2020-05-22 01:45:52 +02:00
parent 875791b40c
commit 70957aa52a
3 changed files with 31 additions and 28 deletions

View File

@ -46,6 +46,23 @@
#include "../../../core_info.h"
#include "../../../verbosity.h"
static const char *OZONE_TEXTURES_FILES[OZONE_TEXTURE_LAST] = {
"retroarch",
"cursor_border"
};
static const char *OZONE_TAB_TEXTURES_FILES[OZONE_TAB_TEXTURE_LAST] = {
"retroarch",
"settings",
"history",
"favorites",
"music",
"video",
"image",
"netplay",
"add"
};
ozone_node_t *ozone_alloc_node(void)
{
ozone_node_t *node = (ozone_node_t*)malloc(sizeof(*node));

View File

@ -29,6 +29,14 @@
#include "../../../verbosity.h"
static const char *OZONE_THEME_TEXTURES_FILES[OZONE_THEME_TEXTURE_LAST] = {
"switch",
"check",
"cursor_noborder",
"cursor_static"
};
uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
enum msg_hash_enums enum_idx, unsigned type, bool active)
{

View File

@ -25,7 +25,8 @@
#include "../../menu_driver.h"
enum OZONE_TEXTURE {
enum OZONE_TEXTURE
{
OZONE_TEXTURE_RETROARCH = 0,
OZONE_TEXTURE_CURSOR_BORDER,
#if 0
@ -34,12 +35,8 @@ enum OZONE_TEXTURE {
OZONE_TEXTURE_LAST
};
static const char *OZONE_TEXTURES_FILES[OZONE_TEXTURE_LAST] = {
"retroarch",
"cursor_border"
};
enum OZONE_THEME_TEXTURES {
enum OZONE_THEME_TEXTURES
{
OZONE_THEME_TEXTURE_SWITCH = 0,
OZONE_THEME_TEXTURE_CHECK,
@ -49,15 +46,8 @@ enum OZONE_THEME_TEXTURES {
OZONE_THEME_TEXTURE_LAST
};
static const char *OZONE_THEME_TEXTURES_FILES[OZONE_THEME_TEXTURE_LAST] = {
"switch",
"check",
"cursor_noborder",
"cursor_static"
};
enum OZONE_TAB_TEXTURES {
enum OZONE_TAB_TEXTURES
{
OZONE_TAB_TEXTURE_MAIN_MENU = 0,
OZONE_TAB_TEXTURE_SETTINGS,
OZONE_TAB_TEXTURE_HISTORY,
@ -71,18 +61,6 @@ enum OZONE_TAB_TEXTURES {
OZONE_TAB_TEXTURE_LAST
};
static const char *OZONE_TAB_TEXTURES_FILES[OZONE_TAB_TEXTURE_LAST] = {
"retroarch",
"settings",
"history",
"favorites",
"music",
"video",
"image",
"netplay",
"add"
};
enum
{
OZONE_ENTRIES_ICONS_TEXTURE_MAIN_MENU = 0,