diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-08-16 00:32:45 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-08-16 00:32:45 +0000 |
commit | 1fdb5bff39158afedafbab369c61840f345251de (patch) | |
tree | 60b7b2ff42fc841773fc8ba17dc09b461f705711 /apps/keymaps/keymap-ipod.c | |
parent | 013ab3dd3d49059a4896bce4498a48b91ade2bdc (diff) | |
download | rockbox-1fdb5bff39158afedafbab369c61840f345251de.tar.gz rockbox-1fdb5bff39158afedafbab369c61840f345251de.zip |
Changed the button action code to allow both single-fire and multi-fire events to be triggered with _REPEAT. Also simplifies the code. * Made the button mapping tables const to save RAM when running rockbox from flash ROM. * Repaired button mappings for Ondio. * Repaired some more button mappings for player. * Added missing TREE_STOP for iriver, and fixed WPS skipping for recorder.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10600 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps/keymap-ipod.c')
-rw-r--r-- | apps/keymaps/keymap-ipod.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 4faf40d0d4..2beb428b6b 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -37,11 +37,11 @@ CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions) | |||
37 | 37 | ||
38 | */ | 38 | */ |
39 | 39 | ||
40 | struct button_mapping button_context_standard[] = { | 40 | const struct button_mapping button_context_standard[] = { |
41 | { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE }, | 41 | { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
42 | { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_SCROLL_BACK }, | 42 | { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
43 | { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, | 43 | { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
44 | { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_SCROLL_FWD }, | 44 | { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
45 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 45 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
46 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 46 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
47 | 47 | ||
@@ -53,38 +53,38 @@ struct button_mapping button_context_standard[] = { | |||
53 | 53 | ||
54 | LAST_ITEM_IN_LIST | 54 | LAST_ITEM_IN_LIST |
55 | }; /* button_context_standard */ | 55 | }; /* button_context_standard */ |
56 | struct button_mapping button_context_tree[] = { | 56 | const struct button_mapping button_context_tree[] = { |
57 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 57 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
58 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 58 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
59 | 59 | ||
60 | LAST_ITEM_IN_LIST | 60 | LAST_ITEM_IN_LIST |
61 | }; /* button_context_tree */ | 61 | }; /* button_context_tree */ |
62 | 62 | ||
63 | struct button_mapping button_context_tree_scroll_lr[] = { | 63 | const struct button_mapping button_context_tree_scroll_lr[] = { |
64 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 64 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
65 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 65 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
66 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 66 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
67 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | 67 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, |
68 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, | 68 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, |
69 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 69 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
70 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 70 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
71 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 71 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
72 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), | 72 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), |
73 | }; | 73 | }; |
74 | 74 | ||
75 | struct button_mapping button_context_wps[] = { | 75 | const struct button_mapping button_context_wps[] = { |
76 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 76 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
77 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 77 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
78 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 78 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
79 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 79 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
80 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | 80 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, |
81 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 81 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
82 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 82 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
83 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 83 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
84 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE }, | 84 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
85 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_SCROLL_BACK }, | 85 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
86 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE }, | 86 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
87 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_SCROLL_FWD }, | 87 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
88 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 88 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
89 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 89 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
90 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 90 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
@@ -93,44 +93,44 @@ struct button_mapping button_context_wps[] = { | |||
93 | LAST_ITEM_IN_LIST | 93 | LAST_ITEM_IN_LIST |
94 | }; /* button_context_wps */ | 94 | }; /* button_context_wps */ |
95 | 95 | ||
96 | struct button_mapping button_context_settings[] = { | 96 | const struct button_mapping button_context_settings[] = { |
97 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, | 97 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
98 | { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_SCROLL_FWD }, | 98 | { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
99 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, | 99 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
100 | { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_SCROLL_BACK }, | 100 | { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
101 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 101 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
102 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 102 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
103 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | 103 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, |
104 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 104 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
105 | { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, /* rel so bmark screen works */ | 105 | { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, /* rel so bmark screen works */ |
106 | 106 | ||
107 | LAST_ITEM_IN_LIST | 107 | LAST_ITEM_IN_LIST |
108 | }; /* button_context_settings */ | 108 | }; /* button_context_settings */ |
109 | 109 | ||
110 | struct button_mapping button_context_yesno[] = { | 110 | const struct button_mapping button_context_yesno[] = { |
111 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, | 111 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, |
112 | LAST_ITEM_IN_LIST | 112 | LAST_ITEM_IN_LIST |
113 | }; /* button_context_settings_yesno */ | 113 | }; /* button_context_settings_yesno */ |
114 | 114 | ||
115 | struct button_mapping button_context_bmark[] = { | 115 | const struct button_mapping button_context_bmark[] = { |
116 | { ACTION_BMARK_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 116 | { ACTION_BMARK_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
117 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), | 117 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), |
118 | }; /* button_context_settings_bmark */ | 118 | }; /* button_context_settings_bmark */ |
119 | 119 | ||
120 | struct button_mapping button_context_quickscreen[] = { | 120 | const struct button_mapping button_context_quickscreen[] = { |
121 | { ACTION_QS_DOWN, BUTTON_PLAY, BUTTON_NONE }, | 121 | { ACTION_QS_DOWN, BUTTON_PLAY, BUTTON_NONE }, |
122 | { ACTION_QS_DOWN, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 122 | { ACTION_QS_DOWN, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
123 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 123 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
124 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 124 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
125 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 125 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
126 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 126 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
127 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, | 127 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, |
128 | 128 | ||
129 | LAST_ITEM_IN_LIST | 129 | LAST_ITEM_IN_LIST |
130 | }; /* button_context_quickscreen */ | 130 | }; /* button_context_quickscreen */ |
131 | 131 | ||
132 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 132 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
133 | struct button_mapping* get_context_mapping(int context) | 133 | const struct button_mapping* get_context_mapping(int context) |
134 | { | 134 | { |
135 | switch (context) | 135 | switch (context) |
136 | { | 136 | { |