Make the sound settings talk unit selection slightly less hackish, and make it handle unitless settings (like the new bass/treble cutoff setting on iPod Video).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15788 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 4 deletions

diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index ec86de7ee2..297afef985 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -158,12 +158,13 @@ static int option_talk(int selected_item, void * data)
     }
     else if ((setting->flags & F_T_SOUND) == F_T_SOUND)
     {
-        int talkunit = UNIT_DB;
+        int talkunit = UNIT_INT;
         const char *unit = sound_unit(setting->sound_setting->setting);
-        /* crude reconstruction */
-        if (*unit == '%')
+        if (!strcmp(unit, "dB"))
+            talkunit = UNIT_DB;
+        else if (!strcmp(unit, "%"))
             talkunit = UNIT_PERCENT;
-        else if (*unit == 'H')
+        else if (!strcmp(unit, "Hz"))
             talkunit = UNIT_HERTZ;
         talk_value((int)temp_var, talkunit, false);
     }