Overhaul frameskip options

1 files changed, 43 insertions, 26 deletions

diff --git a/libretro_core_options.h b/libretro_core_options.h
index e9cfba3..7e68022 100644
--- a/libretro_core_options.h
+++ b/libretro_core_options.h
@@ -54,45 +54,62 @@ extern "C" {
 
 struct retro_core_option_definition option_defs_us[] = {
    {
-      "gpsp_frameskip_type",
-      "Frameskip Type",
-      "Skip frames to improve performance at the expense of visual smoothness. 'Manual' skips frames at an interval set by 'Frameskip Value' and 'Frameskip Variation'. 'Automatic' attempts to adjust frame skipping based on CPU load.",
+      "gpsp_frameskip",
+      "Frameskip",
+      "Skip frames to avoid audio buffer under-run (crackling). Improves performance at the expense of visual smoothness. 'Auto' skips frames when advised by the frontend. 'Auto (Threshold)' utilises the 'Frameskip Threshold (%)' setting. 'Fixed Interval' utilises the 'Frameskip Interval' setting.",
       {
-         { "off",       "disabled" },
-         { "manual",    "Manual" },
-         { "automatic", "Automatic" },
+         { "disabled",       NULL },
+         { "auto",           "Auto" },
+         { "auto_threshold", "Auto (Threshold)" },
+         { "fixed_interval", "Fixed Interval" },
          { NULL, NULL },
       },
-      "off"
+      "disabled"
    },
    {
-      "gpsp_frameskip_value",
-      "Frameskip Value",
-      "When 'Frameskip Type' is 'Manual', the value set here is the number of frames omitted after a frame is rendered - i.e. '1' = 30fps, '2' = 15fps, etc.",
+      "gpsp_frameskip_threshold",
+      "Frameskip Threshold (%)",
+      "When 'Frameskip' is set to 'Auto (Threshold)', specifies the audio buffer occupancy threshold (percentage) below which frames will be skipped. Higher values reduce the risk of crackling by causing frames to be dropped more frequently.",
       {
-         { "1", NULL },
-         { "2", NULL },
-         { "3", NULL },
-         { "4", NULL },
-         { "5", NULL },
-         { "6", NULL },
-         { "7", NULL },
-         { "8", NULL },
-         { "9", NULL },
+         { "15", NULL },
+         { "18", NULL },
+         { "21", NULL },
+         { "24", NULL },
+         { "27", NULL },
+         { "30", NULL },
+         { "33", NULL },
+         { "36", NULL },
+         { "39", NULL },
+         { "42", NULL },
+         { "45", NULL },
+         { "48", NULL },
+         { "51", NULL },
+         { "54", NULL },
+         { "57", NULL },
+         { "60", NULL },
          { NULL, NULL },
       },
-      "1"
+      "33"
    },
    {
-      "gpsp_frameskip_variation",
-      "Frameskip Variation",
-      "When 'Frameskip Type' is 'Manual', specifies whether frame skipping should occur at regular ('Uniform') intervals, or with an element of 'Random' variation (may help reduce the visual impact of stuttering).",
+      "gpsp_frameskip_interval",
+      "Frameskip Interval",
+      "When 'Frameskip' is set to 'Fixed Interval', the value set here is the number of frames omitted after a frame is rendered - i.e. '0' = 60fps, '1' = 30fps, '2' = 15fps, etc.",
       {
-         { "uniform", "Uniform" },
-         { "random",  "Random" },
+         { "0",  NULL },
+         { "1",  NULL },
+         { "2",  NULL },
+         { "3",  NULL },
+         { "4",  NULL },
+         { "5",  NULL },
+         { "6",  NULL },
+         { "7",  NULL },
+         { "8",  NULL },
+         { "9",  NULL },
+         { "10", NULL },
          { NULL, NULL },
       },
-      "uniform"
+      "1"
    },
    {
       "gpsp_color_correction",