From dd79c9a236435f677c4a2c8f10ab75c6eccc4ed4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 13 May 2017 21:06:06 +0200 Subject: [PATCH] Pass is_idle to menu driver render function --- menu/drivers/materialui.c | 2 +- menu/drivers/rgui.c | 5 ++--- menu/drivers/xmb.c | 3 +-- menu/drivers/xui.cpp | 2 +- menu/menu_driver.c | 2 +- menu/menu_driver.h | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index cd8c05aa38..cce86853e1 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -560,7 +560,7 @@ static void mui_compute_entries_box(mui_handle_t* mui, int width) } } -static void mui_render(void *data) +static void mui_render(void *data, bool is_idle) { menu_animation_ctx_delta_t delta; float delta_time; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index c4b759b41c..d353425432 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -46,7 +46,6 @@ #include "../widgets/menu_input_dialog.h" #include "../../configuration.h" -#include "../../retroarch.h" #include "../../gfx/drivers_font_renderer/bitmap.h" #define RGUI_TERM_START_X(width) (width / 21) @@ -389,7 +388,7 @@ static void rgui_frame(void *data, video_frame_info_t *video_info) rgui->frame_count++; } -static void rgui_render(void *data) +static void rgui_render(void *data, bool is_idle) { menu_animation_ctx_ticker_t ticker; unsigned x, y; @@ -416,7 +415,7 @@ static void rgui_render(void *data) && menu_driver_is_alive() && !msg_force) return; - if (runloop_ctl(RUNLOOP_CTL_IS_IDLE, NULL)) + if (is_idle) return; if (!menu_display_get_update_pending()) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 91f1131c25..4418b83949 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -55,7 +55,6 @@ #include "../../verbosity.h" #include "../../configuration.h" -#include "../../retroarch.h" #include "../../playlist.h" #include "../../retroarch.h" @@ -2353,7 +2352,7 @@ static void xmb_draw_items( menu_display_blend_end(); } -static void xmb_render(void *data) +static void xmb_render(void *data, bool is_idle) { size_t i; float delta_time; diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp index 55e3a555de..c8ba3d4249 100644 --- a/menu/drivers/xui.cpp +++ b/menu/drivers/xui.cpp @@ -535,7 +535,7 @@ static void xui_set_list_text(int index, const wchar_t* leftText, } } -static void xui_render(void *data) +static void xui_render(void *data, bool is_idle) { size_t end, i, selection, fb_pitch; unsigned fb_width, fb_height; diff --git a/menu/menu_driver.c b/menu/menu_driver.c index f25c59ab1e..fa1a746689 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -366,7 +366,7 @@ bool menu_driver_render(bool is_idle, bool rarch_is_inited, menu_animation_update_time(settings->bools.menu_timedate_enable); if (menu_driver_ctx->render) - menu_driver_ctx->render(menu_userdata); + menu_driver_ctx->render(menu_userdata, is_idle); } if (menu_driver_alive && !is_idle) diff --git a/menu/menu_driver.h b/menu/menu_driver.h index cbb74a0a78..2858292b51 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -226,7 +226,7 @@ typedef struct menu_ctx_driver void (*set_texture)(void); void (*render_messagebox)(void *data, const char *msg); int (*iterate)(void *data, void *userdata, enum menu_action action); - void (*render)(void *data); + void (*render)(void *data, bool is_idle); void (*frame)(void *data, video_frame_info_t *video_info); void* (*init)(void**, bool); void (*free)(void*);