From 242a7eb914772a0822b8a52148cce740d31470de Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 23 Sep 2018 11:25:24 +0200
Subject: [PATCH] Reimplement get_value callback for audio resampler quality -
 action OK now triggers a dropdown list

---
 menu/cbs/menu_cbs_get_value.c | 51 -----------------------------------
 menu/menu_setting.c           | 43 ++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index a087141bc7..09f968f41f 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -17,7 +17,6 @@
 #include <compat/strl.h>
 #include <string/stdstring.h>
 #include <lists/string_list.h>
-#include <audio/audio_resampler.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
@@ -281,52 +280,6 @@ static void menu_action_setting_disp_set_label_shader_filter_pass(
   }
 }
 
-static void menu_action_setting_disp_set_label_audio_resampler_quality(
-      file_list_t* list,
-      unsigned *w, unsigned type, unsigned i,
-      const char *label,
-      char *s, size_t len,
-      const char *entry_label,
-      const char *path,
-      char *s2, size_t len2)
-{
-   settings_t *settings = config_get_ptr();
-   *s = '\0';
-   *w = 19;
-   strlcpy(s2, path, len2);
-
-   if (settings)
-   {
-      switch (settings->uints.audio_resampler_quality)
-      {
-         case RESAMPLER_QUALITY_DONTCARE:
-            strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DONT_CARE),
-                  len);
-            break;
-         case RESAMPLER_QUALITY_LOWEST:
-            strlcpy(s, "Lowest",
-                  len);
-            break;
-         case RESAMPLER_QUALITY_LOWER:
-            strlcpy(s, "Lower",
-                  len);
-            break;
-         case RESAMPLER_QUALITY_HIGHER:
-            strlcpy(s, "Higher",
-                  len);
-            break;
-         case RESAMPLER_QUALITY_HIGHEST:
-            strlcpy(s, "Highest",
-                  len);
-            break;
-         case RESAMPLER_QUALITY_NORMAL:
-            strlcpy(s, "Normal",
-                  len);
-            break;
-      }
-   }
-}
-
 static void menu_action_setting_disp_set_label_filter(
       file_list_t* list,
       unsigned *w, unsigned type, unsigned i,
@@ -2115,10 +2068,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
             BIND_ACTION_GET_VALUE(cbs,
                   menu_action_setting_disp_set_label_remap_file_load);
             break;
-         case MENU_ENUM_LABEL_AUDIO_RESAMPLER_QUALITY:
-            BIND_ACTION_GET_VALUE(cbs,
-                  menu_action_setting_disp_set_label_audio_resampler_quality);
-            break;
          case MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS:
             BIND_ACTION_GET_VALUE(cbs,
                   menu_action_setting_disp_set_label_shader_filter_pass);
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 5736e9c20c..f5fa1e6a9f 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -624,7 +624,8 @@ static void setting_get_string_representation_uint_video_rotation(void *data,
    }
 }
 
-static void setting_get_string_representation_uint_aspect_ratio_index(void *data,
+static void setting_get_string_representation_uint_aspect_ratio_index(
+      void *data,
       char *s, size_t len)
 {
    rarch_setting_t *setting = (rarch_setting_t*)data;
@@ -634,6 +635,43 @@ static void setting_get_string_representation_uint_aspect_ratio_index(void *data
             len);
 }
 
+static void setting_get_string_representation_uint_audio_resampler_quality(
+      void *data,
+      char *s, size_t len)
+{
+   rarch_setting_t *setting = (rarch_setting_t*)data;
+   if (!setting)
+      return;
+
+   switch (*setting->value.target.unsigned_integer)
+   {
+      case RESAMPLER_QUALITY_DONTCARE:
+         strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DONT_CARE),
+               len);
+         break;
+      case RESAMPLER_QUALITY_LOWEST:
+         strlcpy(s, "Lowest",
+               len);
+         break;
+      case RESAMPLER_QUALITY_LOWER:
+         strlcpy(s, "Lower",
+               len);
+         break;
+      case RESAMPLER_QUALITY_HIGHER:
+         strlcpy(s, "Higher",
+               len);
+         break;
+      case RESAMPLER_QUALITY_HIGHEST:
+         strlcpy(s, "Highest",
+               len);
+         break;
+      case RESAMPLER_QUALITY_NORMAL:
+         strlcpy(s, "Normal",
+               len);
+         break;
+   }
+}
+
 static void setting_get_string_representation_uint_libretro_device(void *data,
       char *s, size_t len)
 {
@@ -4814,6 +4852,9 @@ static bool setting_append_list(
                parent_group,
                general_write_handler,
                general_read_handler);
+         (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
+         (*list)[list_info->index - 1].get_string_representation =
+            &setting_get_string_representation_uint_audio_resampler_quality;
          menu_settings_list_current_add_range(list, list_info, RESAMPLER_QUALITY_DONTCARE, RESAMPLER_QUALITY_HIGHEST, 1.0, true, true);
 
          CONFIG_FLOAT(