ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Ozone) Header cleanups

This commit is contained in:
twinaphex 2020-03-05 13:35:55 +01:00
parent b5c87aaef8
commit 7841b639ec
6 changed files with 42 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/drivers/ozone/ozone.c
View File

@ -35,11 +35,8 @@
#include <formats/image.h> #include <formats/image.h>
#include <math/float_minmax.h> #include <math/float_minmax.h>
#include "../../menu_driver.h"
#include "../../../gfx/gfx_animation.h" #include "../../../gfx/gfx_animation.h"
#include "../../../gfx/gfx_display.h" #include "../../../gfx/gfx_display.h"
#include "../../menu_input.h"
#include "../../playlist.h"
#include "../../runtime_file.h" #include "../../runtime_file.h"
#include "../../input/input_osk.h" #include "../../input/input_osk.h"
@ -47,14 +44,11 @@
#include "../../../configuration.h" #include "../../../configuration.h"
#include "../../../content.h" #include "../../../content.h"
#include "../../../core_info.h" #include "../../../core_info.h"
#include "../../../core.h"
#include "../../../verbosity.h" #include "../../../verbosity.h"
#include "../../../tasks/tasks_internal.h"
#include "../../../dynamic.h"
ozone_node_t *ozone_alloc_node(void) ozone_node_t *ozone_alloc_node(void)
{ {
ozone_node_t *node = (ozone_node_t*)malloc(sizeof(*node)); ozone_node_t *node = (ozone_node_t*)malloc(sizeof(*node));
node->height = 0; node->height = 0;
node->position_y = 0; node->position_y = 0;

3
menu/drivers/ozone/ozone.h
View File

@ -26,9 +26,6 @@ typedef struct ozone_handle ozone_handle_t;
#include "../../gfx/gfx_thumbnail_path.h" #include "../../gfx/gfx_thumbnail_path.h"
#include "../../gfx/gfx_thumbnail.h" #include "../../gfx/gfx_thumbnail.h"
#include "../../menu_driver.h"
#include "../../../retroarch.h"
#define ANIMATION_PUSH_ENTRY_DURATION 166 #define ANIMATION_PUSH_ENTRY_DURATION 166
#define ANIMATION_CURSOR_DURATION 133 #define ANIMATION_CURSOR_DURATION 133

1
menu/drivers/ozone/ozone_display.c
View File

@ -27,7 +27,6 @@
#include <lists/string_list.h> #include <lists/string_list.h>
#include <features/features_cpu.h> #include <features/features_cpu.h>
#include "../../menu_input.h"
#include "../../../gfx/gfx_animation.h" #include "../../../gfx/gfx_animation.h"
#include "../../../input/input_osk.h" #include "../../../input/input_osk.h"

71
menu/drivers/ozone/ozone_texture.c
View File

@ -23,9 +23,10 @@
#include <streams/file_stream.h> #include <streams/file_stream.h>
#include <file/file_path.h> #include <file/file_path.h>
#include "../../menu_driver.h" #ifdef HAVE_CHEEVOS
#include "../../../cheevos-new/badges.h" #include "../../../cheevos-new/badges.h"
#endif
#include "../../../verbosity.h" #include "../../../verbosity.h"
uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone, uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
@ -431,21 +432,21 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
if (type < MENU_SETTINGS_INPUT_DESC_BEGIN) if (type < MENU_SETTINGS_INPUT_DESC_BEGIN)
{ {
input_id = MENU_SETTINGS_INPUT_BEGIN; input_id = MENU_SETTINGS_INPUT_BEGIN;
if ( type == input_id + 1) if (type == input_id + 1)
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_ADC]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_ADC];
if ( type == input_id + 2) if (type == input_id + 2)
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SETTINGS]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SETTINGS];
if ( type == input_id + 3) if (type == input_id + 3)
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BIND_ALL]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BIND_ALL];
if ( type == input_id + 4) if (type == input_id + 4)
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RELOAD]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RELOAD];
if ( type == input_id + 5) if (type == input_id + 5)
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SAVING]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SAVING];
if ( type == input_id + 6) if (type == input_id + 6)
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_MOUSE]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_MOUSE];
if ((type > (input_id + 30)) && (type < (input_id + 42))) if ((type > (input_id + 30)) && (type < (input_id + 42)))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LGUN]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LGUN];
if ( type == input_id + 42) if (type == input_id + 42)
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_TURBO]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_TURBO];
/* align to use the same code of Quickmenu controls*/ /* align to use the same code of Quickmenu controls*/
input_id = input_id + 7; input_id = input_id + 7;
@ -455,58 +456,56 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
/* Quickmenu controls repeats the same icons for all users*/ /* Quickmenu controls repeats the same icons for all users*/
input_id = MENU_SETTINGS_INPUT_DESC_BEGIN; input_id = MENU_SETTINGS_INPUT_DESC_BEGIN;
while (type > (input_id + 23)) while (type > (input_id + 23))
{ input_id = (input_id + 24);
input_id = (input_id + 24) ;
}
} }
/* This is utilized for both Input Binds and Quickmenu controls*/ /* This is utilized for both Input Binds and Quickmenu controls*/
if ( type == input_id ) if (type == input_id )
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_D]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_D];
if ( type == (input_id + 1)) if (type == (input_id + 1))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_L]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_L];
if ( type == (input_id + 2)) if (type == (input_id + 2))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SELECT]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SELECT];
if ( type == (input_id + 3)) if (type == (input_id + 3))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_START]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_START];
if ( type == (input_id + 4)) if (type == (input_id + 4))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_U]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_U];
if ( type == (input_id + 5)) if (type == (input_id + 5))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_D]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_D];
if ( type == (input_id + 6)) if (type == (input_id + 6))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_L]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_L];
if ( type == (input_id + 7)) if (type == (input_id + 7))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_R]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_R];
if ( type == (input_id + 8)) if (type == (input_id + 8))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_R]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_R];
if ( type == (input_id + 9)) if (type == (input_id + 9))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_U]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_U];
if ( type == (input_id + 10)) if (type == (input_id + 10))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LB]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LB];
if ( type == (input_id + 11)) if (type == (input_id + 11))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RB]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RB];
if ( type == (input_id + 12)) if (type == (input_id + 12))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LT]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LT];
if ( type == (input_id + 13)) if (type == (input_id + 13))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RT]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RT];
if ( type == (input_id + 14)) if (type == (input_id + 14))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_P]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_P];
if ( type == (input_id + 15)) if (type == (input_id + 15))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_P]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_P];
if ( type == (input_id + 16)) if (type == (input_id + 16))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_R]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_R];
if ( type == (input_id + 17)) if (type == (input_id + 17))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_L]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_L];
if ( type == (input_id + 18)) if (type == (input_id + 18))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_D]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_D];
if ( type == (input_id + 19)) if (type == (input_id + 19))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_U]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_U];
if ( type == (input_id + 20)) if (type == (input_id + 20))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_R]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_R];
if ( type == (input_id + 21)) if (type == (input_id + 21))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_L]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_L];
if ( type == (input_id + 22)) if (type == (input_id + 22))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_D]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_D];
if ( type == (input_id + 23)) if (type == (input_id + 23))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_U]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_U];
} }
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SUBSETTING]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SUBSETTING];

2
menu/drivers/ozone/ozone_theme.h
View File

@ -20,8 +20,6 @@
#include "ozone.h" #include "ozone.h"
#include "ozone_texture.h" #include "ozone_texture.h"
#include "../../../retroarch.h"
static float ozone_pure_white[16] = { static float ozone_pure_white[16] = {
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,
1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00,

9
menu/drivers/xmb.c
View File

@ -1390,7 +1390,8 @@ static void xmb_selection_pointer_changed(
} }
else else
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned menu_xmb_animation_move_up_down = settings->uints.menu_xmb_animation_move_up_down;
/* Move up/down animation */ /* Move up/down animation */
gfx_animation_ctx_entry_t anim_entry; gfx_animation_ctx_entry_t anim_entry;
@ -1400,7 +1401,7 @@ static void xmb_selection_pointer_changed(
anim_entry.tag = tag; anim_entry.tag = tag;
anim_entry.cb = NULL; anim_entry.cb = NULL;
switch (settings->uints.menu_xmb_animation_move_up_down) switch (menu_xmb_animation_move_up_down)
{ {
case 0: case 0:
anim_entry.duration = XMB_DELAY; anim_entry.duration = XMB_DELAY;
@ -4300,6 +4301,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
float fade_tab_icons_x_threshold = 0.0f; float fade_tab_icons_x_threshold = 0.0f;
bool menu_core_enable = settings->bools.menu_core_enable; bool menu_core_enable = settings->bools.menu_core_enable;
float thumbnail_scale_factor = (float)settings->uints.menu_xmb_thumbnail_scale_factor / 100.0f; float thumbnail_scale_factor = (float)settings->uints.menu_xmb_thumbnail_scale_factor / 100.0f;
bool menu_xmb_vertical_thumbnails = settings->bools.menu_xmb_vertical_thumbnails;
if (!xmb) if (!xmb)
return; return;
@ -4451,7 +4453,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
{ {
/* Check if user has selected vertically /* Check if user has selected vertically
* stacked thumbnails */ * stacked thumbnails */
if (settings->bools.menu_xmb_vertical_thumbnails) if (menu_xmb_vertical_thumbnails)
{ {
/* Right + left thumbnails, right side */ /* Right + left thumbnails, right side */
if (show_right_thumbnail && show_left_thumbnail) if (show_right_thumbnail && show_left_thumbnail)
@ -5198,6 +5200,7 @@ static void *xmb_init(void **userdata, bool video_is_threaded)
xmb->system_tab_end = 0; xmb->system_tab_end = 0;
xmb->tabs[xmb->system_tab_end] = XMB_SYSTEM_TAB_MAIN; xmb->tabs[xmb->system_tab_end] = XMB_SYSTEM_TAB_MAIN;
if (settings->bools.menu_content_show_settings && !settings->bools.kiosk_mode_enable) if (settings->bools.menu_content_show_settings && !settings->bools.kiosk_mode_enable)
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_SETTINGS; xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_SETTINGS;
if (settings->bools.menu_content_show_favorites) if (settings->bools.menu_content_show_favorites)