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/gui | |
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/gui')
-rw-r--r-- | apps/gui/list.c | 6 | ||||
-rw-r--r-- | apps/gui/option_select.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c index 2923ec33c4..8df0a29d52 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -588,7 +588,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, | |||
588 | static bool scrolling_left = false; | 588 | static bool scrolling_left = false; |
589 | #endif | 589 | #endif |
590 | 590 | ||
591 | #ifdef HAVE_SCROLLWHEEL | 591 | #ifdef HAVE_WHEEL_ACCELERATION |
592 | int next_item_modifier = button_apply_acceleration(get_action_data()); | 592 | int next_item_modifier = button_apply_acceleration(get_action_data()); |
593 | #else | 593 | #else |
594 | static int next_item_modifier = 1; | 594 | static int next_item_modifier = 1; |
@@ -659,7 +659,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, | |||
659 | case ACTION_STD_PREV: | 659 | case ACTION_STD_PREV: |
660 | case ACTION_STD_PREVREPEAT: | 660 | case ACTION_STD_PREVREPEAT: |
661 | gui_list_select_at_offset(lists, -next_item_modifier); | 661 | gui_list_select_at_offset(lists, -next_item_modifier); |
662 | #ifndef HAVE_SCROLLWHEEL | 662 | #ifndef HAVE_WHEEL_ACCELERATION |
663 | if (button_queue_count() < FRAMEDROP_TRIGGER) | 663 | if (button_queue_count() < FRAMEDROP_TRIGGER) |
664 | #endif | 664 | #endif |
665 | gui_synclist_draw(lists); | 665 | gui_synclist_draw(lists); |
@@ -673,7 +673,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, | |||
673 | case ACTION_STD_NEXT: | 673 | case ACTION_STD_NEXT: |
674 | case ACTION_STD_NEXTREPEAT: | 674 | case ACTION_STD_NEXTREPEAT: |
675 | gui_list_select_at_offset(lists, next_item_modifier); | 675 | gui_list_select_at_offset(lists, next_item_modifier); |
676 | #ifndef HAVE_SCROLLWHEEL | 676 | #ifndef HAVE_WHEEL_ACCELERATION |
677 | if (button_queue_count() < FRAMEDROP_TRIGGER) | 677 | if (button_queue_count() < FRAMEDROP_TRIGGER) |
678 | #endif | 678 | #endif |
679 | gui_synclist_draw(lists); | 679 | gui_synclist_draw(lists); |
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index 30df8ea6ec..7223197fcc 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -38,9 +38,6 @@ | |||
38 | #include "quickscreen.h" | 38 | #include "quickscreen.h" |
39 | 39 | ||
40 | #if defined (HAVE_SCROLLWHEEL) || \ | 40 | #if defined (HAVE_SCROLLWHEEL) || \ |
41 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | ||
42 | (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | ||
43 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) || \ | ||
44 | (CONFIG_KEYPAD == PLAYER_PAD) | 41 | (CONFIG_KEYPAD == PLAYER_PAD) |
45 | /* Define this if your target makes sense to have | 42 | /* Define this if your target makes sense to have |
46 | smaller values at the top of the list increasing down the list */ | 43 | smaller values at the top of the list increasing down the list */ |