diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 96f79792ca..a7a4205fa2 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -48,6 +48,10 @@ PLUGIN_HEADER | |||
48 | #define PF_MENU ACTION_STD_MENU | 48 | #define PF_MENU ACTION_STD_MENU |
49 | #define PF_QUIT (LAST_ACTION_PLACEHOLDER + 1) | 49 | #define PF_QUIT (LAST_ACTION_PLACEHOLDER + 1) |
50 | 50 | ||
51 | #if !defined(HAVE_SCROLLWHEEL) | ||
52 | /* scrollwheel targets use the wheel, just as they do in lists, | ||
53 | * so there's no need for a special context, | ||
54 | * others use left/right here too (as oppsed to up/down in lists) */ | ||
51 | const struct button_mapping pf_context_album_scroll[] = | 55 | const struct button_mapping pf_context_album_scroll[] = |
52 | { | 56 | { |
53 | #ifdef HAVE_TOUCHSCREEN | 57 | #ifdef HAVE_TOUCHSCREEN |
@@ -56,39 +60,28 @@ const struct button_mapping pf_context_album_scroll[] = | |||
56 | {PF_NEXT, BUTTON_MIDRIGHT, BUTTON_NONE}, | 60 | {PF_NEXT, BUTTON_MIDRIGHT, BUTTON_NONE}, |
57 | {PF_NEXT_REPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 61 | {PF_NEXT_REPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
58 | #endif | 62 | #endif |
59 | #if CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD || \ | 63 | #if (CONFIG_KEYPAD == IAUDIO_M3_PAD || CONFIG_KEYPAD == MROBE500_PAD) |
60 | CONFIG_KEYPAD == IAUDIO_X5M5_PAD || CONFIG_KEYPAD == GIGABEAT_PAD || \ | 64 | {PF_PREV, BUTTON_RC_REW, BUTTON_NONE}, |
61 | CONFIG_KEYPAD == GIGABEAT_S_PAD || CONFIG_KEYPAD == RECORDER_PAD || \ | 65 | {PF_PREV_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE}, |
62 | CONFIG_KEYPAD == ARCHOS_AV300_PAD || CONFIG_KEYPAD == SANSA_C100_PAD || \ | 66 | {PF_NEXT, BUTTON_RC_FF, BUTTON_NONE}, |
63 | CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | 67 | {PF_NEXT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, |
64 | CONFIG_KEYPAD == SANSA_M200_PAD || CONFIG_KEYPAD == IRIVER_IFP7XX_PAD || \ | 68 | #else |
65 | CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == PHILIPS_SA9200_PAD || \ | ||
66 | CONFIG_KEYPAD == IAUDIO67_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \ | ||
67 | CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == CREATIVEZV_PAD \ | ||
68 | || CONFIG_KEYPAD == LOGIK_DAX_PAD || CONFIG_KEYPAD == MEIZU_M6SL_PAD | ||
69 | {PF_PREV, BUTTON_LEFT, BUTTON_NONE}, | ||
70 | {PF_PREV_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | ||
71 | {PF_NEXT, BUTTON_RIGHT, BUTTON_NONE}, | ||
72 | {PF_NEXT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | ||
73 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
74 | {PF_PREV, BUTTON_LEFT, BUTTON_NONE}, | 69 | {PF_PREV, BUTTON_LEFT, BUTTON_NONE}, |
75 | {PF_PREV_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 70 | {PF_PREV_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
76 | {PF_NEXT, BUTTON_RIGHT, BUTTON_NONE}, | 71 | {PF_NEXT, BUTTON_RIGHT, BUTTON_NONE}, |
77 | {PF_NEXT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 72 | {PF_NEXT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
73 | #endif | ||
74 | #if CONFIG_KEYPAD == ONDIO_PAD | ||
78 | {PF_SELECT, BUTTON_UP|BUTTON_REL, BUTTON_UP}, | 75 | {PF_SELECT, BUTTON_UP|BUTTON_REL, BUTTON_UP}, |
79 | {PF_CONTEXT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP}, | 76 | {PF_CONTEXT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP}, |
80 | {ACTION_NONE, BUTTON_UP, BUTTON_NONE}, | 77 | {ACTION_NONE, BUTTON_UP, BUTTON_NONE}, |
81 | {ACTION_NONE, BUTTON_DOWN, BUTTON_NONE}, | 78 | {ACTION_NONE, BUTTON_DOWN, BUTTON_NONE}, |
82 | {ACTION_NONE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 79 | {ACTION_NONE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
83 | {ACTION_NONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT}, | 80 | {ACTION_NONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT}, |
84 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD || CONFIG_KEYPAD == MROBE500_PAD | ||
85 | {PF_PREV, BUTTON_RC_REW, BUTTON_NONE}, | ||
86 | {PF_PREV_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE}, | ||
87 | {PF_NEXT, BUTTON_RC_FF, BUTTON_NONE}, | ||
88 | {PF_NEXT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, | ||
89 | #endif | 81 | #endif |
90 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1) | 82 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1) |
91 | }; | 83 | }; |
84 | #endif /* !defined(HAVE_SCROLLWHEEL) */ | ||
92 | 85 | ||
93 | const struct button_mapping pf_context_buttons[] = | 86 | const struct button_mapping pf_context_buttons[] = |
94 | { | 87 | { |
@@ -144,7 +137,9 @@ const struct button_mapping pf_context_buttons[] = | |||
144 | }; | 137 | }; |
145 | const struct button_mapping *pf_contexts[] = | 138 | const struct button_mapping *pf_contexts[] = |
146 | { | 139 | { |
140 | #if !defined(HAVE_SCROLLWHEEL) | ||
147 | pf_context_album_scroll, | 141 | pf_context_album_scroll, |
142 | #endif | ||
148 | pf_context_buttons | 143 | pf_context_buttons |
149 | }; | 144 | }; |
150 | 145 | ||
@@ -2601,9 +2596,11 @@ int main(void) | |||
2601 | rb->yield(); | 2596 | rb->yield(); |
2602 | 2597 | ||
2603 | /*/ Handle buttons */ | 2598 | /*/ Handle buttons */ |
2604 | button = rb->get_custom_action(CONTEXT_CUSTOM| | 2599 | button = rb->get_custom_action(CONTEXT_CUSTOM |
2605 | (pf_state == pf_show_tracks ? 1 : 0), | 2600 | #if !defined(HAVE_SCROLLWHEEL) |
2606 | instant_update ? 0 : HZ/16, | 2601 | |(pf_state == pf_show_tracks ? 1 : 0) |
2602 | #endif | ||
2603 | ,instant_update ? 0 : HZ/16, | ||
2607 | get_context_map); | 2604 | get_context_map); |
2608 | 2605 | ||
2609 | switch (button) { | 2606 | switch (button) { |