Combine fast-forward widget as frame throttle widget

Author: sonninnos

gfx/gfx_widgets.c

@@ -1559,9 +1559,9 @@ void gfx_widgets_frame(void *data)
    unsigned video_width             = video_info->width;
    unsigned video_height            = video_info->height;
    bool widgets_is_paused           = (video_info->video_st_flags & VIDEO_FLAG_WIDGETS_PAUSED) ? true : false;
-   bool widgets_is_fastforwarding   = (video_info->video_st_flags & VIDEO_FLAG_WIDGETS_FAST_FORWARD) ? true : false;
+   bool widgets_is_fastmotion       = (video_info->video_st_flags & VIDEO_FLAG_WIDGETS_FASTMOTION) ? true : false;
+   bool widgets_is_slowmotion       = (video_info->video_st_flags & VIDEO_FLAG_WIDGETS_SLOWMOTION) ? true : false;
    bool widgets_is_rewinding        = (video_info->video_st_flags & VIDEO_FLAG_WIDGETS_REWINDING) ? true : false;
-   bool runloop_is_slowmotion       = video_info->runloop_is_slowmotion;
 #ifdef HAVE_MENU
    bool menu_screensaver_active     = (video_info->menu_st_flags & MENU_ST_FLAG_SCREENSAVER_ACTIVE) ? true : false;
 #endif
@@ -1764,7 +1764,7 @@ void gfx_widgets_frame(void *data)
             top_right_x_advance,
             MSG_PAUSED);
 
-   if (widgets_is_fastforwarding)
+   if (widgets_is_fastmotion)
       top_right_x_advance -= gfx_widgets_draw_indicator(
             p_dispwidget,
             p_disp,
@@ -1792,7 +1792,7 @@ void gfx_widgets_frame(void *data)
             top_right_x_advance,
             MSG_REWINDING);
 
-   if (runloop_is_slowmotion)
+   if (widgets_is_slowmotion)
    {
       top_right_x_advance -= gfx_widgets_draw_indicator(
             p_dispwidget,

gfx/video_driver.h

@@ -138,34 +138,35 @@ enum video_driver_state_flags
    VIDEO_FLAG_DEFERRED_VIDEO_CTX_DRIVER_SET_FLAGS = (1 << 0 ),
    VIDEO_FLAG_WINDOW_TITLE_UPDATE                 = (1 << 1 ),
    VIDEO_FLAG_WIDGETS_PAUSED                      = (1 << 2 ),
-   VIDEO_FLAG_WIDGETS_FAST_FORWARD                = (1 << 3 ),
-   VIDEO_FLAG_WIDGETS_REWINDING                   = (1 << 4 ),
-   VIDEO_FLAG_STARTED_FULLSCREEN                  = (1 << 5 ),
+   VIDEO_FLAG_WIDGETS_FASTMOTION                  = (1 << 3 ),
+   VIDEO_FLAG_WIDGETS_SLOWMOTION                  = (1 << 4 ),
+   VIDEO_FLAG_WIDGETS_REWINDING                   = (1 << 5 ),
+   VIDEO_FLAG_STARTED_FULLSCREEN                  = (1 << 6 ),
    /* Graphics driver requires RGBA byte order data (ABGR on little-endian)
     * for 32-bit.
     * This takes effect for overlay and shader cores that wants to load
     * data into graphics driver. Kinda hackish to place it here, it is only
     * used for GLES.
     * TODO: Refactor this better. */
-   VIDEO_FLAG_USE_RGBA                            = (1 << 6 ),
+   VIDEO_FLAG_USE_RGBA                            = (1 << 7 ),
    /* Graphics driver supports HDR displays
     * Currently only D3D11/D3D12/Vulkan supports HDR displays
     * on Windows and whether we've enabled it */
-   VIDEO_FLAG_HDR_SUPPORT                         = (1 << 7 ),
+   VIDEO_FLAG_HDR_SUPPORT                         = (1 << 8 ),
    /* If set during context deinit, the driver should keep
     * graphics context alive to avoid having to reset all
     * context state. */
-   VIDEO_FLAG_CACHE_CONTEXT                       = (1 << 8 ),
+   VIDEO_FLAG_CACHE_CONTEXT                       = (1 << 9 ),
    /* Set to true by driver if context caching succeeded. */
-   VIDEO_FLAG_CACHE_CONTEXT_ACK                   = (1 << 9 ),
-   VIDEO_FLAG_ACTIVE                              = (1 << 10),
-   VIDEO_FLAG_STATE_OUT_RGB32                     = (1 << 11),
-   VIDEO_FLAG_CRT_SWITCHING_ACTIVE                = (1 << 12),
-   VIDEO_FLAG_FORCE_FULLSCREEN                    = (1 << 13),
-   VIDEO_FLAG_IS_SWITCHING_DISPLAY_MODE           = (1 << 14),
-   VIDEO_FLAG_SHADER_PRESETS_NEED_RELOAD          = (1 << 15),
-   VIDEO_FLAG_CLI_SHADER_DISABLE                  = (1 << 16),
-   VIDEO_FLAG_RUNAHEAD_IS_ACTIVE                  = (1 << 17)
+   VIDEO_FLAG_CACHE_CONTEXT_ACK                   = (1 << 10),
+   VIDEO_FLAG_ACTIVE                              = (1 << 11),
+   VIDEO_FLAG_STATE_OUT_RGB32                     = (1 << 12),
+   VIDEO_FLAG_CRT_SWITCHING_ACTIVE                = (1 << 13),
+   VIDEO_FLAG_FORCE_FULLSCREEN                    = (1 << 14),
+   VIDEO_FLAG_IS_SWITCHING_DISPLAY_MODE           = (1 << 15),
+   VIDEO_FLAG_SHADER_PRESETS_NEED_RELOAD          = (1 << 16),
+   VIDEO_FLAG_CLI_SHADER_DISABLE                  = (1 << 17),
+   VIDEO_FLAG_RUNAHEAD_IS_ACTIVE                  = (1 << 18)
 };
 
 struct LinkInfo

intl/msg_hash_us.h

@@ -6157,13 +6157,13 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_SAVE_STATE,
    "Display an on-screen message when saving and loading save states."
    )
-MSG_HASH(
+MSG_HASH( /* FIXME: Rename config key and msg hash */
    MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_FAST_FORWARD,
-   "Fast-Forward Notifications"
+   "Frame Throttle Notifications"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_FAST_FORWARD,
-   "Display an on-screen indicator when fast-forwarding content."
+   "Display an on-screen indicator when fast-forward, slow-motion or rewind is active."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_SCREENSHOT,

runloop.c

@@ -4049,7 +4049,7 @@ static void runloop_apply_fastmotion_override(runloop_state_t *runloop_st,
 #if defined(HAVE_GFX_WIDGETS)
       if (      p_dispwidget->active
             && !(runloop_st->flags & RUNLOOP_FLAG_FASTMOTION))
-         video_st->flags &= ~VIDEO_FLAG_WIDGETS_FAST_FORWARD;
+         video_st->flags &= ~VIDEO_FLAG_WIDGETS_FASTMOTION;
 #endif
    }
 
@@ -6471,15 +6471,15 @@ static enum runloop_state_enum runloop_check_state(
 #if defined(HAVE_GFX_WIDGETS)
          if (widgets_active)
          {
-            if (rewinding)
+            if (rewinding && settings->bools.notification_show_fast_forward)
                video_st->flags |=  VIDEO_FLAG_WIDGETS_REWINDING;
             else
                video_st->flags &= ~VIDEO_FLAG_WIDGETS_REWINDING;
          }
          else
 #endif
          {
-            if (rewinding)
+            if (rewinding && settings->bools.notification_show_fast_forward)
                runloop_msg_queue_push(s, strlen(s), 0, t, true, NULL,
                      MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          }
@@ -6792,12 +6792,12 @@ static enum runloop_state_enum runloop_check_state(
          if (settings->bools.notification_show_fast_forward)
          {
             if (runloop_st->flags & RUNLOOP_FLAG_FASTMOTION)
-               video_st->flags |=  VIDEO_FLAG_WIDGETS_FAST_FORWARD;
+               video_st->flags |=  VIDEO_FLAG_WIDGETS_FASTMOTION;
             else
-               video_st->flags &= ~VIDEO_FLAG_WIDGETS_FAST_FORWARD;
+               video_st->flags &= ~VIDEO_FLAG_WIDGETS_FASTMOTION;
          }
          else
-            video_st->flags    &= ~VIDEO_FLAG_WIDGETS_FAST_FORWARD;
+            video_st->flags    &= ~VIDEO_FLAG_WIDGETS_FASTMOTION;
       }
       else
 #endif
@@ -6815,7 +6815,7 @@ static enum runloop_state_enum runloop_check_state(
    }
 #if defined(HAVE_GFX_WIDGETS)
    else
-      video_st->flags &= ~VIDEO_FLAG_WIDGETS_FAST_FORWARD;
+      video_st->flags &= ~VIDEO_FLAG_WIDGETS_FASTMOTION;
 #endif
 
 #ifdef HAVE_CHEEVOS
@@ -6892,6 +6892,21 @@ static enum runloop_state_enum runloop_check_state(
          old_slowmotion_button_state                  = new_slowmotion_button_state;
          old_slowmotion_hold_button_state             = new_slowmotion_hold_button_state;
       }
+
+#if defined(HAVE_GFX_WIDGETS)
+      if (widgets_active)
+      {
+         if (settings->bools.notification_show_fast_forward)
+         {
+            if (runloop_st->flags & RUNLOOP_FLAG_SLOWMOTION)
+               video_st->flags |=  VIDEO_FLAG_WIDGETS_SLOWMOTION;
+            else
+               video_st->flags &= ~VIDEO_FLAG_WIDGETS_SLOWMOTION;
+         }
+         else
+            video_st->flags    &= ~VIDEO_FLAG_WIDGETS_SLOWMOTION;
+      }
+#endif
    }
 
    /* Check save state slot hotkeys */