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

Create MENU_ANIMATION_CTL_DEINIT

This commit is contained in:
twinaphex 2015-12-11 12:00:49 +01:00
parent 2d0a8ec9b5
commit fdf17808e0
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/menu_animation.c
View File

@ -375,7 +375,7 @@ static void menu_animation_push_internal(menu_animation_t *anim, const struct tw
*target = *t; *target = *t;
} }
void menu_animation_free(void) static void menu_animation_free(void)
{ {
size_t i; size_t i;
menu_animation_t *anim = menu_animation_get_ptr(); menu_animation_t *anim = menu_animation_get_ptr();
@ -632,6 +632,9 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
switch (state) switch (state)
{ {
case MENU_ANIMATION_CTL_DEINIT:
menu_animation_free();
break;
case MENU_ANIMATION_CTL_IS_ACTIVE: case MENU_ANIMATION_CTL_IS_ACTIVE:
return anim->is_active; return anim->is_active;
case MENU_ANIMATION_CTL_CLEAR_ACTIVE: case MENU_ANIMATION_CTL_CLEAR_ACTIVE:

3
menu/menu_animation.h
View File

@ -35,6 +35,7 @@ typedef void (*tween_cb) (void);
enum menu_animation_ctl_state enum menu_animation_ctl_state
{ {
MENU_ANIMATION_CTL_IS_ACTIVE = 0, MENU_ANIMATION_CTL_IS_ACTIVE = 0,
MENU_ANIMATION_CTL_DEINIT,
MENU_ANIMATION_CTL_CLEAR_ACTIVE, MENU_ANIMATION_CTL_CLEAR_ACTIVE,
MENU_ANIMATION_CTL_SET_ACTIVE, MENU_ANIMATION_CTL_SET_ACTIVE,
MENU_ANIMATION_CTL_DELTA_TIME, MENU_ANIMATION_CTL_DELTA_TIME,
@ -88,8 +89,6 @@ enum menu_animation_easing_type
EASING_OUT_IN_BOUNCE EASING_OUT_IN_BOUNCE
}; };
void menu_animation_free(void);
void menu_animation_kill_by_subject(size_t count, const void *subjects); void menu_animation_kill_by_subject(size_t count, const void *subjects);
void menu_animation_kill_by_tag(int tag); void menu_animation_kill_by_tag(int tag);

2
menu/menu_display.c
View File

@ -113,7 +113,7 @@ void menu_display_free(void)
msg_queue_free(disp->msg_queue); msg_queue_free(disp->msg_queue);
disp->msg_queue = NULL; disp->msg_queue = NULL;
menu_animation_free(); menu_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
menu_display_fb_free(&frame_buf_state); menu_display_fb_free(&frame_buf_state);
memset(&frame_buf_state, 0, sizeof(menu_framebuf_t)); memset(&frame_buf_state, 0, sizeof(menu_framebuf_t));