ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2020-02-17 21:47:09 +01:00
parent 7c7d0f596a
commit ebc335319e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cheevos-new/cheevos.c
View File

@ -36,10 +36,11 @@
#ifdef HAVE_MENU #ifdef HAVE_MENU
#include "../menu/menu_driver.h" #include "../menu/menu_driver.h"
#include "../menu/menu_entries.h" #include "../menu/menu_entries.h"
#endif
#ifdef HAVE_GFX_WIDGETS #ifdef HAVE_GFX_WIDGETS
#include "../gfx/gfx_widgets.h" #include "../gfx/gfx_widgets.h"
#endif #endif
#endif
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
#include <rthreads/rthreads.h> #include <rthreads/rthreads.h>

12
retroarch.c
View File

@ -25967,8 +25967,8 @@ static void runloop_task_msg_queue_push(
ui_companion_driver_msg_queue_push(msg, ui_companion_driver_msg_queue_push(msg,
prio, task ? duration : duration * 60 / 1000, flush); prio, task ? duration : duration * 60 / 1000, flush);
#ifdef HAVE_ACCESSIBILITY #ifdef HAVE_ACCESSIBILITY
if (is_accessibility_enabled()) if (is_accessibility_enabled())
accessibility_speak_priority((char*)msg, 0); accessibility_speak_priority((char*)msg, 0);
#endif #endif
gfx_widgets_msg_queue_push(task, msg, duration, NULL, (enum message_queue_icon)MESSAGE_QUEUE_CATEGORY_INFO, (enum message_queue_category)MESSAGE_QUEUE_ICON_DEFAULT, prio, flush, gfx_widgets_msg_queue_push(task, msg, duration, NULL, (enum message_queue_icon)MESSAGE_QUEUE_CATEGORY_INFO, (enum message_queue_category)MESSAGE_QUEUE_ICON_DEFAULT, prio, flush,
#ifdef HAVE_MENU #ifdef HAVE_MENU
@ -26846,10 +26846,6 @@ void runloop_msg_queue_push(const char *msg,
#if defined(HAVE_GFX_WIDGETS) #if defined(HAVE_GFX_WIDGETS)
if (gfx_widgets_inited) if (gfx_widgets_inited)
{ {
#ifdef HAVE_ACCESSIBILITY
if (is_accessibility_enabled())
accessibility_speak_priority((char*)msg, 0);
#endif
gfx_widgets_msg_queue_push(NULL, msg, gfx_widgets_msg_queue_push(NULL, msg,
roundf((float)duration / 60.0f * 1000.0f), roundf((float)duration / 60.0f * 1000.0f),
title, icon, category, prio, flush, title, icon, category, prio, flush,
@ -27351,7 +27347,7 @@ static enum runloop_state runloop_check_state(void)
} }
} }
#if defined(HAVE_MENU) #if defined(HAVE_MENU) || defined(HAVE_MENU_WIDGETS)
gfx_animation_update( gfx_animation_update(
settings->bools.menu_timedate_enable, settings->bools.menu_timedate_enable,
settings->floats.menu_ticker_speed, settings->floats.menu_ticker_speed,
@ -27370,6 +27366,7 @@ static enum runloop_state runloop_check_state(void)
} }
#endif #endif
#ifdef HAVE_MENU
if (menu_is_alive) if (menu_is_alive)
{ {
enum menu_action action; enum menu_action action;
@ -27496,6 +27493,7 @@ static enum runloop_state runloop_check_state(void)
return RUNLOOP_STATE_POLLED_AND_SLEEP; return RUNLOOP_STATE_POLLED_AND_SLEEP;
} }
else else
#endif
#endif #endif
{ {
if (runloop_idle) if (runloop_idle)