mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move menu_widgets_ready to retroarch.c

Browse Source
This commit is contained in:
twinaphex 2019-08-15 14:56:38 +02:00
parent 6c671faed6
commit a500219d8c
4 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
menu/widgets/menu_widgets.c
View File

@ -67,9 +67,7 @@ static float volume_bar_normal[16] = COLOR_HEX_TO_FLOAT(0x198AC6, 1.0f);
static float volume_bar_loud[16] = COLOR_HEX_TO_FLOAT(0xF5DD19, 1.0f);
static float volume_bar_loudest[16] = COLOR_HEX_TO_FLOAT(0xC23B22, 1.0f);
static bool menu_widgets_inited = false;
static uint64_t menu_widgets_frame_count = 0;
static menu_animation_ctx_tag generic_tag = (uintptr_t) &menu_widgets_inited;
/* Font data */
static font_data_t *font_regular;
@ -184,6 +182,8 @@ static menu_texture_item msg_queue_icon_outline = 0;
static menu_texture_item msg_queue_icon_rect = 0;
static bool msg_queue_has_icons = false;
extern menu_animation_ctx_tag menu_widgets_generic_tag;
/* there can only be one message animation at a time to avoid confusing users */
static bool widgets_moving = false;
@ -747,7 +747,7 @@ static void menu_widgets_screenshot_end(void *userdata)
entry.duration = MSG_QUEUE_ANIMATION_DURATION;
entry.easing_enum = EASING_OUT_QUAD;
entry.subject = &screenshot_y;
entry.tag = generic_tag;
entry.tag = menu_widgets_generic_tag;
entry.target_value = -((float)screenshot_height);
entry.userdata = NULL;
@ -1735,12 +1735,10 @@ bool menu_widgets_init(bool video_is_threaded)
if (!file_list_reserve(current_msgs, MSG_QUEUE_ONSCREEN_MAX))
goto error;
menu_widgets_inited = true;
return true;
error:
if (menu_widgets_inited)
if (menu_widgets_ready())
menu_widgets_free();
return false;
}
@ -1918,11 +1916,9 @@ void menu_widgets_free(void)
size_t i;
menu_animation_ctx_tag libretro_tag;
menu_widgets_inited = false;
/* Kill any pending animation */
menu_animation_kill_by_tag(&volume_tag);
menu_animation_kill_by_tag(&generic_tag);
menu_animation_kill_by_tag(&menu_widgets_generic_tag);
/* Purge everything from the fifo */
if (msg_queue)
@ -2056,7 +2052,7 @@ static void menu_widgets_screenshot_fadeout(void *userdata)
entry.duration = SCREENSHOT_DURATION_OUT;
entry.easing_enum = EASING_OUT_QUAD;
entry.subject = &screenshot_alpha;
entry.tag = generic_tag;
entry.tag = menu_widgets_generic_tag;
entry.target_value = 0.0f;
entry.userdata = NULL;
@ -2071,7 +2067,7 @@ static void menu_widgets_play_screenshot_flash(void)
entry.duration = SCREENSHOT_DURATION_IN;
entry.easing_enum = EASING_IN_QUAD;
entry.subject = &screenshot_alpha;
entry.tag = generic_tag;
entry.tag = menu_widgets_generic_tag;
entry.target_value = 1.0f;
entry.userdata = NULL;
@ -2136,7 +2132,7 @@ void menu_widgets_start_load_content_animation(const char *content_name, bool re
/* Setup the animation */
entry.cb = NULL;
entry.easing_enum = EASING_OUT_QUAD;
entry.tag = generic_tag;
entry.tag = menu_widgets_generic_tag;
entry.userdata = NULL;
/* Stage one: icon animation */
@ -2210,7 +2206,7 @@ static void menu_widgets_achievement_dismiss(void *userdata)
entry.duration = MSG_QUEUE_ANIMATION_DURATION;
entry.easing_enum = EASING_OUT_QUAD;
entry.subject = &cheevo_y;
entry.tag = generic_tag;
entry.tag = menu_widgets_generic_tag;
entry.target_value = (float)(-(int)(cheevo_height));
entry.userdata = NULL;
@ -2226,7 +2222,7 @@ static void menu_widgets_achievement_fold(void *userdata)
entry.duration = MSG_QUEUE_ANIMATION_DURATION;
entry.easing_enum = EASING_OUT_QUAD;
entry.subject = &cheevo_unfold;
entry.tag = generic_tag;
entry.tag = menu_widgets_generic_tag;
entry.target_value = 0.0f;
entry.userdata = NULL;
@ -2243,7 +2239,7 @@ static void menu_widgets_achievement_unfold(void *userdata)
entry.duration = MSG_QUEUE_ANIMATION_DURATION;
entry.easing_enum = EASING_OUT_QUAD;
entry.subject = &cheevo_unfold;
entry.tag = generic_tag;
entry.tag = menu_widgets_generic_tag;
entry.target_value = 1.0f;
entry.userdata = NULL;
@ -2275,7 +2271,7 @@ static void menu_widgets_start_achievement_notification()
entry.duration = MSG_QUEUE_ANIMATION_DURATION;
entry.easing_enum = EASING_OUT_QUAD;
entry.subject = &cheevo_y;
entry.tag = generic_tag;
entry.tag = menu_widgets_generic_tag;
entry.target_value = 0.0f;
entry.userdata = NULL;
@ -2397,8 +2393,3 @@ bool menu_widgets_set_libretro_message(const char *msg, unsigned duration)
return true;
}
bool menu_widgets_ready(void)
{
return menu_widgets_inited;
}

2
menu/widgets/menu_widgets.h
View File

@ -38,8 +38,8 @@
#define GENERIC_MESSAGE_DURATION 3000
bool menu_widgets_init(bool video_is_threaded);
void menu_widgets_free(void);
bool menu_widgets_ready(void);
bool menu_widgets_msg_queue_push(
retro_task_t *task, const char *msg,

67
retroarch.c
View File

@ -956,6 +956,20 @@ extern void libnx_apply_overclock(void);
#define menu_input_dialog_get_display_kb_internal() menu_input_dialog_keyboard_display
#endif
#ifdef HAVE_MENU_WIDGETS
static bool menu_widgets_inited = false;
menu_animation_ctx_tag menu_widgets_generic_tag = (uintptr_t) &menu_widgets_inited;
#endif
bool menu_widgets_ready(void)
{
#ifdef HAVE_MENU_WIDGETS
return menu_widgets_inited;
#else
return false;
#endif
}
static void menu_input_search_cb(void *userdata, const char *str)
{
size_t idx = 0;
@ -2182,7 +2196,7 @@ bool command_set_shader(const char *arg)
snprintf(msg, sizeof(msg),
"Shader: \"%s\"", arg ? path_basename(arg) : "null");
#ifdef HAVE_MENU_WIDGETS
if (!menu_widgets_ready() || !menu_widgets_set_message(msg))
if (!menu_widgets_inited || !menu_widgets_set_message(msg))
#endif
runloop_msg_queue_push(msg, 1, 120, true, NULL,
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@ -2846,7 +2860,7 @@ static void command_event_set_volume(float gain)
new_volume);
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!menu_widgets_ready() || !menu_widgets_volume_update_and_show())
if (!menu_widgets_inited || !menu_widgets_volume_update_and_show())
#endif
runloop_msg_queue_push(msg, 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@ -3752,7 +3766,7 @@ static void retroarch_pause_checks(void)
command_event(CMD_EVENT_AUDIO_STOP, NULL);
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!menu_widgets_ready() || !menu_widgets_set_paused(is_paused))
if (!menu_widgets_inited || !menu_widgets_set_paused(is_paused))
#endif
runloop_msg_queue_push(msg_hash_to_str(MSG_PAUSED), 1,
1, true,
@ -3769,7 +3783,7 @@ static void retroarch_pause_checks(void)
else
{
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (menu_widgets_ready())
if (menu_widgets_inited)
menu_widgets_set_paused(is_paused);
#endif
RARCH_LOG("%s\n", msg_hash_to_str(MSG_UNPAUSED));
@ -6704,7 +6718,7 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
const struct retro_message *msg = (const struct retro_message*)data;
RARCH_LOG("Environ SET_MESSAGE: %s\n", msg->msg);
#ifdef HAVE_MENU_WIDGETS
if (!menu_widgets_ready() || !menu_widgets_set_libretro_message(msg->msg, roundf((float)msg->frames / 60.0f * 1000.0f)))
if (!menu_widgets_inited || !menu_widgets_set_libretro_message(msg->msg, roundf((float)msg->frames / 60.0f * 1000.0f)))
#endif
runloop_msg_queue_push(msg->msg, 3, msg->frames, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
break;
@ -18301,7 +18315,7 @@ void video_driver_frame(const void *data, unsigned width,
if (video_info.fps_show || video_info.framecount_show)
{
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!menu_widgets_ready() || !menu_widgets_set_fps_text(video_info.fps_text))
if (!menu_widgets_inited || !menu_widgets_set_fps_text(video_info.fps_text))
#endif
runloop_msg_queue_push(video_info.fps_text, 2, 1, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
}
@ -18456,7 +18470,7 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_info->fps_text[0] = '\0';
#ifdef HAVE_MENU_WIDGETS
video_info->widgets_inited = menu_widgets_ready();
video_info->widgets_inited = menu_widgets_inited;
#else
video_info->widgets_inited = false;
#endif
@ -19808,20 +19822,10 @@ static void drivers_init(int flags)
if (settings->bools.menu_enable_widgets
&& video_driver_has_widgets())
{
/* TODO/FIXME - get rid of this local variable
* once we have moved it over */
bool widgets_inited = menu_widgets_ready();
if (!menu_widgets_inited)
menu_widgets_inited = menu_widgets_init(video_is_threaded);
if (!widgets_inited)
{
if (menu_widgets_init(video_is_threaded))
{
/* TODO/FIXME - set menu_widgets_inited to true here */
}
}
widgets_inited = menu_widgets_ready();
if (widgets_inited)
if (menu_widgets_inited)
menu_widgets_context_reset(video_is_threaded,
video_driver_width, video_driver_height);
}
@ -19881,10 +19885,11 @@ static void driver_uninit(int flags)
/* This absolutely has to be done before video_driver_free()
* is called/completes, otherwise certain menu drivers
* (e.g. Vulkan) will segfault */
if (menu_widgets_ready())
if (menu_widgets_inited)
{
menu_widgets_context_destroy();
menu_widgets_free();
menu_widgets_inited = false;
}
#endif
menu_driver_ctl(RARCH_MENU_CTL_DEINIT, NULL);
@ -19952,10 +19957,11 @@ bool driver_ctl(enum driver_ctl_state state, void *data)
* in case the handle is lost in the threaded
* video driver in the meantime
* (breaking video_driver_has_widgets) */
if (menu_widgets_ready())
if (menu_widgets_inited)
{
menu_widgets_context_destroy();
menu_widgets_free();
menu_widgets_inited = false;
}
#endif
@ -22063,8 +22069,7 @@ static void runloop_task_msg_queue_push(
bool flush)
{
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
bool ready = menu_widgets_ready();
if (ready && task->title && !task->mute)
if (menu_widgets_inited && task->title && !task->mute)
{
runloop_msg_queue_lock();
ui_companion_driver_msg_queue_push(msg,
@ -22943,7 +22948,7 @@ void runloop_msg_queue_push(const char *msg,
runloop_msg_queue_lock();
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (menu_widgets_ready())
if (menu_widgets_inited)
{
menu_widgets_msg_queue_push(NULL, msg,
roundf((float)duration / 60.0f * 1000.0f),
@ -23175,7 +23180,7 @@ static void update_fastforwarding_state(void)
if (runloop_fastmotion)
{
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!menu_widgets_ready() || !menu_widgets_set_fast_forward(true))
if (!menu_widgets_inited || !menu_widgets_set_fast_forward(true))
#endif
runloop_msg_queue_push(
msg_hash_to_str(MSG_FAST_FORWARD), 1, 1, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@ -23183,7 +23188,7 @@ static void update_fastforwarding_state(void)
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
else
{
if (menu_widgets_ready())
if (menu_widgets_inited)
menu_widgets_set_fast_forward(false);
}
#endif
@ -23407,7 +23412,7 @@ static enum runloop_state runloop_check_state(void)
menu_animation_update();
#ifdef HAVE_MENU_WIDGETS
if (menu_widgets_ready())
if (menu_widgets_inited)
{
runloop_msg_queue_lock();
menu_widgets_iterate(video_driver_width, video_driver_height);
@ -23879,14 +23884,14 @@ static enum runloop_state runloop_check_state(void)
settings->uints.rewind_granularity, runloop_paused, s, sizeof(s), &t);
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!menu_widgets_ready())
if (!menu_widgets_inited)
#endif
if (rewinding)
runloop_msg_queue_push(s, 0, t, true, NULL,
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (menu_widgets_ready())
if (menu_widgets_inited)
menu_widgets_set_rewind(rewinding);
#endif
}
@ -23915,7 +23920,7 @@ static enum runloop_state runloop_check_state(void)
video_driver_cached_frame();
#if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
if (!menu_widgets_ready())
if (!menu_widgets_inited)
{
#endif
if (state_manager_frame_is_reversed())

2
retroarch.h
View File

@ -2102,6 +2102,8 @@ bool menu_driver_is_toggled(void);
bool menu_driver_is_toggled(void);
bool menu_widgets_ready(void);
RETRO_END_DECLS
#endif