From f0bec023d9ff45cede09274dff12f015f0830a38 Mon Sep 17 00:00:00 2001 From: PurlingNayuki Date: Sat, 21 Dec 2013 21:33:54 +0800 Subject: Implement volume limiter feature Add a "volume limit" parameter to the configuration file. The maximum value of volume setting in sound menu will be limited to the same as volume limit. Also each time when setvol() is excuted, Rockbox will check if the global_settings.volume value larger than global_settings.volume_limit. If larger, take the value of volume_limit instead. The volume_limit argument shares the same maximum and minimum values with volume argument, while taking the maximum volume as its default value. Change-Id: I8ca9bc6ea6e617b48fc346aae5f2a0a1d259ae36 Reviewed-on: http://gerrit.rockbox.org/697 Reviewed-by: Jonathan Gordon --- apps/gui/option_select.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'apps/gui/option_select.c') diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index d42d081..0452467 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c @@ -345,7 +345,8 @@ static int selection_to_val(const struct settings_list *setting, int selection) int setting_id = setting->sound_setting->setting; #ifndef ASCENDING_INT_SETTINGS step = sound_steps(setting_id); - max = sound_max(setting_id); + max = (setting_id == SOUND_VOLUME) ? + global_settings.volume_limit : sound_max(setting_id); /* min = sound_min(setting_id); */ #else step = -sound_steps(setting_id); @@ -429,7 +430,8 @@ static void val_to_selection(const struct settings_list *setting, int oldvalue, int setting_id = setting->sound_setting->setting; int steps = sound_steps(setting_id); int min = sound_min(setting_id); - int max = sound_max(setting_id); + int max = (setting_id == SOUND_VOLUME) ? + global_settings.volume_limit : sound_max(setting_id); *nb_items = (max-min)/steps + 1; #ifndef ASCENDING_INT_SETTINGS *selected = (max - oldvalue) / steps; -- cgit v1.1