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-14 21:53:45 +01:00
parent 2992cbd261
commit d86eb46f15
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/menu_animation.c
View File

@ -1186,14 +1186,13 @@ bool menu_animation_push(menu_animation_ctx_entry_t *entry)
} }
static void menu_animation_update_time( static void menu_animation_update_time(
unsigned type,
bool timedate_enable, bool timedate_enable,
unsigned video_width, unsigned video_height, unsigned video_width, unsigned video_height,
float menu_ticker_speed) float menu_ticker_speed)
{ {
static retro_time_t static retro_time_t last_clock_update = 0;
last_clock_update = 0; static retro_time_t last_ticker_update = 0;
static retro_time_t
last_ticker_update = 0;
static retro_time_t static retro_time_t
last_ticker_slow_update = 0; last_ticker_slow_update = 0;
@ -1263,7 +1262,7 @@ static void menu_animation_update_time(
* system. We therefore take the same approach as GLUI, * system. We therefore take the same approach as GLUI,
* but with a different correction factor (expected * but with a different correction factor (expected
* scroll speed is somewhat lower for Ozone) */ * scroll speed is somewhat lower for Ozone) */
switch (menu_driver_ident_id()) switch (type)
{ {
case MENU_DRIVER_ID_RGUI: case MENU_DRIVER_ID_RGUI:
ticker_pixel_increment *= 0.25f; ticker_pixel_increment *= 0.25f;
@ -1295,6 +1294,7 @@ static void menu_animation_update_time(
} }
bool menu_animation_update( bool menu_animation_update(
unsigned type,
bool menu_timedate_enable, bool menu_timedate_enable,
float menu_ticker_speed, float menu_ticker_speed,
unsigned video_width, unsigned video_width,
@ -1303,6 +1303,7 @@ bool menu_animation_update(
unsigned i; unsigned i;
menu_animation_update_time( menu_animation_update_time(
type,
menu_timedate_enable, menu_timedate_enable,
video_width, video_height, video_width, video_height,
menu_ticker_speed); menu_ticker_speed);

1
menu/menu_animation.h
View File

@ -199,6 +199,7 @@ void menu_timer_start(menu_timer_t *timer, menu_timer_ctx_entry_t *timer_entry);
void menu_timer_kill(menu_timer_t *timer); void menu_timer_kill(menu_timer_t *timer);
bool menu_animation_update( bool menu_animation_update(
unsigned type,
bool menu_timedate_enable, bool menu_timedate_enable,
float menu_ticker_speed, float menu_ticker_speed,
unsigned video_width, unsigned video_width,

1
retroarch.c
View File

@ -27279,6 +27279,7 @@ static enum runloop_state runloop_check_state(void)
#if defined(HAVE_MENU) #if defined(HAVE_MENU)
menu_animation_update( menu_animation_update(
menu_driver_ident_id(),
settings->bools.menu_timedate_enable, settings->bools.menu_timedate_enable,
settings->floats.menu_ticker_speed, settings->floats.menu_ticker_speed,
video_driver_width, video_driver_height); video_driver_width, video_driver_height);