len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change anywhere where do_menu()'s return value was checked and expected

Browse source 
a bool to appear the same as the old API. Possibly fixes some bugs, but 
doubtful.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12772 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-03-15 04:42:10 +00:00
parent 15c5d26de6
commit b35c1d8d35
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/menu.c
View file

@ -603,7 +603,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
int main_menu(void) int main_menu(void)
{ {
return do_menu(NULL, 0); return do_menu(NULL, 0) == MENU_ATTACHED_USB;
} }
/* wrappers for the old menu system to work with the new system */ /* wrappers for the old menu system to work with the new system */
@ -706,7 +706,7 @@ int menu_show(int m)
MENU_ITEM_COUNT(menus[m].count); MENU_ITEM_COUNT(menus[m].count);
menu.value = m; menu.value = m;
menu.menu_get_name_and_icon = &menu_info; menu.menu_get_name_and_icon = &menu_info;
return do_menu(&menu, &menus[m].current_selection); return do_menu(&menu, &menus[m].current_selection) == MENU_ATTACHED_USB;
} }

2
apps/menus/playlist_menu.c
View file

@ -82,5 +82,5 @@ MAKE_MENU(playlist_options, ID2P(LANG_PLAYLIST_MENU), NULL,
bool playlist_menu(void) bool playlist_menu(void)
{ {
return do_menu(&playlist_options, NULL); return do_menu(&playlist_options, NULL) == MENU_ATTACHED_USB;
} }

2
apps/menus/sound_menu.c
View file

@ -113,5 +113,5 @@ MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, Icon_Audio,
bool sound_menu(void) bool sound_menu(void)
{ {
return do_menu(&sound_settings, 0); return do_menu(&sound_settings, 0) == MENU_ATTACHED_USB;
} }

3
apps/recorder/radio.c
View file

@ -1442,7 +1442,6 @@ MENUITEM_FUNCTION(recscreen_item, ID2P(LANG_RECORDING_MENU),
static int fm_recording_settings(void) static int fm_recording_settings(void)
{ {
bool ret = recording_menu(true); bool ret = recording_menu(true);
#if CONFIG_CODEC != SWCODEC #if CONFIG_CODEC != SWCODEC
if (!ret) if (!ret)
{ {
@ -1503,7 +1502,7 @@ MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL,
/* main menu of the radio screen */ /* main menu of the radio screen */
static bool radio_menu(void) static bool radio_menu(void)
{ {
return (bool)do_menu(&radio_menu_items, NULL); return do_menu(&radio_menu_items, NULL) == MENU_ATTACHED_USB;
} }
#endif #endif