summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/keymaps/keymap-ipod.c4
-rw-r--r--apps/keymaps/keymap-ondio.c12
2 files changed, 13 insertions, 3 deletions
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 79a7f8ee82..a6026d3f6d 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -167,6 +167,7 @@ static const struct button_mapping button_context_keyboard[] = {
167 LAST_ITEM_IN_LIST 167 LAST_ITEM_IN_LIST
168}; /* button_context_keyboard */ 168}; /* button_context_keyboard */
169 169
170#ifdef HAVE_RECORDING
170const struct button_mapping button_context_recscreen[] = { 171const struct button_mapping button_context_recscreen[] = {
171 172
172 { ACTION_REC_NEWFILE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, 173 { ACTION_REC_NEWFILE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
@@ -184,6 +185,7 @@ const struct button_mapping button_context_recscreen[] = {
184 185
185 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 186 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
186}; /* button_context_recscreen */ 187}; /* button_context_recscreen */
188#endif
187 189
188/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ 190/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
189const struct button_mapping* get_context_mapping(int context) 191const struct button_mapping* get_context_mapping(int context)
@@ -222,8 +224,10 @@ const struct button_mapping* get_context_mapping(int context)
222 return button_context_pitchscreen; 224 return button_context_pitchscreen;
223 case CONTEXT_KEYBOARD: 225 case CONTEXT_KEYBOARD:
224 return button_context_keyboard; 226 return button_context_keyboard;
227#ifdef HAVE_RECORDING
225 case CONTEXT_RECSCREEN: 228 case CONTEXT_RECSCREEN:
226 return button_context_recscreen; 229 return button_context_recscreen;
230#endif
227 default: 231 default:
228 return button_context_standard; 232 return button_context_standard;
229 } 233 }
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index 39a8b55a1f..6c76d56022 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -136,6 +136,7 @@ static const struct button_mapping button_context_pitchscreen[] = {
136 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 136 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
137}; /* button_context_pitchscreen */ 137}; /* button_context_pitchscreen */
138 138
139#ifdef HAVE_RECORDING
139static const struct button_mapping button_context_recscreen[] = { 140static const struct button_mapping button_context_recscreen[] = {
140 { ACTION_REC_PAUSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, 141 { ACTION_REC_PAUSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
141 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, 142 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
@@ -145,6 +146,7 @@ static const struct button_mapping button_context_recscreen[] = {
145 146
146 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 147 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
147}; /* button_context_recscreen */ 148}; /* button_context_recscreen */
149#endif
148 150
149static const struct button_mapping button_context_keyboard[] = { 151static const struct button_mapping button_context_keyboard[] = {
150 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, 152 { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
@@ -161,6 +163,7 @@ static const struct button_mapping button_context_keyboard[] = {
161 163
162 LAST_ITEM_IN_LIST 164 LAST_ITEM_IN_LIST
163}; /* button_context_keyboard */ 165}; /* button_context_keyboard */
166
164#if CONFIG_TUNER 167#if CONFIG_TUNER
165static const struct button_mapping button_context_radio[] = { 168static const struct button_mapping button_context_radio[] = {
166 { ACTION_FM_MENU, BUTTON_MENU | BUTTON_REPEAT, BUTTON_NONE }, 169 { ACTION_FM_MENU, BUTTON_MENU | BUTTON_REPEAT, BUTTON_NONE },
@@ -172,13 +175,14 @@ static const struct button_mapping button_context_radio[] = {
172 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 175 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
173 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 176 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
174 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 177 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
175 178
176 179
177 180
178 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) 181 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
179 182
180}; 183};
181#endif 184#endif
185
182const struct button_mapping* get_context_mapping( int context ) 186const struct button_mapping* get_context_mapping( int context )
183{ 187{
184 switch( context ) 188 switch( context )
@@ -206,9 +210,11 @@ const struct button_mapping* get_context_mapping( int context )
206 /* else fall through to CUSTOM|CONTEXT_TREE */ 210 /* else fall through to CUSTOM|CONTEXT_TREE */
207 case CONTEXT_CUSTOM|CONTEXT_TREE: 211 case CONTEXT_CUSTOM|CONTEXT_TREE:
208 return button_context_tree; 212 return button_context_tree;
213#ifdef HAVE_RECORDING
209 case CONTEXT_RECSCREEN: 214 case CONTEXT_RECSCREEN:
210 case CONTEXT_SETTINGS_RECTRIGGER: 215 case CONTEXT_SETTINGS_RECTRIGGER:
211 return button_context_recscreen; 216 return button_context_recscreen;
217#endif
212 case CONTEXT_KEYBOARD: 218 case CONTEXT_KEYBOARD:
213 return button_context_keyboard; 219 return button_context_keyboard;
214#if CONFIG_TUNER 220#if CONFIG_TUNER