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 /apps | |
parent | 1515ff852224c822a6d3db8c458eab2c9037704f (diff) | |
download | rockbox-58777c350a9d0539a5a5480fc4cdeef5a4353ea3.tar.gz rockbox-58777c350a9d0539a5a5480fc4cdeef5a4353ea3.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/option_select.c | 9 | ||||
-rw-r--r-- | apps/settings_list.c | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index b8b1cc505b..0414b70801 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -336,7 +336,14 @@ bool option_screen(struct settings_list *setting, | |||
336 | int min = sound_min(setting_id); | 336 | int min = sound_min(setting_id); |
337 | int max = sound_max(setting_id); | 337 | int max = sound_max(setting_id); |
338 | nb_items = (max-min)/steps + 1; | 338 | nb_items = (max-min)/steps + 1; |
339 | selected = (max-oldvalue)/steps; | 339 | if (setting->flags&F_FLIPLIST) |
340 | { | ||
341 | selected = (oldvalue - min) / steps; | ||
342 | } | ||
343 | else | ||
344 | { | ||
345 | selected = (max - oldvalue) / steps; | ||
346 | } | ||
340 | function = sound_get_fn(setting_id); | 347 | function = sound_get_fn(setting_id); |
341 | } | 348 | } |
342 | else | 349 | else |
diff --git a/apps/settings_list.c b/apps/settings_list.c index a409d51df1..7a04aebd32 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -375,17 +375,17 @@ static long jumpscroll_getlang(int value) | |||
375 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 375 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
376 | (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 376 | (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
377 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 377 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
378 | #define BALANCE_FLIP F_FLIPLIST | 378 | #define FLIP_IF_WHEEL F_FLIPLIST |
379 | #else | 379 | #else |
380 | #define BALANCE_FLIP 0 | 380 | #define FLIP_IF_WHEEL 0 |
381 | #endif | 381 | #endif |
382 | 382 | ||
383 | const struct settings_list settings[] = { | 383 | const struct settings_list settings[] = { |
384 | /* sound settings */ | 384 | /* sound settings */ |
385 | SOUND_SETTING(F_NO_WRAP,volume, LANG_VOLUME, "volume", SOUND_VOLUME), | 385 | SOUND_SETTING(FLIP_IF_WHEEL | F_NO_WRAP,volume, LANG_VOLUME, "volume", SOUND_VOLUME), |
386 | SOUND_SETTING(BALANCE_FLIP, balance, LANG_BALANCE, "balance", SOUND_BALANCE), | 386 | SOUND_SETTING(FLIP_IF_WHEEL, balance, LANG_BALANCE, "balance", SOUND_BALANCE), |
387 | SOUND_SETTING(F_NO_WRAP,bass, LANG_BASS, "bass", SOUND_BASS), | 387 | SOUND_SETTING(FLIP_IF_WHEEL | F_NO_WRAP,bass, LANG_BASS, "bass", SOUND_BASS), |
388 | SOUND_SETTING(F_NO_WRAP,treble, LANG_TREBLE, "treble", SOUND_TREBLE), | 388 | SOUND_SETTING(FLIP_IF_WHEEL | F_NO_WRAP,treble, LANG_TREBLE, "treble", SOUND_TREBLE), |
389 | 389 | ||
390 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 390 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
391 | SOUND_SETTING(0,loudness, LANG_LOUDNESS, "loudness", SOUND_LOUDNESS), | 391 | SOUND_SETTING(0,loudness, LANG_LOUDNESS, "loudness", SOUND_LOUDNESS), |