diff options
Diffstat (limited to 'apps/radio')
-rw-r--r-- | apps/radio/presets.c | 11 | ||||
-rw-r--r-- | apps/radio/radio.c | 13 |
2 files changed, 1 insertions, 23 deletions
diff --git a/apps/radio/presets.c b/apps/radio/presets.c index acd6dc8711..72e8c3bd65 100644 --- a/apps/radio/presets.c +++ b/apps/radio/presets.c | |||
@@ -473,21 +473,10 @@ int handle_radio_presets(void) | |||
473 | struct gui_synclist lists; | 473 | struct gui_synclist lists; |
474 | int result = 0; | 474 | int result = 0; |
475 | int action = ACTION_NONE; | 475 | int action = ACTION_NONE; |
476 | #ifdef HAVE_BUTTONBAR | ||
477 | struct gui_buttonbar buttonbar; | ||
478 | #endif | ||
479 | 476 | ||
480 | if(presets_loaded == false) | 477 | if(presets_loaded == false) |
481 | return result; | 478 | return result; |
482 | 479 | ||
483 | #ifdef HAVE_BUTTONBAR | ||
484 | gui_buttonbar_init(&buttonbar); | ||
485 | gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) ); | ||
486 | gui_buttonbar_set(&buttonbar, str(LANG_FM_BUTTONBAR_ADD), | ||
487 | str(LANG_FM_BUTTONBAR_EXIT), | ||
488 | str(LANG_FM_BUTTONBAR_ACTION)); | ||
489 | gui_buttonbar_draw(&buttonbar); | ||
490 | #endif | ||
491 | gui_synclist_init(&lists, presets_get_name, NULL, false, 1, NULL); | 480 | gui_synclist_init(&lists, presets_get_name, NULL, false, 1, NULL); |
492 | gui_synclist_set_title(&lists, str(LANG_PRESET), NOICON); | 481 | gui_synclist_set_title(&lists, str(LANG_PRESET), NOICON); |
493 | gui_synclist_set_icon_callback(&lists, NULL); | 482 | gui_synclist_set_icon_callback(&lists, NULL); |
diff --git a/apps/radio/radio.c b/apps/radio/radio.c index 08b9c501e2..362d10f9a3 100644 --- a/apps/radio/radio.c +++ b/apps/radio/radio.c | |||
@@ -61,14 +61,7 @@ | |||
61 | 61 | ||
62 | #if CONFIG_TUNER | 62 | #if CONFIG_TUNER |
63 | 63 | ||
64 | #if CONFIG_KEYPAD == RECORDER_PAD | 64 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
65 | #define FM_RECORD | ||
66 | #define FM_PRESET_ADD | ||
67 | #define FM_PRESET_ACTION | ||
68 | #define FM_PRESET | ||
69 | #define FM_MODE | ||
70 | |||
71 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
72 | #define FM_PRESET | 65 | #define FM_PRESET |
73 | #define FM_MODE | 66 | #define FM_MODE |
74 | #define FM_NEXT_PRESET | 67 | #define FM_NEXT_PRESET |
@@ -86,10 +79,6 @@ | |||
86 | have to be taken to hear any interference. */ | 79 | have to be taken to hear any interference. */ |
87 | #define HAVE_NOISY_IDLE_MODE | 80 | #define HAVE_NOISY_IDLE_MODE |
88 | 81 | ||
89 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
90 | #define FM_RECORD_DBLPRE | ||
91 | #define FM_RECORD | ||
92 | |||
93 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SANSA_C200_PAD) ||\ | 82 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SANSA_C200_PAD) ||\ |
94 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD) ||\ | 83 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD) ||\ |
95 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)||(CONFIG_KEYPAD == COWON_D2_PAD)||\ | 84 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)||(CONFIG_KEYPAD == COWON_D2_PAD)||\ |