diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-10-15 07:57:11 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-10-15 07:57:11 +0000 |
commit | 887ff33f2e288dc449eb9a69d4bbeb801f02d790 (patch) | |
tree | 008b186e2e1454de6ce039d2ce185e1e5247161b | |
parent | 93434b4f751969e5c27b738c6d5ce52d46bc8285 (diff) | |
download | rockbox-887ff33f2e288dc449eb9a69d4bbeb801f02d790.tar.gz rockbox-887ff33f2e288dc449eb9a69d4bbeb801f02d790.zip |
Fix int settings being backwards on the player
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15116 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/option_select.c | 6 | ||||
-rw-r--r-- | apps/settings_list.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index 0414b70801..7550b8b7d4 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -256,9 +256,15 @@ static int selection_to_val(struct settings_list *setting, int selection) | |||
256 | else if ((setting->flags & F_INT_SETTING) == F_INT_SETTING) | 256 | else if ((setting->flags & F_INT_SETTING) == F_INT_SETTING) |
257 | { | 257 | { |
258 | struct int_setting *info = setting->int_setting; | 258 | struct int_setting *info = setting->int_setting; |
259 | #if CONFIG_KEYPAD != PLAYER_PAD | ||
259 | min = info->min; | 260 | min = info->min; |
260 | max = info->max; | 261 | max = info->max; |
261 | step = info->step; | 262 | step = info->step; |
263 | #else | ||
264 | max = info->min; | ||
265 | min = info->max; | ||
266 | step = -info->step; | ||
267 | #endif | ||
262 | } | 268 | } |
263 | if (setting->flags & F_FLIPLIST) | 269 | if (setting->flags & F_FLIPLIST) |
264 | { | 270 | { |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 7a04aebd32..d19c0360ed 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -374,7 +374,9 @@ static long jumpscroll_getlang(int value) | |||
374 | #if defined (HAVE_SCROLLWHEEL) || \ | 374 | #if defined (HAVE_SCROLLWHEEL) || \ |
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 | (CONFIG_KEYPAD == PLAYER_PAD) /* player doesnt have a wheel, \ | ||
379 | but acts the same way */ | ||
378 | #define FLIP_IF_WHEEL F_FLIPLIST | 380 | #define FLIP_IF_WHEEL F_FLIPLIST |
379 | #else | 381 | #else |
380 | #define FLIP_IF_WHEEL 0 | 382 | #define FLIP_IF_WHEEL 0 |