diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-03-02 19:25:50 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-03-02 19:25:50 +0000 |
commit | fd14cac7c2feb471f8bf546d10e15f1336657064 (patch) | |
tree | f0d9dfe4b1147a8f08659104a3ba150bb3a1e8f5 /apps/settings_list.c | |
parent | 09f012a64fb129b3b7e16cc463a840b1eb5ded7d (diff) | |
download | rockbox-fd14cac7c2feb471f8bf546d10e15f1336657064.tar.gz rockbox-fd14cac7c2feb471f8bf546d10e15f1336657064.zip |
Split HAVE_SCROLLWHEEL into HAVE_SCROLLWHEEL and HAVE_WHEEL_ACCELERATION, where the latter now activates the wheel acceleration code.
HAVE_SCROLLWHEEL plainly indicates the existence of a scrollwheel, thus all ipods define it now (in addition to the ones and some
sansas which did before). Same applies to the manual.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20177 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index f5b49f3447..2d9be0873c 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -319,7 +319,7 @@ static int32_t backlight_getlang(int value, int unit) | |||
319 | } | 319 | } |
320 | #endif | 320 | #endif |
321 | 321 | ||
322 | #ifndef HAVE_SCROLLWHEEL | 322 | #ifndef HAVE_WHEEL_ACCELERATION |
323 | static void scanaccel_formatter(char *buffer, size_t buffer_size, | 323 | static void scanaccel_formatter(char *buffer, size_t buffer_size, |
324 | int val, const char *unit) | 324 | int val, const char *unit) |
325 | { | 325 | { |
@@ -1420,14 +1420,14 @@ const struct settings_list settings[] = { | |||
1420 | MAX_BRIGHTNESS_SETTING, 1, NULL, NULL, | 1420 | MAX_BRIGHTNESS_SETTING, 1, NULL, NULL, |
1421 | buttonlight_set_brightness), | 1421 | buttonlight_set_brightness), |
1422 | #endif | 1422 | #endif |
1423 | #ifndef HAVE_SCROLLWHEEL | 1423 | #ifndef HAVE_WHEEL_ACCELERATION |
1424 | INT_SETTING(0, list_accel_start_delay, LANG_LISTACCEL_START_DELAY, | 1424 | INT_SETTING(0, list_accel_start_delay, LANG_LISTACCEL_START_DELAY, |
1425 | 2, "list_accel_start_delay", UNIT_MS, 0, 10, 1, | 1425 | 2, "list_accel_start_delay", UNIT_MS, 0, 10, 1, |
1426 | formatter_unit_0_is_off, getlang_unit_0_is_off, NULL), | 1426 | formatter_unit_0_is_off, getlang_unit_0_is_off, NULL), |
1427 | INT_SETTING(0, list_accel_wait, LANG_LISTACCEL_ACCEL_SPEED, | 1427 | INT_SETTING(0, list_accel_wait, LANG_LISTACCEL_ACCEL_SPEED, |
1428 | 3, "list_accel_wait", UNIT_SEC, 1, 10, 1, | 1428 | 3, "list_accel_wait", UNIT_SEC, 1, 10, 1, |
1429 | scanaccel_formatter, getlang_unit_0_is_off, NULL), | 1429 | scanaccel_formatter, getlang_unit_0_is_off, NULL), |
1430 | #endif /* HAVE_SCROLLWHEEL */ | 1430 | #endif /* HAVE_WHEEL_ACCELERATION */ |
1431 | #if CONFIG_CODEC == SWCODEC | 1431 | #if CONFIG_CODEC == SWCODEC |
1432 | /* keyclick */ | 1432 | /* keyclick */ |
1433 | CHOICE_SETTING(0, keyclick, LANG_KEYCLICK, 0, | 1433 | CHOICE_SETTING(0, keyclick, LANG_KEYCLICK, 0, |