summaryrefslogtreecommitdiff
path: root/apps/menus/eq_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/eq_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/eq_menu.c')
-rw-r--r--apps/menus/eq_menu.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c
index b9da3449a6..7cbf7b5d90 100644
--- a/apps/menus/eq_menu.c
+++ b/apps/menus/eq_menu.c
@@ -563,7 +563,7 @@ static void draw_eq_sliders(struct screen * screen, int x, int y,
563} 563}
564 564
565/* Provides a graphical means of editing the EQ settings */ 565/* Provides a graphical means of editing the EQ settings */
566bool eq_menu_graphical(void) 566int eq_menu_graphical(void)
567{ 567{
568 bool exit_request = false; 568 bool exit_request = false;
569 bool result = true; 569 bool result = true;
@@ -753,10 +753,10 @@ bool eq_menu_graphical(void)
753 screens[i].set_viewport(NULL); 753 screens[i].set_viewport(NULL);
754 viewportmanager_theme_undo(i, false); 754 viewportmanager_theme_undo(i, false);
755 } 755 }
756 return result; 756 return (result) ? 1 : 0;
757} 757}
758 758
759static bool eq_save_preset(void) 759static int eq_save_preset(void)
760{ 760{
761 /* make sure that the eq is enabled for setting saving */ 761 /* make sure that the eq is enabled for setting saving */
762 bool enabled = global_settings.eq_enabled; 762 bool enabled = global_settings.eq_enabled;
@@ -766,16 +766,16 @@ static bool eq_save_preset(void)
766 766
767 global_settings.eq_enabled = enabled; 767 global_settings.eq_enabled = enabled;
768 768
769 return result; 769 return (result) ? 1 : 0;
770} 770}
771/* Allows browsing of preset files */ 771/* Allows browsing of preset files */
772static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG }; 772static struct browse_folder_info eqs = { EQS_DIR, SHOW_CFG };
773 773
774MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), 774MENUITEM_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 Icon_EQ); 776 Icon_EQ);
777MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), 777MENUITEM_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);
779MENUITEM_FUNCTION(eq_browse, MENU_FUNC_USEPARAM, ID2P(LANG_EQUALIZER_BROWSE), 779MENUITEM_FUNCTION(eq_browse, MENU_FUNC_USEPARAM, ID2P(LANG_EQUALIZER_BROWSE),
780 browse_folder, (void*)&eqs, lowlatency_callback, 780 browse_folder, (void*)&eqs, lowlatency_callback,
781 Icon_NOICON); 781 Icon_NOICON);