diff --git a/audio/dsound.c b/audio/dsound.c index 7864bf20bb..03a539e4ae 100644 --- a/audio/dsound.c +++ b/audio/dsound.c @@ -357,18 +357,6 @@ static void *dsound_init(const char *device, unsigned rate, unsigned latency) goto error; IDirectSoundBuffer_SetVolume(ds->dsb, DSBVOLUME_MAX); - -#ifdef _XBOX - if(g_extern.console.sound.volume_level == 1) - { - dsmb.dwMixBinCount = 8; - dsmb.lpMixBinVolumePairs = dsmbvp; - - IDirectSoundBuffer_SetHeadroom(ds->dsb, DSBHEADROOM_MIN); - IDirectSoundBuffer_SetMixBins(ds->dsb, &dsmb); - } -#endif - IDirectSoundBuffer_SetCurrentPosition(ds->dsb, 0); dsound_clear_buffer(ds); diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index 25ae0a58ad..1bc3ea0c09 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -402,9 +402,6 @@ static void menu_common_entries_init(void *data, unsigned menu_type) file_list_push(menu->selection_buf, "Rate Control Delta", MENU_SETTINGS_AUDIO_CONTROL_RATE_DELTA, 0); #ifdef __CELLOS_LV2__ file_list_push(menu->selection_buf, "System BGM Control", MENU_SETTINGS_CUSTOM_BGM_CONTROL_ENABLE, 0); -#endif -#ifdef _XBOX1 - file_list_push(menu->selection_buf, "Volume Effect", MENU_SETTINGS_AUDIO_DSP_EFFECT, 0); #endif file_list_push(menu->selection_buf, "Volume Level", MENU_SETTINGS_AUDIO_VOLUME, 0); break; @@ -5373,11 +5370,6 @@ static void menu_common_setting_set_label(char *type_str, size_t type_str_size, case MENU_SETTINGS_CUSTOM_BIND_MODE: strlcpy(type_str, driver.menu->bind_mode_keyboard ? "Keyboard" : "Joypad", type_str_size); break; - case MENU_SETTINGS_AUDIO_DSP_EFFECT: -#ifdef RARCH_CONSOLE - strlcpy(type_str, (g_extern.console.sound.volume_level) ? "Loud" : "Normal", type_str_size); - break; -#endif case MENU_SETTINGS_AUDIO_VOLUME: snprintf(type_str, type_str_size, "%.1f dB", g_extern.audio_data.volume_db); break; diff --git a/frontend/menu/backend/menu_common_backend.h b/frontend/menu/backend/menu_common_backend.h index 58b675f214..f3f6f8449a 100644 --- a/frontend/menu/backend/menu_common_backend.h +++ b/frontend/menu/backend/menu_common_backend.h @@ -148,7 +148,6 @@ typedef enum MENU_SETTINGS_AUDIO_DSP_FILTER, MENU_SETTINGS_AUDIO_MUTE, MENU_SETTINGS_AUDIO_CONTROL_RATE_DELTA, - MENU_SETTINGS_AUDIO_DSP_EFFECT, MENU_SETTINGS_AUDIO_VOLUME, MENU_SETTINGS_CUSTOM_BGM_CONTROL_ENABLE, MENU_SETTINGS_ZIP_EXTRACT, diff --git a/general.h b/general.h index 25bd66633a..20af523f9b 100644 --- a/general.h +++ b/general.h @@ -672,9 +672,6 @@ struct global struct { unsigned mode; -#ifdef RARCH_CONSOLE - unsigned volume_level; -#endif } sound; } console; diff --git a/settings.c b/settings.c index ae1edf94cb..f1f1caf0f5 100644 --- a/settings.c +++ b/settings.c @@ -440,9 +440,6 @@ void config_set_defaults(void) g_extern.console.screen.resolutions.current.id = 0; g_extern.console.sound.mode = SOUND_MODE_NORMAL; -#ifdef _XBOX1 - g_extern.console.sound.volume_level = 0; -#endif #endif #ifdef HAVE_OVERLAY @@ -893,9 +890,6 @@ bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_INT_EXTERN(console.screen.flicker_filter_index, "flicker_filter_index"); CONFIG_GET_INT_EXTERN(console.screen.soft_filter_index, "soft_filter_index"); -#ifdef _XBOX1 - CONFIG_GET_INT_EXTERN(console.sound.volume_level, "sound_volume_level"); -#endif CONFIG_GET_INT_EXTERN(console.screen.resolutions.current.id, "current_resolution_id"); CONFIG_GET_INT_EXTERN(console.sound.mode, "sound_mode"); #endif @@ -1429,9 +1423,6 @@ bool config_save_file(const char *path) #endif config_set_bool(conf, "gamma_correction", g_extern.console.screen.gamma_correction); -#ifdef _XBOX1 - config_set_int(conf, "sound_volume_level", g_extern.console.sound.volume_level); -#endif bool triple_buffering_enable_val = g_extern.lifecycle_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE); bool soft_filter_enable_val = g_extern.lifecycle_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE); bool flicker_filter_enable_val = g_extern.lifecycle_state & (1ULL << MODE_VIDEO_FLICKER_FILTER_ENABLE);