diff options
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 11822baacd..b3cc7e4fb4 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -56,7 +56,12 @@ PLUGIN_HEADER | |||
56 | #define PF_MENU ACTION_STD_MENU | 56 | #define PF_MENU ACTION_STD_MENU |
57 | #define PF_QUIT (LAST_ACTION_PLACEHOLDER + 1) | 57 | #define PF_QUIT (LAST_ACTION_PLACEHOLDER + 1) |
58 | 58 | ||
59 | #if !defined(HAVE_SCROLLWHEEL) | 59 | #if defined(HAVE_SCROLLWHEEL) || CONFIG_KEYPAD == IRIVER_H10_PAD || \ |
60 | CONFIG_KEYPAD == SAMSUNG_YH_PAD | ||
61 | #define USE_CORE_PREVNEXT | ||
62 | #endif | ||
63 | |||
64 | #ifndef USE_CORE_PREVNEXT | ||
60 | /* scrollwheel targets use the wheel, just as they do in lists, | 65 | /* scrollwheel targets use the wheel, just as they do in lists, |
61 | * so there's no need for a special context, | 66 | * so there's no need for a special context, |
62 | * others use left/right here too (as oppsed to up/down in lists) */ | 67 | * others use left/right here too (as oppsed to up/down in lists) */ |
@@ -92,7 +97,7 @@ const struct button_mapping pf_context_album_scroll[] = | |||
92 | #endif | 97 | #endif |
93 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN|1) | 98 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN|1) |
94 | }; | 99 | }; |
95 | #endif /* !defined(HAVE_SCROLLWHEEL) */ | 100 | #endif /* !USE_CORE_PREVNEXT */ |
96 | 101 | ||
97 | const struct button_mapping pf_context_buttons[] = | 102 | const struct button_mapping pf_context_buttons[] = |
98 | { | 103 | { |
@@ -148,7 +153,7 @@ const struct button_mapping pf_context_buttons[] = | |||
148 | }; | 153 | }; |
149 | const struct button_mapping *pf_contexts[] = | 154 | const struct button_mapping *pf_contexts[] = |
150 | { | 155 | { |
151 | #if !defined(HAVE_SCROLLWHEEL) | 156 | #ifndef USE_CORE_PREVNEXT |
152 | pf_context_album_scroll, | 157 | pf_context_album_scroll, |
153 | #endif | 158 | #endif |
154 | pf_context_buttons | 159 | pf_context_buttons |
@@ -2647,7 +2652,7 @@ int main(void) | |||
2647 | 2652 | ||
2648 | /*/ Handle buttons */ | 2653 | /*/ Handle buttons */ |
2649 | button = rb->get_custom_action(CONTEXT_PLUGIN | 2654 | button = rb->get_custom_action(CONTEXT_PLUGIN |
2650 | #if !defined(HAVE_SCROLLWHEEL) | 2655 | #ifndef USE_CORE_PREVNEXT |
2651 | |(pf_state == pf_show_tracks ? 1 : 0) | 2656 | |(pf_state == pf_show_tracks ? 1 : 0) |
2652 | #endif | 2657 | #endif |
2653 | ,instant_update ? 0 : HZ/16, | 2658 | ,instant_update ? 0 : HZ/16, |