From 9337efdb7a157d5788b4ef45c8f2732024b3b3f4 Mon Sep 17 00:00:00 2001 From: Peter D'Hoye Date: Tue, 3 Jul 2007 18:31:13 +0000 Subject: Accept FS #7303 by Christoph Reiter: add context menu to FM radio entry in main menu. Also changes a small naming inconsistency. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13778 a1c6a512-1295-4272-9138-f99709370657 --- apps/menus/recording_menu.c | 4 ++-- apps/recorder/radio.c | 4 ++-- apps/root_menu.c | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'apps') diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 56afe6117f..da2007a5e2 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c @@ -820,7 +820,7 @@ static int write_settings_file(void) MENUITEM_FUNCTION(save_recpresets_item, 0, ID2P(LANG_SAVE_SETTINGS), write_settings_file, NULL, NULL, Icon_Config); -MAKE_MENU(recording_setting_menu, ID2P(LANG_RECORDING_SETTINGS), +MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), NULL, Icon_Recording, #if CONFIG_CODEC == MAS3587F &rec_quality, @@ -849,7 +849,7 @@ MAKE_MENU(recording_setting_menu, ID2P(LANG_RECORDING_SETTINGS), bool recording_menu(bool no_source) { no_source_in_menu = no_source; - return do_menu(&recording_setting_menu, NULL) == MENU_ATTACHED_USB; + return do_menu(&recording_settings_menu, NULL) == MENU_ATTACHED_USB; }; MENUITEM_FUNCTION(recording_settings, MENU_FUNC_USEPARAM, ID2P(LANG_RECORDING_SETTINGS), diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 1d28d6ee4f..0633289826 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -1521,7 +1521,7 @@ MENUITEM_FUNCTION(presetclear_item, 0, ID2P(LANG_FM_PRESET_CLEAR), MENUITEM_FUNCTION(scan_presets_item, 0, ID2P(LANG_FM_SCAN_PRESETS), scan_presets, NULL, NULL, Icon_NOICON); -MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL, +MAKE_MENU(radio_settings_menu, ID2P(LANG_FM_MENU), NULL, Icon_Radio_screen, #ifndef FM_PRESET &radio_presets_item, @@ -1545,7 +1545,7 @@ MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL, /* main menu of the radio screen */ static bool radio_menu(void) { - return do_menu(&radio_menu_items, NULL) == MENU_ATTACHED_USB; + return do_menu(&radio_settings_menu, NULL) == MENU_ATTACHED_USB; } #endif diff --git a/apps/root_menu.c b/apps/root_menu.c index 24cb80a8b3..1451a60a16 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -269,7 +269,8 @@ extern struct menu_item_ex tagcache_menu, #endif manage_settings, - recording_setting_menu, + recording_settings_menu, + radio_settings_menu, bookmark_settings_menu, system_menu; static const struct root_items items[] = { @@ -281,11 +282,11 @@ static const struct root_items items[] = { [GO_TO_MAINMENU] = { menu, NULL, &manage_settings }, #ifdef HAVE_RECORDING - [GO_TO_RECSCREEN] = { recscrn, NULL, &recording_setting_menu }, + [GO_TO_RECSCREEN] = { recscrn, NULL, &recording_settings_menu }, #endif #if CONFIG_TUNER - [GO_TO_FM] = { radio, NULL, NULL }, + [GO_TO_FM] = { radio, NULL, &radio_settings_menu }, #endif [GO_TO_RECENTBMARKS] = { load_bmarks, NULL, &bookmark_settings_menu }, -- cgit v1.2.3