From 9ee39544236846f84b34d70e5b0a9954fec7bb2b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 25 Sep 2015 23:42:00 +0200
Subject: [PATCH] Refactor menu_animation_set_active

---
 menu/cbs/menu_cbs_get_value.c |  2 +-
 menu/drivers/glui.c           |  2 +-
 menu/menu_animation.c         | 11 +++--------
 menu/menu_animation.h         |  3 +--
 menu/menu_input.c             |  4 ++--
 menu/menu_setting.c           |  2 +-
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 2616d4ce73..386ac78a2b 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -457,7 +457,7 @@ static void general_disp_set_label_perf_counters(
 
    menu_action_setting_disp_set_label_perf_counters_common(
          counters, offset, s, len);
-   menu_animation_set_active();
+   menu_animation_ctl(MENU_ANIMATION_CTL_SET_ACTIVE, NULL);
 }
 
 static void menu_action_setting_disp_set_label_perf_counters(
diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index 309e9d90b5..25742f78d3 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -452,7 +452,7 @@ static void glui_frame(void)
          width, height,
          &highlight_bg[0]);
 
-   menu_animation_set_active();
+   menu_animation_ctl(MENU_ANIMATION_CTL_SET_ACTIVE, NULL);
 
    glui_render_quad(gl, 0, 0, width,
          header_height,
diff --git a/menu/menu_animation.c b/menu/menu_animation.c
index 76ef0f18f4..0eff82df49 100644
--- a/menu/menu_animation.c
+++ b/menu/menu_animation.c
@@ -670,14 +670,6 @@ void menu_animation_update_time(void)
    }
 }
 
-void menu_animation_set_active(void)
-{
-   menu_animation_t *anim   = menu_animation_get_ptr();
-   if (!anim)
-      return;
-   anim->is_active           = true;
-}
-
 bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
 {
    menu_animation_t *anim   = menu_animation_get_ptr();
@@ -692,6 +684,9 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
       case MENU_ANIMATION_CTL_CLEAR_ACTIVE:
          anim->is_active           = false;
          return true;
+      case MENU_ANIMATION_CTL_SET_ACTIVE:
+         anim->is_active           = true;
+         return true;
       case MENU_ANIMATION_CTL_DELTA_TIME:
          {
             float *ptr = (float*)data;
diff --git a/menu/menu_animation.h b/menu/menu_animation.h
index 29cfbf2e69..5d9a7f6f81 100644
--- a/menu/menu_animation.h
+++ b/menu/menu_animation.h
@@ -38,6 +38,7 @@ enum menu_animation_ctl_state
 {
    MENU_ANIMATION_CTL_IS_ACTIVE = 0,
    MENU_ANIMATION_CTL_CLEAR_ACTIVE,
+   MENU_ANIMATION_CTL_SET_ACTIVE,
    MENU_ANIMATION_CTL_DELTA_TIME
 };
 
@@ -115,8 +116,6 @@ void menu_animation_ticker_str(char *s, size_t len, uint64_t tick,
 
 void menu_animation_update_time(void);
 
-void menu_animation_set_active(void);
-
 bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data);
 
 #ifdef __cplusplus
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 4747b461ae..79914c81d9 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -838,7 +838,7 @@ static int menu_input_mouse(unsigned *action)
          menu_input->mouse.scrollup      ||
          menu_input->mouse.scrolldown
       )
-      menu_animation_set_active();
+      menu_animation_ctl(MENU_ANIMATION_CTL_SET_ACTIVE, NULL);
 
    return 0;
 }
@@ -885,7 +885,7 @@ static int menu_input_pointer(unsigned *action)
          (menu_input->pointer.dy != 0)     ||
          (menu_input->pointer.dx != 0)
       )
-      menu_animation_set_active();
+      menu_animation_ctl(MENU_ANIMATION_CTL_SET_ACTIVE, NULL);
 
    return 0;
 }
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index e4d1d422c5..54ffa1d20e 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -1185,7 +1185,7 @@ static void setting_get_string_representation_st_float_video_refresh_rate_auto(v
    {
       snprintf(s, len, "%.3f Hz (%.1f%% dev, %u samples)",
             video_refresh_rate, 100.0 * deviation, sample_points);
-      menu_animation_set_active();
+      menu_animation_ctl(MENU_ANIMATION_CTL_SET_ACTIVE, NULL);
    }
    else
       strlcpy(s, menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE), len);