diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-h10.c | 23 | ||||
-rw-r--r-- | apps/recorder/radio.c | 4 |
2 files changed, 26 insertions, 1 deletions
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index 3e90f1520e..883b0d37d4 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c | |||
@@ -305,6 +305,26 @@ const struct button_mapping button_context_recscreen[] = { | |||
305 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 305 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) |
306 | }; /* button_context_recscreen */ | 306 | }; /* button_context_recscreen */ |
307 | 307 | ||
308 | static const struct button_mapping button_context_radio[] = { | ||
309 | { ACTION_FM_PRESET, BUTTON_RIGHT | BUTTON_REL, BUTTON_RIGHT }, | ||
310 | { ACTION_FM_MENU, BUTTON_RIGHT | BUTTON_REPEAT, BUTTON_NONE }, | ||
311 | { ACTION_FM_MODE, BUTTON_LEFT, BUTTON_NONE }, | ||
312 | { ACTION_FM_STOP, BUTTON_PLAY | BUTTON_REPEAT, BUTTON_PLAY }, | ||
313 | { ACTION_FM_EXIT, BUTTON_POWER, BUTTON_NONE }, | ||
314 | { ACTION_FM_PLAY, BUTTON_PLAY | BUTTON_REL, BUTTON_PLAY }, | ||
315 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, | ||
316 | { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
317 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | ||
318 | { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
319 | { ACTION_STD_PREV, BUTTON_REW, BUTTON_NONE }, | ||
320 | { ACTION_STD_PREVREPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
321 | { ACTION_STD_NEXT, BUTTON_FF, BUTTON_NONE }, | ||
322 | { ACTION_STD_NEXTREPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
323 | |||
324 | LAST_ITEM_IN_LIST | ||
325 | |||
326 | }; | ||
327 | |||
308 | static const struct button_mapping* get_context_mapping_remote( int context ) | 328 | static const struct button_mapping* get_context_mapping_remote( int context ) |
309 | { | 329 | { |
310 | context ^= CONTEXT_REMOTE; | 330 | context ^= CONTEXT_REMOTE; |
@@ -385,7 +405,8 @@ const struct button_mapping* get_context_mapping(int context) | |||
385 | return button_context_keyboard; | 405 | return button_context_keyboard; |
386 | case CONTEXT_RECSCREEN: | 406 | case CONTEXT_RECSCREEN: |
387 | return button_context_recscreen; | 407 | return button_context_recscreen; |
388 | 408 | case CONTEXT_FM: | |
409 | return button_context_radio; | ||
389 | default: | 410 | default: |
390 | return button_context_standard; | 411 | return button_context_standard; |
391 | } | 412 | } |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index a0cc10ce18..7a45027933 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -81,6 +81,10 @@ | |||
81 | #define FM_NEXT_PRESET | 81 | #define FM_NEXT_PRESET |
82 | #define FM_PREV_PRESET | 82 | #define FM_PREV_PRESET |
83 | 83 | ||
84 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | ||
85 | #define FM_PRESET | ||
86 | #define FM_MODE | ||
87 | |||
84 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) | 88 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
85 | #define FM_PRESET | 89 | #define FM_PRESET |
86 | #define FM_MODE | 90 | #define FM_MODE |