diff options
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/radio.c | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index ed14a4e282..47acae332f 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -1223,10 +1223,12 @@ static int clear_preset_list(void) | |||
1223 | return true; | 1223 | return true; |
1224 | } | 1224 | } |
1225 | 1225 | ||
1226 | MENUITEM_FUNCTION(radio_edit_preset_item, ID2P(LANG_FM_EDIT_PRESET), | 1226 | MENUITEM_FUNCTION(radio_edit_preset_item, 0, |
1227 | radio_edit_preset, NULL, Icon_NOICON); | 1227 | ID2P(LANG_FM_EDIT_PRESET), |
1228 | MENUITEM_FUNCTION(radio_delete_preset_item, ID2P(LANG_FM_DELETE_PRESET), | 1228 | radio_edit_preset, NULL, 0, NULL, Icon_NOICON); |
1229 | radio_delete_preset, NULL, Icon_NOICON); | 1229 | MENUITEM_FUNCTION(radio_delete_preset_item, 0, |
1230 | ID2P(LANG_FM_DELETE_PRESET), | ||
1231 | radio_delete_preset, NULL, 0, NULL, Icon_NOICON); | ||
1230 | int radio_preset_callback(int action, const struct menu_item_ex *this_item) | 1232 | int radio_preset_callback(int action, const struct menu_item_ex *this_item) |
1231 | { | 1233 | { |
1232 | if (action == ACTION_STD_OK) | 1234 | if (action == ACTION_STD_OK) |
@@ -1339,15 +1341,15 @@ char* get_mode_text(int selected_item, void * data, char *buffer) | |||
1339 | str(LANG_RADIO_SCAN_MODE)); | 1341 | str(LANG_RADIO_SCAN_MODE)); |
1340 | return buffer; | 1342 | return buffer; |
1341 | } | 1343 | } |
1342 | static int toggle_radio_mode(void* param) | 1344 | static int toggle_radio_mode(void) |
1343 | { | 1345 | { |
1344 | (void)param; | ||
1345 | radio_mode = (radio_mode == RADIO_SCAN_MODE) ? | 1346 | radio_mode = (radio_mode == RADIO_SCAN_MODE) ? |
1346 | RADIO_PRESET_MODE : RADIO_SCAN_MODE; | 1347 | RADIO_PRESET_MODE : RADIO_SCAN_MODE; |
1347 | return 0; | 1348 | return 0; |
1348 | } | 1349 | } |
1349 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(radio_mode_item, toggle_radio_mode, NULL, NULL, | 1350 | MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, |
1350 | get_mode_text, NULL, Icon_NOICON); | 1351 | toggle_radio_mode, NULL, 0, |
1352 | get_mode_text, NULL, NULL, Icon_NOICON); | ||
1351 | #endif | 1353 | #endif |
1352 | 1354 | ||
1353 | static int scan_presets(void) | 1355 | static int scan_presets(void) |
@@ -1447,6 +1449,7 @@ static int fm_recording_screen(void) | |||
1447 | 1449 | ||
1448 | return ret; | 1450 | return ret; |
1449 | } | 1451 | } |
1452 | |||
1450 | #endif /* defined(HAVE_FMRADIO_IN) && CONFIG_CODEC == SWCODEC */ | 1453 | #endif /* defined(HAVE_FMRADIO_IN) && CONFIG_CODEC == SWCODEC */ |
1451 | 1454 | ||
1452 | #if defined(HAVE_FMRADIO_IN) || CONFIG_CODEC != SWCODEC | 1455 | #if defined(HAVE_FMRADIO_IN) || CONFIG_CODEC != SWCODEC |
@@ -1467,35 +1470,36 @@ static int fm_recording_settings(void) | |||
1467 | 1470 | ||
1468 | return ret; | 1471 | return ret; |
1469 | } | 1472 | } |
1473 | |||
1470 | #endif /* defined(HAVE_FMRADIO_IN) || CONFIG_CODEC != SWCODEC */ | 1474 | #endif /* defined(HAVE_FMRADIO_IN) || CONFIG_CODEC != SWCODEC */ |
1471 | #endif /* HAVE_RECORDING */ | 1475 | #endif /* HAVE_RECORDING */ |
1472 | 1476 | ||
1473 | #ifdef FM_RECORDING_SCREEN | 1477 | #ifdef FM_RECORDING_SCREEN |
1474 | MENUITEM_FUNCTION(recscreen_item, ID2P(LANG_RECORDING_MENU), | 1478 | MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING_MENU), |
1475 | fm_recording_screen, NULL, Icon_NOICON); | 1479 | fm_recording_screen, NULL, 0, NULL, Icon_NOICON); |
1476 | #endif | 1480 | #endif |
1477 | #ifdef FM_RECORDING_SETTINGS | 1481 | #ifdef FM_RECORDING_SETTINGS |
1478 | MENUITEM_FUNCTION(recsettings_item, ID2P(LANG_RECORDING_SETTINGS), | 1482 | MENUITEM_FUNCTION(recsettings_item, 0, ID2P(LANG_RECORDING_SETTINGS), |
1479 | fm_recording_settings, NULL, Icon_NOICON); | 1483 | fm_recording_settings, NULL, 0, NULL, Icon_NOICON); |
1480 | #endif | 1484 | #endif |
1481 | #ifndef FM_PRESET | 1485 | #ifndef FM_PRESET |
1482 | MENUITEM_FUNCTION(radio_presets_item, ID2P(LANG_FM_BUTTONBAR_PRESETS), | 1486 | MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_FM_BUTTONBAR_PRESETS), |
1483 | handle_radio_presets, NULL, Icon_NOICON); | 1487 | handle_radio_presets, NULL, 0, NULL, Icon_NOICON); |
1484 | #endif | 1488 | #endif |
1485 | #ifndef FM_PRESET_ADD | 1489 | #ifndef FM_PRESET_ADD |
1486 | MENUITEM_FUNCTION(radio_addpreset_item, ID2P(LANG_FM_ADD_PRESET), | 1490 | MENUITEM_FUNCTION(radio_addpreset_item, 0, ID2P(LANG_FM_ADD_PRESET), |
1487 | radio_add_preset, NULL, Icon_NOICON); | 1491 | radio_add_preset, NULL, 0, NULL, Icon_NOICON); |
1488 | #endif | 1492 | #endif |
1489 | 1493 | ||
1490 | 1494 | ||
1491 | MENUITEM_FUNCTION(presetload_item, ID2P(LANG_FM_PRESET_LOAD), | 1495 | MENUITEM_FUNCTION(presetload_item, 0, ID2P(LANG_FM_PRESET_LOAD), |
1492 | load_preset_list, NULL, Icon_NOICON); | 1496 | load_preset_list, NULL, 0, NULL, Icon_NOICON); |
1493 | MENUITEM_FUNCTION(presetsave_item, ID2P(LANG_FM_PRESET_SAVE), | 1497 | MENUITEM_FUNCTION(presetsave_item, 0, ID2P(LANG_FM_PRESET_SAVE), |
1494 | save_preset_list, NULL, Icon_NOICON); | 1498 | save_preset_list, NULL, 0, NULL, Icon_NOICON); |
1495 | MENUITEM_FUNCTION(presetclear_item, ID2P(LANG_FM_PRESET_CLEAR), | 1499 | MENUITEM_FUNCTION(presetclear_item, 0, ID2P(LANG_FM_PRESET_CLEAR), |
1496 | clear_preset_list, NULL, Icon_NOICON); | 1500 | clear_preset_list, NULL, 0, NULL, Icon_NOICON); |
1497 | MENUITEM_FUNCTION(scan_presets_item, ID2P(LANG_FM_SCAN_PRESETS), | 1501 | MENUITEM_FUNCTION(scan_presets_item, 0, ID2P(LANG_FM_SCAN_PRESETS), |
1498 | scan_presets, NULL, Icon_NOICON); | 1502 | scan_presets, NULL, 0, NULL, Icon_NOICON); |
1499 | 1503 | ||
1500 | MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL, | 1504 | MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL, |
1501 | Icon_Radio_screen, | 1505 | Icon_Radio_screen, |