This commit is contained in:
twinaphex 2021-09-20 20:43:05 +02:00
parent fabdede667
commit 295aa84a9e
3 changed files with 9 additions and 18 deletions

View File

@ -3293,7 +3293,6 @@ static bool materialui_render_process_entry_playlist_desktop(
bool network_on_demand_thumbnails)
{
gfx_animation_t *p_anim = anim_get_ptr();
gfx_thumbnail_state_t *p_gfx_thumb = gfx_thumb_get_ptr();
bool is_selected = (entry_idx == selection);
/* We want to load (and keep in memory)
* thumbnails for the currently selected
@ -3375,7 +3374,7 @@ static bool materialui_render_process_entry_playlist_desktop(
runtime_date_separator =
(enum playlist_sublabel_last_played_date_separator_type)
settings->uints.menu_timedate_date_separator;
float fade_duration = p_gfx_thumb->fade_duration;
float fade_duration = gfx_thumb_get_ptr()->fade_duration;
const struct playlist_entry *entry = NULL;
const char *core_name = NULL;
const char *runtime_str = NULL;
@ -6269,7 +6268,6 @@ static void materialui_hide_fullscreen_thumbnails(
materialui_handle_t *mui, bool animate)
{
uintptr_t alpha_tag = (uintptr_t)&mui->fullscreen_thumbnail_alpha;
gfx_thumbnail_state_t *p_gfx_thumb = gfx_thumb_get_ptr();
/* Kill any existing fade in/out animations */
gfx_animation_kill_by_tag(&alpha_tag);
@ -6282,7 +6280,7 @@ static void materialui_hide_fullscreen_thumbnails(
/* Configure fade out animation */
animation_entry.easing_enum = EASING_OUT_QUAD;
animation_entry.tag = alpha_tag;
animation_entry.duration = p_gfx_thumb->fade_duration;
animation_entry.duration = gfx_thumb_get_ptr()->fade_duration;
animation_entry.target_value = 0.0f;
animation_entry.subject = &mui->fullscreen_thumbnail_alpha;
animation_entry.cb = NULL;
@ -6311,7 +6309,6 @@ static void materialui_show_fullscreen_thumbnails(
uintptr_t alpha_tag = (uintptr_t)
&mui->fullscreen_thumbnail_alpha;
const char *thumbnail_label = NULL;
gfx_thumbnail_state_t *p_gfx_thumb = gfx_thumb_get_ptr();
/* Before showing fullscreen thumbnails, must
* ensure that any existing fullscreen thumbnail
@ -6378,7 +6375,7 @@ static void materialui_show_fullscreen_thumbnails(
/* Configure fade in animation */
animation_entry.easing_enum = EASING_OUT_QUAD;
animation_entry.tag = alpha_tag;
animation_entry.duration = p_gfx_thumb->fade_duration;
animation_entry.duration = gfx_thumb_get_ptr()->fade_duration;
animation_entry.target_value = 1.0f;
animation_entry.subject = &mui->fullscreen_thumbnail_alpha;
animation_entry.cb = NULL;
@ -10682,7 +10679,6 @@ static void materialui_refresh_thumbnail_image(void *userdata, unsigned i)
materialui_handle_t *mui = (materialui_handle_t*)userdata;
size_t selection = menu_navigation_get_selection();
bool refresh_enabled = false;
gfx_thumbnail_state_t *p_gfx_thumb = gfx_thumb_get_ptr();
if (!mui)
return;
@ -10706,7 +10702,7 @@ static void materialui_refresh_thumbnail_image(void *userdata, unsigned i)
{
file_list_t *list = menu_entries_get_selection_buf_ptr(0);
materialui_node_t *node = NULL;
float stream_delay = p_gfx_thumb->stream_delay;
float stream_delay = gfx_thumb_get_ptr()->stream_delay;
if (!list)
return;

View File

@ -5703,7 +5703,6 @@ static void ozone_hide_fullscreen_thumbnails(ozone_handle_t *ozone, bool animate
{
uintptr_t alpha_tag = (uintptr_t)
&ozone->animations.fullscreen_thumbnail_alpha;
gfx_thumbnail_state_t *p_gfx_thumb = gfx_thumb_get_ptr();
/* Kill any existing fade in/out animations */
gfx_animation_kill_by_tag(&alpha_tag);
@ -5716,7 +5715,7 @@ static void ozone_hide_fullscreen_thumbnails(ozone_handle_t *ozone, bool animate
/* Configure fade out animation */
animation_entry.easing_enum = EASING_OUT_QUAD;
animation_entry.tag = alpha_tag;
animation_entry.duration = p_gfx_thumb->fade_duration;
animation_entry.duration = gfx_thumb_get_ptr()->fade_duration;
animation_entry.target_value = 0.0f;
animation_entry.subject = &ozone->animations.fullscreen_thumbnail_alpha;
animation_entry.cb = NULL;
@ -5741,7 +5740,6 @@ static void ozone_show_fullscreen_thumbnails(ozone_handle_t *ozone)
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
uintptr_t alpha_tag = (uintptr_t)&ozone->animations.fullscreen_thumbnail_alpha;
uintptr_t scroll_tag = (uintptr_t)selection_buf;
gfx_thumbnail_state_t *p_gfx_thumb = gfx_thumb_get_ptr();
/* Before showing fullscreen thumbnails, must
* ensure that any existing fullscreen thumbnail
@ -5825,7 +5823,7 @@ static void ozone_show_fullscreen_thumbnails(ozone_handle_t *ozone)
/* Configure fade in animation */
animation_entry.easing_enum = EASING_OUT_QUAD;
animation_entry.tag = alpha_tag;
animation_entry.duration = p_gfx_thumb->fade_duration;
animation_entry.duration = gfx_thumb_get_ptr()->fade_duration;
animation_entry.target_value = 1.0f;
animation_entry.subject = &ozone->animations.fullscreen_thumbnail_alpha;
animation_entry.cb = NULL;
@ -6389,7 +6387,6 @@ static void ozone_toggle_metadata_override(ozone_handle_t *ozone)
gfx_animation_ctx_entry_t animation_entry;
uintptr_t alpha_tag = (uintptr_t)
&ozone->animations.left_thumbnail_alpha;
gfx_thumbnail_state_t *p_gfx_thumb = gfx_thumb_get_ptr();
/* Kill any existing fade in/out animations */
gfx_animation_kill_by_tag(&alpha_tag);
@ -6397,7 +6394,7 @@ static void ozone_toggle_metadata_override(ozone_handle_t *ozone)
/* Set common animation parameters */
animation_entry.easing_enum = EASING_OUT_QUAD;
animation_entry.tag = alpha_tag;
animation_entry.duration = p_gfx_thumb->fade_duration;
animation_entry.duration = gfx_thumb_get_ptr()->fade_duration;
animation_entry.subject = &ozone->animations.left_thumbnail_alpha;
animation_entry.cb = NULL;
animation_entry.userdata = NULL;

View File

@ -3713,7 +3713,6 @@ static void xmb_hide_fullscreen_thumbnails(
xmb_handle_t *xmb, bool animate)
{
uintptr_t alpha_tag = (uintptr_t)&xmb->fullscreen_thumbnail_alpha;
gfx_thumbnail_state_t *p_gfx_thumb = gfx_thumb_get_ptr();
/* Kill any existing fade in/out animations */
gfx_animation_kill_by_tag(&alpha_tag);
@ -3726,7 +3725,7 @@ static void xmb_hide_fullscreen_thumbnails(
/* Configure fade out animation */
animation_entry.easing_enum = EASING_OUT_QUAD;
animation_entry.tag = alpha_tag;
animation_entry.duration = p_gfx_thumb->fade_duration;
animation_entry.duration = gfx_thumb_get_ptr()->fade_duration;
animation_entry.target_value = 0.0f;
animation_entry.subject = &xmb->fullscreen_thumbnail_alpha;
animation_entry.cb = NULL;
@ -3754,7 +3753,6 @@ static void xmb_show_fullscreen_thumbnails(
const char *thumbnail_label = NULL;
uintptr_t alpha_tag = (uintptr_t)
&xmb->fullscreen_thumbnail_alpha;
gfx_thumbnail_state_t *p_gfx_thumb = gfx_thumb_get_ptr();
/* Before showing fullscreen thumbnails, must
* ensure that any existing fullscreen thumbnail
@ -3834,7 +3832,7 @@ static void xmb_show_fullscreen_thumbnails(
/* Configure fade in animation */
animation_entry.easing_enum = EASING_OUT_QUAD;
animation_entry.tag = alpha_tag;
animation_entry.duration = p_gfx_thumb->fade_duration;
animation_entry.duration = gfx_thumb_get_ptr()->fade_duration;
animation_entry.target_value = 1.0f;
animation_entry.subject = &xmb->fullscreen_thumbnail_alpha;
animation_entry.cb = NULL;