len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restructure/cleanup the album list buttom mapping, removing it entirely for scrollwheel. No functional change (scrollwheel didn't use it before, anyway).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21148 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-05-31 16:56:54 +00:00
parent b2afc258dc
commit c69331ef32
1 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

43
apps/plugins/pictureflow/pictureflow.c
View file

@ -48,6 +48,10 @@ PLUGIN_HEADER
#define PF_MENU ACTION_STD_MENU #define PF_MENU ACTION_STD_MENU
#define PF_QUIT (LAST_ACTION_PLACEHOLDER + 1) #define PF_QUIT (LAST_ACTION_PLACEHOLDER + 1)
#if !defined(HAVE_SCROLLWHEEL)
/* scrollwheel targets use the wheel, just as they do in lists,
* so there's no need for a special context,
* others use left/right here too (as oppsed to up/down in lists) */
const struct button_mapping pf_context_album_scroll[] = const struct button_mapping pf_context_album_scroll[] =
{ {
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
@ -56,39 +60,28 @@ const struct button_mapping pf_context_album_scroll[] =
{PF_NEXT, BUTTON_MIDRIGHT, BUTTON_NONE}, {PF_NEXT, BUTTON_MIDRIGHT, BUTTON_NONE},
{PF_NEXT_REPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE}, {PF_NEXT_REPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE},
#endif #endif
#if CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD || \ #if (CONFIG_KEYPAD == IAUDIO_M3_PAD || CONFIG_KEYPAD == MROBE500_PAD)
CONFIG_KEYPAD == IAUDIO_X5M5_PAD || CONFIG_KEYPAD == GIGABEAT_PAD || \ {PF_PREV, BUTTON_RC_REW, BUTTON_NONE},
CONFIG_KEYPAD == GIGABEAT_S_PAD || CONFIG_KEYPAD == RECORDER_PAD || \ {PF_PREV_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE},
CONFIG_KEYPAD == ARCHOS_AV300_PAD || CONFIG_KEYPAD == SANSA_C100_PAD || \ {PF_NEXT, BUTTON_RC_FF, BUTTON_NONE},
CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD || \ {PF_NEXT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE},
CONFIG_KEYPAD == SANSA_M200_PAD || CONFIG_KEYPAD == IRIVER_IFP7XX_PAD || \ #else
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 == 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},
{PF_NEXT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
#elif CONFIG_KEYPAD == ONDIO_PAD
{PF_PREV, BUTTON_LEFT, BUTTON_NONE}, {PF_PREV, BUTTON_LEFT, BUTTON_NONE},
{PF_PREV_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, {PF_PREV_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
{PF_NEXT, BUTTON_RIGHT, BUTTON_NONE}, {PF_NEXT, BUTTON_RIGHT, BUTTON_NONE},
{PF_NEXT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, {PF_NEXT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
#endif
#if CONFIG_KEYPAD == ONDIO_PAD
{PF_SELECT, BUTTON_UP|BUTTON_REL, BUTTON_UP}, {PF_SELECT, BUTTON_UP|BUTTON_REL, BUTTON_UP},
{PF_CONTEXT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP}, {PF_CONTEXT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP},
{ACTION_NONE, BUTTON_UP, BUTTON_NONE}, {ACTION_NONE, BUTTON_UP, BUTTON_NONE},
{ACTION_NONE, BUTTON_DOWN, BUTTON_NONE}, {ACTION_NONE, BUTTON_DOWN, BUTTON_NONE},
{ACTION_NONE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, {ACTION_NONE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE},
{ACTION_NONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT}, {ACTION_NONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT},
#elif CONFIG_KEYPAD == IAUDIO_M3_PAD || CONFIG_KEYPAD == MROBE500_PAD
{PF_PREV, BUTTON_RC_REW, BUTTON_NONE},
{PF_PREV_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE},
{PF_NEXT, BUTTON_RC_FF, BUTTON_NONE},
{PF_NEXT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE},
#endif #endif
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1)
}; };
#endif /* !defined(HAVE_SCROLLWHEEL) */
const struct button_mapping pf_context_buttons[] = const struct button_mapping pf_context_buttons[] =
{ {
@ -144,7 +137,9 @@ const struct button_mapping pf_context_buttons[] =
}; };
const struct button_mapping *pf_contexts[] = const struct button_mapping *pf_contexts[] =
{ {
#if !defined(HAVE_SCROLLWHEEL)
pf_context_album_scroll, pf_context_album_scroll,
#endif
pf_context_buttons pf_context_buttons
}; };
@ -2601,9 +2596,11 @@ int main(void)
rb->yield(); rb->yield();
/*/ Handle buttons */ /*/ Handle buttons */
button = rb->get_custom_action(CONTEXT_CUSTOM| button = rb->get_custom_action(CONTEXT_CUSTOM
(pf_state == pf_show_tracks ? 1 : 0), #if !defined(HAVE_SCROLLWHEEL)
instant_update ? 0 : HZ/16, |(pf_state == pf_show_tracks ? 1 : 0)
#endif
,instant_update ? 0 : HZ/16,
get_context_map); get_context_map);
switch (button) { switch (button) {