summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-10-15 07:57:11 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-10-15 07:57:11 +0000
commit887ff33f2e288dc449eb9a69d4bbeb801f02d790 (patch)
tree008b186e2e1454de6ce039d2ce185e1e5247161b
parent93434b4f751969e5c27b738c6d5ce52d46bc8285 (diff)
downloadrockbox-887ff33f2e288dc449eb9a69d4bbeb801f02d790.tar.gz
rockbox-887ff33f2e288dc449eb9a69d4bbeb801f02d790.tar.bz2
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.c6
-rw-r--r--apps/settings_list.c4
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)
else if ((setting->flags & F_INT_SETTING) == F_INT_SETTING)
{
struct int_setting *info = setting->int_setting;
+#if CONFIG_KEYPAD != PLAYER_PAD
min = info->min;
max = info->max;
step = info->step;
+#else
+ max = info->min;
+ min = info->max;
+ step = -info->step;
+#endif
}
if (setting->flags & F_FLIPLIST)
{
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)
#if defined (HAVE_SCROLLWHEEL) || \
(CONFIG_KEYPAD == IPOD_3G_PAD) || \
(CONFIG_KEYPAD == IPOD_4G_PAD) || \
- (CONFIG_KEYPAD == IPOD_1G2G_PAD)
+ (CONFIG_KEYPAD == IPOD_1G2G_PAD) || \
+ (CONFIG_KEYPAD == PLAYER_PAD) /* player doesnt have a wheel, \
+ but acts the same way */
#define FLIP_IF_WHEEL F_FLIPLIST
#else
#define FLIP_IF_WHEEL 0