From 7f54f410f400a499b98bfbe7536d995bcfbba2ef Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 8 Jun 2020 03:11:59 +0200 Subject: [PATCH] Remove pointer grabbing from get_msg_queue function --- gfx/gfx_widgets.c | 4 ++-- gfx/gfx_widgets.h | 2 +- gfx/widgets/gfx_widget_generic_message.c | 2 +- gfx/widgets/gfx_widget_libretro_message.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c index 58eddb4034..02c6aefab6 100644 --- a/gfx/gfx_widgets.c +++ b/gfx/gfx_widgets.c @@ -410,9 +410,9 @@ unsigned gfx_widgets_get_last_video_height(void *data) return p_dispwidget->last_video_height; } -size_t gfx_widgets_get_msg_queue_size(void) +size_t gfx_widgets_get_msg_queue_size(void *data) { - dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)dispwidget_get_ptr(); + dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)data; return p_dispwidget->current_msgs ? p_dispwidget->current_msgs->size : 0; } diff --git a/gfx/gfx_widgets.h b/gfx/gfx_widgets.h index 0419454d4a..4d7febcc3f 100644 --- a/gfx/gfx_widgets.h +++ b/gfx/gfx_widgets.h @@ -126,7 +126,7 @@ unsigned gfx_widgets_get_last_video_height(void *data); unsigned gfx_widgets_get_generic_message_height(void *data); /* Warning: not thread safe! */ -size_t gfx_widgets_get_msg_queue_size(void); +size_t gfx_widgets_get_msg_queue_size(void *data); float gfx_widgets_get_thumbnail_scale_factor( const float dst_width, const float dst_height, diff --git a/gfx/widgets/gfx_widget_generic_message.c b/gfx/widgets/gfx_widget_generic_message.c index 9f5d36ba65..edd1bb8229 100644 --- a/gfx/widgets/gfx_widget_generic_message.c +++ b/gfx/widgets/gfx_widget_generic_message.c @@ -95,7 +95,7 @@ static void gfx_widget_generic_message_frame(void* data, void *user_data) unsigned height = gfx_widgets_get_generic_message_height(user_data); unsigned text_color = COLOR_TEXT_ALPHA(0xffffffff, (unsigned)(state->alpha*255.0f)); gfx_widget_font_data_t* font_regular = gfx_widgets_get_font_regular(user_data); - size_t msg_queue_size = gfx_widgets_get_msg_queue_size(); + size_t msg_queue_size = gfx_widgets_get_msg_queue_size(user_data); gfx_display_set_alpha(gfx_widgets_get_backdrop_orig(), state->alpha); diff --git a/gfx/widgets/gfx_widget_libretro_message.c b/gfx/widgets/gfx_widget_libretro_message.c index ac0a147e2f..4e19c04760 100644 --- a/gfx/widgets/gfx_widget_libretro_message.c +++ b/gfx/widgets/gfx_widget_libretro_message.c @@ -102,7 +102,7 @@ static void gfx_widget_libretro_message_frame(void *data, void *user_data) float* backdrop_orign = gfx_widgets_get_backdrop_orig(); unsigned text_color = COLOR_TEXT_ALPHA(0xffffffff, (unsigned)(state->alpha*255.0f)); gfx_widget_font_data_t* font_regular = gfx_widgets_get_font_regular(user_data); - size_t msg_queue_size = gfx_widgets_get_msg_queue_size(); + size_t msg_queue_size = gfx_widgets_get_msg_queue_size(user_data); gfx_display_set_alpha(backdrop_orign, state->alpha);