diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-10-15 05:35:20 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-10-15 05:35:20 +0000 |
| commit | 58777c350a9d0539a5a5480fc4cdeef5a4353ea3 (patch) | |
| tree | 0d4187ec0481fe6e73e76f95a2f9789e981b5eb7 | |
| parent | 1515ff852224c822a6d3db8c458eab2c9037704f (diff) | |
| download | rockbox-58777c350a9d0539a5a5480fc4cdeef5a4353ea3.zip rockbox-58777c350a9d0539a5a5480fc4cdeef5a4353ea3.tar.gz rockbox-58777c350a9d0539a5a5480fc4cdeef5a4353ea3.tar.bz2 rockbox-58777c350a9d0539a5a5480fc4cdeef5a4353ea3.tar.xz | |
Fix FS#7952 - flip list settings didnt work properly
Accept FS#7956 - flip some sound settings on wheel targets so clockwise increases
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15113 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/gui/option_select.c | 9 | ||||
| -rw-r--r-- | apps/settings_list.c | 12 | ||||
| -rw-r--r-- | docs/CREDITS | 2 |
3 files changed, 16 insertions, 7 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index b8b1cc5..0414b70 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c @@ -336,7 +336,14 @@ bool option_screen(struct settings_list *setting, int min = sound_min(setting_id); int max = sound_max(setting_id); nb_items = (max-min)/steps + 1; - selected = (max-oldvalue)/steps; + if (setting->flags&F_FLIPLIST) + { + selected = (oldvalue - min) / steps; + } + else + { + selected = (max - oldvalue) / steps; + } function = sound_get_fn(setting_id); } else diff --git a/apps/settings_list.c b/apps/settings_list.c index a409d51..7a04aeb 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -375,17 +375,17 @@ static long jumpscroll_getlang(int value) (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_4G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) -#define BALANCE_FLIP F_FLIPLIST +#define FLIP_IF_WHEEL F_FLIPLIST #else -#define BALANCE_FLIP 0 +#define FLIP_IF_WHEEL 0 #endif const struct settings_list settings[] = { /* sound settings */ - SOUND_SETTING(F_NO_WRAP,volume, LANG_VOLUME, "volume", SOUND_VOLUME), - SOUND_SETTING(BALANCE_FLIP, balance, LANG_BALANCE, "balance", SOUND_BALANCE), - SOUND_SETTING(F_NO_WRAP,bass, LANG_BASS, "bass", SOUND_BASS), - SOUND_SETTING(F_NO_WRAP,treble, LANG_TREBLE, "treble", SOUND_TREBLE), + SOUND_SETTING(FLIP_IF_WHEEL | F_NO_WRAP,volume, LANG_VOLUME, "volume", SOUND_VOLUME), + SOUND_SETTING(FLIP_IF_WHEEL, balance, LANG_BALANCE, "balance", SOUND_BALANCE), + SOUND_SETTING(FLIP_IF_WHEEL | F_NO_WRAP,bass, LANG_BASS, "bass", SOUND_BASS), + SOUND_SETTING(FLIP_IF_WHEEL | F_NO_WRAP,treble, LANG_TREBLE, "treble", SOUND_TREBLE), #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) SOUND_SETTING(0,loudness, LANG_LOUDNESS, "loudness", SOUND_LOUDNESS), diff --git a/docs/CREDITS b/docs/CREDITS index 7443b93..b97b680 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -342,6 +342,8 @@ Stepan Moskovchenko John S. Gwynne Brian J. Morey Stijn Hisken +Bertrik Sikken + The libmad team The wavpack team The ffmpeg team |