From 75fee188e23190a2850371ebedd2bd5e6c8da30b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 5 Mar 2014 03:40:55 +0100
Subject: [PATCH] (Xbox 1) Refactor Xbox 1-only audio volume setting

---
 frontend/menu/menu_common.c   | 5 ++---
 frontend/menu/menu_common.h   | 2 +-
 frontend/menu/menu_settings.c | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index df146da60c..d3289fcb82 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -2082,10 +2082,9 @@ void menu_populate_entries(void *data, unsigned menu_type)
          file_list_push(rgui->selection_buf, "System BGM Control", RGUI_SETTINGS_CUSTOM_BGM_CONTROL_ENABLE, 0);
 #endif
 #ifdef _XBOX1
-         file_list_push(rgui->selection_buf, "Volume Level", RGUI_SETTINGS_AUDIO_VOLUME_LEVEL, 0);
-#else
-         file_list_push(rgui->selection_buf, "Volume Level", RGUI_SETTINGS_AUDIO_VOLUME, 0);
+         file_list_push(rgui->selection_buf, "Volume Effect", RGUI_SETTINGS_AUDIO_DSP_EFFECT, 0);
 #endif
+         file_list_push(rgui->selection_buf, "Volume Level", RGUI_SETTINGS_AUDIO_VOLUME, 0);
          break;
       case RGUI_SETTINGS_DRIVERS:
          file_list_clear(rgui->selection_buf);
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 248aa87585..b1a4c7e804 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -153,7 +153,7 @@ typedef enum
    RGUI_SETTINGS_RESTART_GAME,
    RGUI_SETTINGS_AUDIO_MUTE,
    RGUI_SETTINGS_AUDIO_CONTROL_RATE_DELTA,
-   RGUI_SETTINGS_AUDIO_VOLUME_LEVEL, // XBOX1 only it seems. FIXME: Refactor this?
+   RGUI_SETTINGS_AUDIO_DSP_EFFECT,
    RGUI_SETTINGS_AUDIO_VOLUME,
    RGUI_SETTINGS_CUSTOM_BGM_CONTROL_ENABLE,
    RGUI_SETTINGS_ZIP_EXTRACT,
diff --git a/frontend/menu/menu_settings.c b/frontend/menu/menu_settings.c
index 6ab2f8853b..44ed2de05a 100644
--- a/frontend/menu/menu_settings.c
+++ b/frontend/menu/menu_settings.c
@@ -2211,7 +2211,7 @@ void menu_set_settings_label(char *type_str, size_t type_str_size, unsigned *w,
       case RGUI_SETTINGS_BIND_MENU_TOGGLE:
          input_get_bind_string(type_str, &g_settings.input.binds[rgui->current_pad][type - RGUI_SETTINGS_BIND_BEGIN], type_str_size);
          break;
-      case RGUI_SETTINGS_AUDIO_VOLUME_LEVEL:
+      case RGUI_SETTINGS_AUDIO_DSP_EFFECT:
 #ifdef RARCH_CONSOLE
          strlcpy(type_str, (g_extern.console.sound.volume_level) ? "Loud" : "Normal", type_str_size);
          break;