diff options
Diffstat (limited to 'apps/recorder/radio.c')
-rw-r--r-- | apps/recorder/radio.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 125bb5abbb..5cabb26f62 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -60,6 +60,8 @@ | |||
60 | #define FM_FREEZE BUTTON_PLAY | 60 | #define FM_FREEZE BUTTON_PLAY |
61 | #define FM_STOP BUTTON_OFF | 61 | #define FM_STOP BUTTON_OFF |
62 | #define FM_EXIT (BUTTON_ON | BUTTON_REL) | 62 | #define FM_EXIT (BUTTON_ON | BUTTON_REL) |
63 | #define FM_PRESET_ADD BUTTON_F1 | ||
64 | #define FM_PRESET_ACTION BUTTON_F3 | ||
63 | #elif CONFIG_KEYPAD == ONDIO_PAD /* restricted keypad */ | 65 | #elif CONFIG_KEYPAD == ONDIO_PAD /* restricted keypad */ |
64 | #define FM_MENU (BUTTON_MENU | BUTTON_REPEAT) | 66 | #define FM_MENU (BUTTON_MENU | BUTTON_REPEAT) |
65 | #define FM_RECORD (BUTTON_MENU | BUTTON_REL) | 67 | #define FM_RECORD (BUTTON_MENU | BUTTON_REL) |
@@ -669,14 +671,14 @@ static int handle_radio_presets_menu_cb(int key, int m) | |||
669 | #if CONFIG_KEYPAD == RECORDER_PAD | 671 | #if CONFIG_KEYPAD == RECORDER_PAD |
670 | switch(key) | 672 | switch(key) |
671 | { | 673 | { |
672 | case BUTTON_F3 | BUTTON_REL: | 674 | case FM_PRESET_ACTION: |
673 | key = MENU_EXIT; /* Fake an exit */ | 675 | key = MENU_EXIT; /* Fake an exit */ |
674 | break; | 676 | break; |
675 | 677 | ||
676 | case BUTTON_F3: | 678 | case FM_PRESET_ACTION | BUTTON_REL: |
677 | /* Ignore the DOWN events */ | 679 | /* Ignore the release events */ |
678 | key = BUTTON_NONE; | 680 | key = BUTTON_NONE; |
679 | break; | 681 | break; |
680 | } | 682 | } |
681 | #endif | 683 | #endif |
682 | return key; | 684 | return key; |
@@ -744,18 +746,18 @@ int handle_radio_presets_cb(int key, int m) | |||
744 | 746 | ||
745 | switch(key) | 747 | switch(key) |
746 | { | 748 | { |
747 | case BUTTON_F1 | BUTTON_REL: | 749 | case FM_PRESET_ADD: |
748 | radio_add_preset(); | 750 | radio_add_preset(); |
749 | menu_draw(m); | 751 | menu_draw(m); |
750 | key = BUTTON_NONE; | 752 | key = BUTTON_NONE; |
751 | break; | 753 | break; |
752 | 754 | ||
753 | case BUTTON_F2 | BUTTON_REL: | 755 | case FM_PRESET: |
754 | menu_draw(m); | 756 | menu_draw(m); |
755 | key = MENU_EXIT; /* Fake an exit */ | 757 | key = MENU_EXIT; /* Fake an exit */ |
756 | break; | 758 | break; |
757 | 759 | ||
758 | case BUTTON_F3 | BUTTON_REL: | 760 | case FM_PRESET_ACTION: |
759 | ret = handle_radio_presets_menu(); | 761 | ret = handle_radio_presets_menu(); |
760 | menu_draw(m); | 762 | menu_draw(m); |
761 | if(ret) | 763 | if(ret) |
@@ -763,13 +765,12 @@ int handle_radio_presets_cb(int key, int m) | |||
763 | else | 765 | else |
764 | key = BUTTON_NONE; | 766 | key = BUTTON_NONE; |
765 | break; | 767 | break; |
766 | 768 | ||
767 | case BUTTON_F1: | 769 | case FM_PRESET_ADD | BUTTON_REL: |
768 | case BUTTON_F2: | 770 | case FM_PRESET_ACTION | BUTTON_REL: |
769 | case BUTTON_F3: | 771 | /* Ignore the release events */ |
770 | /* Ignore the DOWN events */ | 772 | key = BUTTON_NONE; |
771 | key = BUTTON_NONE; | 773 | break; |
772 | break; | ||
773 | } | 774 | } |
774 | return key; | 775 | return key; |
775 | #endif | 776 | #endif |