From 7c48e77bcdd4d02a4f9b3943db412e1edf98498e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 14 Oct 2020 02:33:15 +0200 Subject: [PATCH] Get rid of getter functions --- gfx/gfx_animation.c | 12 ------------ gfx/gfx_animation.h | 4 ---- gfx/widgets/gfx_widget_screenshot.c | 3 ++- menu/drivers/ozone/ozone_entries.c | 4 ++-- menu/drivers/ozone/ozone_sidebar.c | 2 +- menu/drivers/rgui.c | 2 +- menu/drivers/stripes.c | 5 +++-- menu/drivers/xmb.c | 4 ++-- 8 files changed, 11 insertions(+), 25 deletions(-) diff --git a/gfx/gfx_animation.c b/gfx/gfx_animation.c index 617b8c82f0..340bfb56bf 100644 --- a/gfx/gfx_animation.c +++ b/gfx/gfx_animation.c @@ -2241,15 +2241,3 @@ void gfx_timer_start(gfx_timer_t *timer, gfx_timer_ctx_entry_t *timer_entry) gfx_animation_push(&entry); } - -uint64_t gfx_animation_get_ticker_idx(void) -{ - gfx_animation_t *p_anim = anim_get_ptr(); - return p_anim->ticker_idx; -} - -uint64_t gfx_animation_get_ticker_slow_idx(void) -{ - gfx_animation_t *p_anim = anim_get_ptr(); - return p_anim->ticker_slow_idx; -} diff --git a/gfx/gfx_animation.h b/gfx/gfx_animation.h index 82b384093f..789f9b00bf 100644 --- a/gfx/gfx_animation.h +++ b/gfx/gfx_animation.h @@ -253,10 +253,6 @@ void gfx_animation_push_delayed(unsigned delay, gfx_animation_ctx_entry_t *entry bool gfx_animation_ctl(enum gfx_animation_ctl_state state, void *data); -uint64_t gfx_animation_get_ticker_idx(void); - -uint64_t gfx_animation_get_ticker_slow_idx(void); - void gfx_animation_set_update_time_cb(update_time_cb cb); void gfx_animation_unset_update_time_cb(void); diff --git a/gfx/widgets/gfx_widget_screenshot.c b/gfx/widgets/gfx_widget_screenshot.c index 4b8ef96ba4..5ed17a7e38 100644 --- a/gfx/widgets/gfx_widget_screenshot.c +++ b/gfx/widgets/gfx_widget_screenshot.c @@ -204,6 +204,7 @@ static void gfx_widget_screenshot_frame(void* data, void *user_data) unsigned video_height = video_info->height; dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)user_data; gfx_display_t *p_disp = disp_get_ptr(); + gfx_animation_t *p_anim = anim_get_ptr(); gfx_widget_screenshot_state_t *state = &p_w_screenshot_st; gfx_widget_font_data_t* font_regular = &p_dispwidget->gfx_widget_fonts.regular; int padding = (state->height - (font_regular->line_height * 2.0f)) / 2.0f; @@ -246,7 +247,7 @@ static void gfx_widget_screenshot_frame(void* data, void *user_data) TEXT_ALIGN_LEFT, true); - ticker.idx = gfx_animation_get_ticker_idx(); + ticker.idx = p_anim->ticker_idx; ticker.len = state->shotname_length; ticker.s = shotname; ticker.selected = true; diff --git a/menu/drivers/ozone/ozone_entries.c b/menu/drivers/ozone/ozone_entries.c index 363a892915..c455afcb39 100644 --- a/menu/drivers/ozone/ozone_entries.c +++ b/menu/drivers/ozone/ozone_entries.c @@ -668,7 +668,7 @@ border_iterate: } else { - ticker.idx = gfx_animation_get_ticker_idx(); + ticker.idx = p_anim->ticker_idx; ticker.type_enum = menu_ticker_type; ticker.spacer = ticker_spacer; } @@ -1170,7 +1170,7 @@ void ozone_draw_thumbnail_bar(ozone_handle_t *ozone, } else { - ticker.idx = gfx_animation_get_ticker_idx(); + ticker.idx = p_anim->ticker_idx; ticker.type_enum = menu_ticker_type; ticker.spacer = ticker_spacer; diff --git a/menu/drivers/ozone/ozone_sidebar.c b/menu/drivers/ozone/ozone_sidebar.c index 8a24ccad13..d7c7ce8760 100644 --- a/menu/drivers/ozone/ozone_sidebar.c +++ b/menu/drivers/ozone/ozone_sidebar.c @@ -205,7 +205,7 @@ void ozone_draw_sidebar( } else { - ticker.idx = gfx_animation_get_ticker_idx(); + ticker.idx = p_anim->ticker_idx; ticker.type_enum = menu_ticker_type; ticker.spacer = ticker_spacer; } diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index cb92279690..bffd4f952c 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -3619,7 +3619,7 @@ static void rgui_render(void *data, } else { - ticker.idx = gfx_animation_get_ticker_idx(); + ticker.idx = p_anim->ticker_idx; ticker.type_enum = menu_ticker_type; ticker.spacer = ticker_spacer; } diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c index c7f9e2aabc..bd77fa0cf4 100644 --- a/menu/drivers/stripes.c +++ b/menu/drivers/stripes.c @@ -2281,6 +2281,7 @@ static int stripes_draw_item( stripes_node_t * node = (stripes_node_t*) file_list_get_userdata_at_offset(list, i); settings_t *settings = config_get_ptr(); + gfx_animation_t *p_anim = anim_get_ptr(); /* Initial ticker configuration */ ticker.type_enum = settings->uints.menu_ticker_type; @@ -2400,7 +2401,7 @@ static int stripes_draw_item( ticker.s = tmp; ticker.len = ticker_limit; - ticker.idx = gfx_animation_get_ticker_idx(); + ticker.idx = p_anim->ticker_idx; ticker.str = ticker_str; ticker.selected = (i == current); @@ -2436,7 +2437,7 @@ static int stripes_draw_item( ticker.s = tmp; ticker.len = 35 * stripes_scale_mod[7]; - ticker.idx = gfx_animation_get_ticker_idx(); + ticker.idx = p_anim->ticker_idx; ticker.selected = (i == current); if (!string_is_empty(entry->value)) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 7911a32d49..f20d11807a 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -3066,7 +3066,7 @@ static int xmb_draw_item( } else { - ticker.idx = gfx_animation_get_ticker_idx(); + ticker.idx = p_anim->ticker_idx; ticker.type_enum = menu_ticker_type; ticker.spacer = NULL; } @@ -3292,7 +3292,7 @@ static int xmb_draw_item( else { line_ticker.type_enum = menu_ticker_type; - line_ticker.idx = gfx_animation_get_ticker_idx(); + line_ticker.idx = p_anim->ticker_idx; line_ticker.line_len = (size_t)(line_ticker_width); /* Note: max_lines should be calculated at runtime,