(Menu/Settings data) Need to expose audio_enable for iOS too

This commit is contained in:
twinaphex 2014-07-26 17:43:01 +02:00
parent 69175ecf5d
commit 5cf88dd5de
4 changed files with 12 additions and 1 deletions

View File

@ -784,7 +784,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
// Add common options
const char* emula[] = { "General Options", "rewind_enable", "fps_show", 0 };
const char* video[] = { "Video Options", "video_scale_integer", "video_smooth", 0 };
const char* audio[] = { "Audio Options", "audio_mute", "audio_rate_control_delta", 0 };
const char* audio[] = { "Audio Options", "audio_enable", "audio_mute", "audio_rate_control_delta", 0 };
const char* input[] = { "Input Options", "input_overlay", "input_overlay_opacity", 0 };
const char** groups[] = { emula, video, audio, input, 0 };

View File

@ -463,6 +463,8 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
file_list_clear(menu->selection_buf);
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "audio_dsp_plugin")))
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_AUDIO_DSP_FILTER, 0);
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "audio_enable")))
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_AUDIO_ENABLE, 0);
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "audio_mute")))
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_AUDIO_MUTE, 0);
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "audio_latency")))
@ -3713,6 +3715,10 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
return -1;
}
break;
case MENU_SETTINGS_AUDIO_ENABLE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "audio_enable")))
menu_common_setting_set_current_boolean(current_setting, action);
break;
case MENU_SETTINGS_AUDIO_MUTE:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "audio_mute")))
menu_common_setting_set_current_boolean(current_setting, action);
@ -4961,6 +4967,9 @@ static void menu_common_setting_set_label(char *type_str, size_t type_str_size,
case MENU_SETTINGS_AUDIO_SYNC:
strlcpy(type_str, g_settings.audio.sync ? "ON" : "OFF", type_str_size);
break;
case MENU_SETTINGS_AUDIO_ENABLE:
strlcpy(type_str, g_settings.audio.enable ? "ON" : "OFF", type_str_size);
break;
case MENU_SETTINGS_AUDIO_MUTE:
strlcpy(type_str, g_extern.audio_data.mute ? "ON" : "OFF", type_str_size);
break;

View File

@ -150,6 +150,7 @@ typedef enum
MENU_SETTINGS_CONTENT_HISTORY_PATH,
MENU_SETTINGS_RESTART_GAME,
MENU_SETTINGS_AUDIO_DSP_FILTER,
MENU_SETTINGS_AUDIO_ENABLE,
MENU_SETTINGS_AUDIO_MUTE,
MENU_SETTINGS_AUDIO_LATENCY,
MENU_SETTINGS_AUDIO_SYNC,

View File

@ -1400,6 +1400,7 @@ bool config_save_file(const char *path)
config_set_bool(conf, "audio_rate_control", g_settings.audio.rate_control);
config_set_float(conf, "audio_rate_control_delta", g_settings.audio.rate_control_delta);
config_set_string(conf, "audio_driver", g_settings.audio.driver);
config_set_bool(conf, "audio_enable", g_settings.audio.enable);
config_set_int(conf, "audio_out_rate", g_settings.audio.out_rate);
#ifdef HAVE_LOCATION