Add a voice callback to dynamic menus, along side the text_callback.

From FS#7563.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15042 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 22 insertions, 22 deletions

diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c
index a1e00a85c4..7cb88065f5 100644
--- a/apps/menus/eq_menu.c
+++ b/apps/menus/eq_menu.c
@@ -145,21 +145,21 @@ MENUITEM_SETTING(gain_2, &global_settings.eq_band2_gain, dsp_set_coefs_callback)
 MENUITEM_SETTING(gain_3, &global_settings.eq_band3_gain, dsp_set_coefs_callback);
 MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, dsp_set_coefs_callback);
 
-MENUITEM_FUNCTION_DYNTEXT(gain_item_0, MENU_FUNC_USEPARAM, do_option, (void*)&gain_0,
-                                    gainitem_get_name, &global_settings.eq_band0_cutoff,
-                                    NULL, Icon_NOICON);
-MENUITEM_FUNCTION_DYNTEXT(gain_item_1, MENU_FUNC_USEPARAM, do_option, (void*)&gain_1,
-                                    gainitem_get_name, &global_settings.eq_band1_cutoff, 
-                                    NULL, Icon_NOICON);
-MENUITEM_FUNCTION_DYNTEXT(gain_item_2, MENU_FUNC_USEPARAM, do_option, (void*)&gain_2,
-                                    gainitem_get_name, &global_settings.eq_band2_cutoff, 
-                                    NULL, Icon_NOICON);
-MENUITEM_FUNCTION_DYNTEXT(gain_item_3, MENU_FUNC_USEPARAM, do_option, (void*)&gain_3,
-                                    gainitem_get_name, &global_settings.eq_band3_cutoff, 
-                                    NULL, Icon_NOICON);
-MENUITEM_FUNCTION_DYNTEXT(gain_item_4, MENU_FUNC_USEPARAM, do_option, (void*)&gain_4,
-                                    gainitem_get_name, &global_settings.eq_band4_cutoff, 
-                                    NULL, Icon_NOICON);
+MENUITEM_FUNCTION_DYNTEXT(gain_item_0, MENU_FUNC_USEPARAM, do_option,
+    (void*)&gain_0, gainitem_get_name, NULL, &global_settings.eq_band0_cutoff,
+    NULL, Icon_NOICON);
+MENUITEM_FUNCTION_DYNTEXT(gain_item_1, MENU_FUNC_USEPARAM, do_option,
+    (void*)&gain_1, gainitem_get_name, NULL, &global_settings.eq_band1_cutoff,
+    NULL, Icon_NOICON);
+MENUITEM_FUNCTION_DYNTEXT(gain_item_2, MENU_FUNC_USEPARAM, do_option,
+    (void*)&gain_2, gainitem_get_name, NULL, &global_settings.eq_band2_cutoff,
+    NULL, Icon_NOICON);
+MENUITEM_FUNCTION_DYNTEXT(gain_item_3, MENU_FUNC_USEPARAM, do_option,
+    (void*)&gain_3, gainitem_get_name, NULL, &global_settings.eq_band3_cutoff,
+    NULL, Icon_NOICON);
+MENUITEM_FUNCTION_DYNTEXT(gain_item_4, MENU_FUNC_USEPARAM, do_option,
+    (void*)&gain_4, gainitem_get_name, NULL, &global_settings.eq_band4_cutoff,
+    NULL, Icon_NOICON);
                                     
 MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0, 
             &gain_item_1, &gain_item_2, &gain_item_3, &gain_item_4);
@@ -195,15 +195,15 @@ int do_center_band_menu(void* param)
 }
 MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, 
             Icon_EQ, &cutoff_0, &q_0, &gain_0);
-MENUITEM_FUNCTION_DYNTEXT(band_1_menu, MENU_FUNC_USEPARAM, 
-                            do_center_band_menu, (void*)1, 
-                            centerband_get_name, (void*)1, NULL, Icon_EQ);
+MENUITEM_FUNCTION_DYNTEXT(band_1_menu, MENU_FUNC_USEPARAM,
+    do_center_band_menu, (void*)1,
+    centerband_get_name, NULL, (void*)1, NULL, Icon_EQ);
 MENUITEM_FUNCTION_DYNTEXT(band_2_menu, MENU_FUNC_USEPARAM, 
-                            do_center_band_menu, (void*)2, 
-                            centerband_get_name, (void*)2, NULL, Icon_EQ);
+    do_center_band_menu, (void*)2, 
+    centerband_get_name, NULL, (void*)2, NULL, Icon_EQ);
 MENUITEM_FUNCTION_DYNTEXT(band_3_menu, MENU_FUNC_USEPARAM, 
-                            do_center_band_menu, (void*)3, 
-                            centerband_get_name, (void*)3, NULL, Icon_EQ);
+    do_center_band_menu, (void*)3, 
+    centerband_get_name, NULL, (void*)3, NULL, Icon_EQ);
 MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, 
             Icon_EQ, &cutoff_4, &q_4, &gain_4);