summaryrefslogtreecommitdiff
path: root/apps/menus/recording_menu.c
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2018-10-15 23:04:04 -0400
committerWilliam Wilgus <me.theuser@yahoo.com>2018-10-18 00:06:31 +0200
commitdd40c46d50f9f22643b828e80783d3576b9c1d50 (patch)
treeb9700f7cbe53bb10e89d91b0c3cf1fea686eb813 /apps/menus/recording_menu.c
parente6b23a8f049a89f9f6254a7fa186d33dc65b0ba3 (diff)
downloadrockbox-dd40c46d50f9f22643b828e80783d3576b9c1d50.tar.gz
rockbox-dd40c46d50f9f22643b828e80783d3576b9c1d50.zip
Fix menu warnings
change offending bool return to int warning: cast between incompatible function types from '_Bool (*)(void)' to 'int (*)(void)' [-Wcast-function-type] forgot to remove -- typedef int (*menu_function)(void); Change-Id: Ie4c8d3ddb0fb7843c4ec584203350d658d6bee3e
Diffstat (limited to 'apps/menus/recording_menu.c')
-rw-r--r--apps/menus/recording_menu.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index 5038b1abad..54dc415de7 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -307,7 +307,7 @@ MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_RECORDING_FORMAT),
307 recformat_func, NULL, NULL, Icon_Menu_setting); 307 recformat_func, NULL, NULL, Icon_Menu_setting);
308 308
309MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), 309MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS),
310 (int(*)(void))enc_global_config_menu, 310 enc_global_config_menu,
311 NULL, NULL, Icon_Submenu); 311 NULL, NULL, Icon_Submenu);
312 312
313#endif /* CONFIG_CODEC == SWCODEC */ 313#endif /* CONFIG_CODEC == SWCODEC */
@@ -651,14 +651,15 @@ MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS),
651 &browse_recconfigs, &save_recpresets_item 651 &browse_recconfigs, &save_recpresets_item
652); 652);
653 653
654bool recording_menu(bool no_source) 654int recording_menu(bool no_source)
655{ 655{
656 bool retval; 656 int retval;
657 no_source_in_menu = no_source; 657 no_source_in_menu = no_source;
658 retval = do_menu(&recording_settings_menu, NULL, NULL, false) == MENU_ATTACHED_USB; 658 int retmenu = do_menu(&recording_settings_menu, NULL, NULL, false);
659 retval = (retmenu == MENU_ATTACHED_USB) ? 1 : 0;
659 no_source_in_menu = false; /* always fall back to the default */ 660 no_source_in_menu = false; /* always fall back to the default */
660 return retval; 661 return retval;
661}; 662};
662 663
663MENUITEM_FUNCTION(recording_settings, MENU_FUNC_USEPARAM, ID2P(LANG_RECORDING_SETTINGS), 664MENUITEM_FUNCTION(recording_settings, MENU_FUNC_USEPARAM, ID2P(LANG_RECORDING_SETTINGS),
664 (int (*)(void*))recording_menu, 0, NULL, Icon_Recording); 665 recording_menu, 0, NULL, Icon_Recording);