diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2009-05-28 15:57:29 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-05-28 15:57:29 +0000 |
| commit | 5f20e5aefc66bd9631d008d68ffb41e393a09bdc (patch) | |
| tree | cbe1d61f4d9e88eec16a732ef8fcfaf8b6fb70b6 /apps/plugins | |
| parent | ce6dbf19210515a2ceef7dc6f060ce4720c34f6a (diff) | |
| download | rockbox-5f20e5aefc66bd9631d008d68ffb41e393a09bdc.tar.gz rockbox-5f20e5aefc66bd9631d008d68ffb41e393a09bdc.zip | |
FS#10256 by Frank Oosterhuis : use HOME button to quit plugins
Also remove a duplicated SANSA_CLIP_PAD in pictureflow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21115 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/logo.c | 3 | ||||
| -rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index e61de014cc..f3a875ff14 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -98,8 +98,7 @@ const unsigned char rockbox16x7[] = { #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ - (CONFIG_KEYPAD == SANSA_M200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_M200_PAD) #define LP_QUIT BUTTON_POWER #define LP_DEC_X BUTTON_LEFT #define LP_INC_X BUTTON_RIGHT diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 1f092d9414..538f7a8506 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c @@ -64,8 +64,7 @@ const struct button_mapping pf_context_album_scroll[] = CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == PHILIPS_SA9200_PAD || \ CONFIG_KEYPAD == IAUDIO67_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \ CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == CREATIVEZV_PAD \ - || CONFIG_KEYPAD == SANSA_CLIP_PAD || CONFIG_KEYPAD == LOGIK_DAX_PAD || \ - CONFIG_KEYPAD == MEIZU_M6SL_PAD + || CONFIG_KEYPAD == LOGIK_DAX_PAD || CONFIG_KEYPAD == MEIZU_M6SL_PAD {PF_PREV, BUTTON_LEFT, BUTTON_NONE}, {PF_PREV_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, {PF_NEXT, BUTTON_RIGHT, BUTTON_NONE}, @@ -105,9 +104,10 @@ const struct button_mapping pf_context_buttons[] = CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == IAUDIO67_PAD || \ CONFIG_KEYPAD == GIGABEAT_PAD || CONFIG_KEYPAD == GIGABEAT_S_PAD || \ CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == MROBE500_PAD || \ - CONFIG_KEYPAD == PHILIPS_SA9200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD || \ - CONFIG_KEYPAD == SANSA_FUZE_PAD + CONFIG_KEYPAD == PHILIPS_SA9200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD {PF_QUIT, BUTTON_POWER, BUTTON_NONE}, +#elif CONFIG_KEYPAD == SANSA_FUZE_PAD + {PF_QUIT, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE}, /* These all use short press of BUTTON_POWER for menu, map long POWER to quit */ #elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_M200_PAD || \ |