tsiry-sandratraina.com / rockbox-zig
Rockbox open source high quality audio player as a Music Player Daemon
mpris rockbox mpd libadwaita audio rust zig deno
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

William Wilgus dd40c46d e6b23a8f

+62 -58
+3 -3
apps/alarm_menu.c
··· 50 50 } 51 51 } 52 52 53 - bool alarm_screen(void) 53 + int alarm_screen(void) 54 54 { 55 55 int h, m; 56 56 bool done = false; ··· 188 188 if(default_event_handler(button) == SYS_USB_CONNECTED) 189 189 { 190 190 rtc_enable_alarm(false); 191 - return true; 191 + return 1; 192 192 } 193 193 break; 194 194 } 195 195 } 196 - return false; 196 + return 0; 197 197 }
+1 -1
apps/alarm_menu.h
··· 21 21 #ifndef _ALARM_MENU_H 22 22 #define _ALARM_MENU_H 23 23 24 - bool alarm_screen(void); 24 + int alarm_screen(void); 25 25 26 26 #endif
+2 -2
apps/debug_menu.c
··· 2708 2708 return menuitems[item].desc; 2709 2709 } 2710 2710 2711 - bool debug_menu(void) 2711 + int debug_menu(void) 2712 2712 { 2713 2713 struct simplelist_info info; 2714 2714 2715 2715 simplelist_info_init(&info, "Debug Menu", ARRAYLEN(menuitems), NULL); 2716 2716 info.action_callback = menu_action_callback; 2717 2717 info.get_name = menu_get_name; 2718 - return simplelist_show_list(&info); 2718 + return (simplelist_show_list(&info)) ? 1 : 0; 2719 2719 } 2720 2720 2721 2721 bool run_debug_screen(char* screen)
+1 -1
apps/debug_menu.h
··· 21 21 #ifndef _DEBUG_MENU_H 22 22 #define _DEBUG_MENU_H 23 23 24 - bool debug_menu(void); 24 + int debug_menu(void); 25 25 bool run_debug_screen(char* screen); 26 26 27 27 #endif
+4 -4
apps/enc_config.c
··· 440 440 441 441 /* Show an encoder's config menu based on the global_settings. 442 442 Modified settings are placed in global_settings.enc_config. */ 443 - bool enc_global_config_menu(void) 443 + int enc_global_config_menu(void) 444 444 { 445 445 struct encoder_config cfg; 446 446 ··· 453 453 { 454 454 menu_callback_data.cfg = &cfg; 455 455 menu_callback_data.global = true; 456 - return do_menu(enc_data[cfg.rec_format].menu, NULL, NULL, false) 457 - == MENU_ATTACHED_USB; 456 + int retmenu = do_menu(enc_data[cfg.rec_format].menu, NULL, NULL, false); 457 + return (retmenu == MENU_ATTACHED_USB) ? 1 : 0; 458 458 } 459 459 else 460 460 { 461 461 splash(HZ, ID2P(LANG_NO_SETTINGS)); 462 - return false; 462 + return 0; 463 463 } 464 464 } /* enc_global_config_menu */
+1 -1
apps/enc_config.h
··· 71 71 72 72 /* Show an encoder's config menu based on the global_settings. 73 73 Modified settings are placed in global_settings.enc_config. */ 74 - bool enc_global_config_menu(void); 74 + int enc_global_config_menu(void); 75 75 #endif /* ENC_CONFIG_H */
-1
apps/menu.h
··· 41 41 }; 42 42 #define MENU_TYPE_MASK 0xF /* MT_* type */ 43 43 44 - typedef int (*menu_function)(void); 45 44 struct menu_func { 46 45 union { 47 46 int (*function_w_param)(void* param); /* intptr_t instead of void*
+6 -6
apps/menus/eq_menu.c
··· 563 563 } 564 564 565 565 /* Provides a graphical means of editing the EQ settings */ 566 - bool eq_menu_graphical(void) 566 + int eq_menu_graphical(void) 567 567 { 568 568 bool exit_request = false; 569 569 bool result = true; ··· 753 753 screens[i].set_viewport(NULL); 754 754 viewportmanager_theme_undo(i, false); 755 755 } 756 - return result; 756 + return (result) ? 1 : 0; 757 757 } 758 758 759 - static bool eq_save_preset(void) 759 + static int eq_save_preset(void) 760 760 { 761 761 /* make sure that the eq is enabled for setting saving */ 762 762 bool enabled = global_settings.eq_enabled; ··· 766 766 767 767 global_settings.eq_enabled = enabled; 768 768 769 - return result; 769 + return (result) ? 1 : 0; 770 770 } 771 771 /* Allows browsing of preset files */ 772 772 static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG }; 773 773 774 774 MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), 775 - (int(*)(void))eq_menu_graphical, NULL, lowlatency_callback, 775 + eq_menu_graphical, NULL, lowlatency_callback, 776 776 Icon_EQ); 777 777 MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), 778 - (int(*)(void))eq_save_preset, NULL, NULL, Icon_NOICON); 778 + eq_save_preset, NULL, NULL, Icon_NOICON); 779 779 MENUITEM_FUNCTION(eq_browse, MENU_FUNC_USEPARAM, ID2P(LANG_EQUALIZER_BROWSE), 780 780 browse_folder, (void*)&eqs, lowlatency_callback, 781 781 Icon_NOICON);
+1 -1
apps/menus/eq_menu.h
··· 40 40 #define EQ_USER_DIVISOR 10 41 41 42 42 bool eq_browse_presets(void); 43 - bool eq_menu_graphical(void); 43 + int eq_menu_graphical(void); 44 44 45 45 /* utility functions for settings_list.c */ 46 46 const char* eq_q_format(char* buffer, size_t buffer_size, int value,
+12 -8
apps/menus/main_menu.c
··· 111 111 /* INFO MENU */ 112 112 113 113 114 - static bool show_credits(void) 114 + static int show_credits(void) 115 115 { 116 116 char credits[MAX_PATH] = { '\0' }; 117 117 snprintf(credits, MAX_PATH, "%s/credits.rock", VIEWERS_DIR); ··· 122 122 while (IS_SYSEVENT(get_action(CONTEXT_STD, TIMEOUT_BLOCK))) 123 123 ; 124 124 } 125 - return false; 125 + return 0; 126 126 } 127 127 128 128 #ifdef HAVE_LCD_CHARCELLS ··· 357 357 } 358 358 return action; 359 359 } 360 - static bool show_info(void) 360 + static int show_info(void) 361 361 { 362 362 struct info_data data = {.new_data = true }; 363 363 struct simplelist_info info; ··· 369 369 if(global_settings.talk_menu) 370 370 info.get_talk = info_speak_item; 371 371 info.action_callback = info_action_callback; 372 - return simplelist_show_list(&info); 372 + return (simplelist_show_list(&info)) ? 1 : 0; 373 373 } 374 + 375 + 374 376 MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO), 375 - (menu_function)show_info, NULL, NULL, Icon_NOICON); 377 + show_info, NULL, NULL, Icon_NOICON); 376 378 377 379 #if CONFIG_RTC 378 380 int time_screen(void* ignored); ··· 381 383 #endif 382 384 383 385 MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), 384 - (menu_function)show_credits, NULL, NULL, Icon_NOICON); 386 + show_credits, NULL, NULL, Icon_NOICON); 387 + 385 388 MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), 386 - (menu_function)view_runtime, NULL, NULL, Icon_NOICON); 389 + view_runtime, NULL, NULL, Icon_NOICON); 390 + 387 391 MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), 388 - (menu_function)debug_menu, NULL, NULL, Icon_NOICON); 392 + debug_menu, NULL, NULL, Icon_NOICON); 389 393 390 394 MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, 391 395 &show_info_item, &show_credits_item,
+3 -5
apps/menus/playlist_menu.c
··· 75 75 playlist_viewer_ex(NULL); 76 76 return 0; 77 77 } 78 - 79 78 MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), 80 - (int(*)(void))create_playlist, NULL, NULL, Icon_NOICON); 79 + create_playlist, NULL, NULL, Icon_NOICON); 81 80 MENUITEM_FUNCTION(view_cur_playlist, 0, 82 81 ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), 83 - (int(*)(void))playlist_view_, NULL, NULL, Icon_NOICON); 82 + playlist_view_, NULL, NULL, Icon_NOICON); 84 83 MENUITEM_FUNCTION(save_playlist, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), 85 - (int(*)(void*))save_playlist_screen, 86 - NULL, NULL, Icon_NOICON); 84 + save_playlist_screen, NULL, NULL, Icon_NOICON); 87 85 MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); 88 86 MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL); 89 87 static int clear_catalog_directory(void)
+1 -1
apps/menus/radio_menu.c
··· 59 59 #define FM_RECORDING_SETTINGS 60 60 static int fm_recording_settings(void) 61 61 { 62 - bool ret = recording_menu(true); 62 + int ret = recording_menu(true); 63 63 64 64 #if CONFIG_CODEC != SWCODEC 65 65 if (!ret)
+6 -5
apps/menus/recording_menu.c
··· 307 307 recformat_func, NULL, NULL, Icon_Menu_setting); 308 308 309 309 MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS), 310 - (int(*)(void))enc_global_config_menu, 310 + enc_global_config_menu, 311 311 NULL, NULL, Icon_Submenu); 312 312 313 313 #endif /* CONFIG_CODEC == SWCODEC */ ··· 651 651 &browse_recconfigs, &save_recpresets_item 652 652 ); 653 653 654 - bool recording_menu(bool no_source) 654 + int recording_menu(bool no_source) 655 655 { 656 - bool retval; 656 + int retval; 657 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 660 no_source_in_menu = false; /* always fall back to the default */ 660 661 return retval; 661 662 }; 662 663 663 664 MENUITEM_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);
+4 -2
apps/menus/settings_menu.c
··· 152 152 (int(*)(void))tagcache_update_with_splash, 153 153 NULL, NULL, Icon_NOICON); 154 154 MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); 155 + 155 156 MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), 156 - (int(*)(void))tagtree_export, NULL, 157 + tagtree_export, NULL, 157 158 NULL, Icon_NOICON); 159 + 158 160 MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), 159 - (int(*)(void))tagtree_import, NULL, 161 + tagtree_import, NULL, 160 162 NULL, Icon_NOICON); 161 163 MENUITEM_FUNCTION(tc_paths, 0, ID2P(LANG_SELECT_DATABASE_DIRS), 162 164 dirs_to_scan, NULL, NULL, Icon_NOICON);
+1 -1
apps/menus/time_menu.c
··· 82 82 MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); 83 83 #ifdef HAVE_RTC_ALARM 84 84 MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), 85 - (menu_function)alarm_screen, NULL, NULL, Icon_NOICON); 85 + alarm_screen, NULL, NULL, Icon_NOICON); 86 86 #if CONFIG_TUNER || defined(HAVE_RECORDING) 87 87 88 88 #if CONFIG_TUNER && !defined(HAVE_RECORDING)
+3 -3
apps/screens.c
··· 830 830 } 831 831 832 832 833 - bool view_runtime(void) 833 + int view_runtime(void) 834 834 { 835 835 static const char *lines[]={ID2P(LANG_CLEAR_TIME)}; 836 836 static const struct text_message message={lines, 1}; ··· 869 869 } 870 870 } 871 871 if(default_event_handler(action) == SYS_USB_CONNECTED) 872 - return true; 872 + return 1; 873 873 } 874 - return false; 874 + return 0; 875 875 } 876 876 877 877 #ifdef HAVE_TOUCHSCREEN
+1 -1
apps/screens.h
··· 43 43 44 44 bool shutdown_screen(void); 45 45 bool browse_id3(void); 46 - bool view_runtime(void); 46 + int view_runtime(void); 47 47 48 48 #ifdef HAVE_TOUCHSCREEN 49 49 int calibrate(void);
+1 -1
apps/settings.c
··· 1183 1183 bool result; 1184 1184 1185 1185 result = set_option(string, variable, BOOL, names, 2, 1186 - (void (*)(int))function); 1186 + (void (*)(int))(void (*)(void))function); 1187 1187 return result; 1188 1188 } 1189 1189
+1 -1
apps/sound_menu.h
··· 21 21 #ifndef _SOUND_MENU_H 22 22 #define _SOUND_MENU_H 23 23 24 - bool recording_menu(bool no_source); 24 + int recording_menu(bool no_source); 25 25 int rectrigger(void); 26 26 27 27 #endif
+4 -4
apps/tagtree.c
··· 967 967 #endif 968 968 } 969 969 970 - bool tagtree_export(void) 970 + int tagtree_export(void) 971 971 { 972 972 struct tagcache_search tcs; 973 973 ··· 977 977 splash(HZ*2, ID2P(LANG_FAILED)); 978 978 } 979 979 980 - return false; 980 + return 0; 981 981 } 982 982 983 - bool tagtree_import(void) 983 + int tagtree_import(void) 984 984 { 985 985 splash(0, ID2P(LANG_WAIT)); 986 986 if (!tagcache_import_changelog()) ··· 988 988 splash(HZ*2, ID2P(LANG_FAILED)); 989 989 } 990 990 991 - return false; 991 + return 0; 992 992 } 993 993 994 994 static bool parse_menu(const char *filename);
+2 -2
apps/tagtree.h
··· 31 31 #define TAGMENU_MAX_MENUS 32 32 32 #define TAGMENU_MAX_FMTS 32 33 33 34 - bool tagtree_export(void); 35 - bool tagtree_import(void); 34 + int tagtree_export(void); 35 + int tagtree_import(void); 36 36 void tagtree_init(void) INIT_ATTR; 37 37 int tagtree_enter(struct tree_context* c); 38 38 void tagtree_exit(struct tree_context* c);
+3 -3
apps/tree.c
··· 912 912 return true; 913 913 } 914 914 915 - bool create_playlist(void) 915 + int create_playlist(void) 916 916 { 917 917 char filename[MAX_PATH + 16]; /* add enough space for extension */ 918 918 ··· 924 924 925 925 926 926 if (kbd_input(filename, MAX_PATH)) 927 - return false; 927 + return 0; 928 928 splashf(0, "%s %s", str(LANG_CREATING), filename); 929 929 930 930 trigger_cpu_boost(); 931 931 catalog_add_to_a_playlist(tc.currdir, ATTR_DIRECTORY, true, filename); 932 932 cancel_cpu_boost(); 933 933 934 - return true; 934 + return 1; 935 935 } 936 936 937 937 void browse_context_init(struct browse_context *browse,
+1 -1
apps/tree.h
··· 116 116 char *title, enum themable_icons icon, 117 117 const char *root, const char *selected); 118 118 int rockbox_browse(struct browse_context *browse); 119 - bool create_playlist(void); 119 + int create_playlist(void); 120 120 void resume_directory(const char *dir); 121 121 static inline void tree_lock_cache(struct tree_context *t) 122 122 {