diff options
Diffstat (limited to 'apps/keymaps/keymap-player.c')
-rw-r--r-- | apps/keymaps/keymap-player.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c index b03dc39f89..eecd9b99b7 100644 --- a/apps/keymaps/keymap-player.c +++ b/apps/keymaps/keymap-player.c | |||
@@ -25,65 +25,65 @@ | |||
25 | #include "action.h" | 25 | #include "action.h" |
26 | #include "button.h" | 26 | #include "button.h" |
27 | 27 | ||
28 | struct button_mapping button_context_standard[] = { | 28 | const struct button_mapping button_context_standard[] = { |
29 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 29 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
30 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 30 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
31 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | 31 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, |
32 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 32 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
33 | 33 | ||
34 | { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 34 | { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
35 | { ACTION_STD_CANCEL, BUTTON_STOP, BUTTON_NONE }, | 35 | { ACTION_STD_CANCEL, BUTTON_STOP, BUTTON_NONE }, |
36 | { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE }, | 36 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
37 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 37 | { ACTION_STD_MENU, BUTTON_MENU, BUTTON_NONE }, |
38 | 38 | ||
39 | LAST_ITEM_IN_LIST | 39 | LAST_ITEM_IN_LIST |
40 | }; | 40 | }; |
41 | 41 | ||
42 | struct button_mapping button_context_wps[] = { | 42 | const struct button_mapping button_context_wps[] = { |
43 | { ACTION_WPS_PLAY, BUTTON_PLAY, BUTTON_NONE }, | 43 | { ACTION_WPS_PLAY, BUTTON_PLAY, BUTTON_NONE }, |
44 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 44 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
45 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 45 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
46 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 46 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
47 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 47 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
48 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | 48 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, |
49 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 49 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
50 | { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, | 50 | { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, |
51 | 51 | ||
52 | { ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_LEFT, BUTTON_MENU }, | 52 | { ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_LEFT, BUTTON_MENU }, |
53 | { ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_MENU|BUTTON_LEFT }, | 53 | { ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
54 | { ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_RIGHT, BUTTON_MENU }, | 54 | { ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_RIGHT, BUTTON_MENU }, |
55 | { ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_MENU|BUTTON_RIGHT }, | 55 | { ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
56 | 56 | ||
57 | { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | 57 | { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, |
58 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 58 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
59 | { ACTION_WPS_CONTEXT, BUTTON_ON|BUTTON_REPEAT, BUTTON_ON }, | 59 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
60 | { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON, BUTTON_MENU }, | 60 | { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, |
61 | 61 | ||
62 | 62 | ||
63 | LAST_ITEM_IN_LIST | 63 | LAST_ITEM_IN_LIST |
64 | }; | 64 | }; |
65 | 65 | ||
66 | struct button_mapping button_context_settings[] = { | 66 | const struct button_mapping button_context_settings[] = { |
67 | { ACTION_SETTINGS_INC, BUTTON_LEFT, BUTTON_NONE }, | 67 | { ACTION_SETTINGS_INC, BUTTON_LEFT, BUTTON_NONE }, |
68 | { ACTION_SETTINGS_INCREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 68 | { ACTION_SETTINGS_INCREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
69 | { ACTION_SETTINGS_DEC, BUTTON_RIGHT, BUTTON_NONE }, | 69 | { ACTION_SETTINGS_DEC, BUTTON_RIGHT, BUTTON_NONE }, |
70 | { ACTION_SETTINGS_DECREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 70 | { ACTION_SETTINGS_DECREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
71 | 71 | ||
72 | LAST_ITEM_IN_LIST | 72 | LAST_ITEM_IN_LIST |
73 | }; | 73 | }; |
74 | 74 | ||
75 | struct button_mapping button_context_tree[] = { | 75 | const struct button_mapping button_context_tree[] = { |
76 | { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_NONE }, | 76 | { ACTION_TREE_WPS, BUTTON_ON, BUTTON_NONE }, |
77 | 77 | ||
78 | LAST_ITEM_IN_LIST | 78 | LAST_ITEM_IN_LIST |
79 | }; /* button_context_listtree */ | 79 | }; /* button_context_listtree */ |
80 | 80 | ||
81 | struct button_mapping button_context_yesno[] = { | 81 | const struct button_mapping button_context_yesno[] = { |
82 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, | 82 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, |
83 | LAST_ITEM_IN_LIST | 83 | LAST_ITEM_IN_LIST |
84 | }; /* button_context_settings_yesno */ | 84 | }; /* button_context_settings_yesno */ |
85 | 85 | ||
86 | struct button_mapping* get_context_mapping( int context ) | 86 | const struct button_mapping* get_context_mapping( int context ) |
87 | { | 87 | { |
88 | switch( context ) | 88 | switch( context ) |
89 | { | 89 | { |