diff options
Diffstat (limited to 'apps/menus/eq_menu.c')
-rw-r--r-- | apps/menus/eq_menu.c | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index 0cf63bb20d..f2c1f9b22d 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c | |||
@@ -142,21 +142,21 @@ MENUITEM_SETTING(gain_2, &global_settings.eq_band2_gain, dsp_set_coefs_callback) | |||
142 | MENUITEM_SETTING(gain_3, &global_settings.eq_band3_gain, dsp_set_coefs_callback); | 142 | MENUITEM_SETTING(gain_3, &global_settings.eq_band3_gain, dsp_set_coefs_callback); |
143 | MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, dsp_set_coefs_callback); | 143 | MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, dsp_set_coefs_callback); |
144 | 144 | ||
145 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_0, do_option, (void*)&gain_0, NULL, | 145 | MENUITEM_FUNCTION_DYNTEXT(gain_item_0, MENU_FUNC_USEPARAM, do_option, (void*)&gain_0, |
146 | gainitem_get_name, | 146 | 0, gainitem_get_name, &global_settings.eq_band0_cutoff, |
147 | &global_settings.eq_band0_cutoff, Icon_NOICON); | 147 | NULL, Icon_NOICON); |
148 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_1, do_option, (void*)&gain_1, NULL, | 148 | MENUITEM_FUNCTION_DYNTEXT(gain_item_1, MENU_FUNC_USEPARAM, do_option, (void*)&gain_1, |
149 | gainitem_get_name, | 149 | 0, gainitem_get_name, &global_settings.eq_band1_cutoff, |
150 | &global_settings.eq_band1_cutoff, Icon_NOICON); | 150 | NULL, Icon_NOICON); |
151 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_2, do_option, (void*)&gain_2, NULL, | 151 | MENUITEM_FUNCTION_DYNTEXT(gain_item_2, MENU_FUNC_USEPARAM, do_option, (void*)&gain_2, |
152 | gainitem_get_name, | 152 | 0, gainitem_get_name, &global_settings.eq_band2_cutoff, |
153 | &global_settings.eq_band2_cutoff, Icon_NOICON); | 153 | NULL, Icon_NOICON); |
154 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_3, do_option, (void*)&gain_3, NULL, | 154 | MENUITEM_FUNCTION_DYNTEXT(gain_item_3, MENU_FUNC_USEPARAM, do_option, (void*)&gain_3, |
155 | gainitem_get_name, | 155 | 0, gainitem_get_name, &global_settings.eq_band3_cutoff, |
156 | &global_settings.eq_band3_cutoff, Icon_NOICON); | 156 | NULL, Icon_NOICON); |
157 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_4, do_option, (void*)&gain_4, NULL, | 157 | MENUITEM_FUNCTION_DYNTEXT(gain_item_4, MENU_FUNC_USEPARAM, do_option, (void*)&gain_4, |
158 | gainitem_get_name, | 158 | 0, gainitem_get_name, &global_settings.eq_band4_cutoff, |
159 | &global_settings.eq_band4_cutoff, Icon_NOICON); | 159 | NULL, Icon_NOICON); |
160 | 160 | ||
161 | MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0, | 161 | MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0, |
162 | &gain_item_1, &gain_item_2, &gain_item_3, &gain_item_4); | 162 | &gain_item_1, &gain_item_2, &gain_item_3, &gain_item_4); |
@@ -192,12 +192,15 @@ int do_center_band_menu(void* param) | |||
192 | } | 192 | } |
193 | MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, | 193 | MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, |
194 | Icon_EQ, &cutoff_0, &q_0, &gain_0); | 194 | Icon_EQ, &cutoff_0, &q_0, &gain_0); |
195 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_1_menu, do_center_band_menu, (void*)1, NULL, | 195 | MENUITEM_FUNCTION_DYNTEXT(band_1_menu, MENU_FUNC_USEPARAM, |
196 | centerband_get_name, (void*)1, Icon_EQ); | 196 | do_center_band_menu, (void*)1, 0, |
197 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_2_menu, do_center_band_menu, (void*)2, NULL, | 197 | centerband_get_name, (void*)1, NULL, Icon_EQ); |
198 | centerband_get_name, (void*)2, Icon_EQ); | 198 | MENUITEM_FUNCTION_DYNTEXT(band_2_menu, MENU_FUNC_USEPARAM, |
199 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_3_menu, do_center_band_menu, (void*)3, NULL, | 199 | do_center_band_menu, (void*)2, 0, |
200 | centerband_get_name, (void*)3, Icon_EQ); | 200 | centerband_get_name, (void*)2, NULL, Icon_EQ); |
201 | MENUITEM_FUNCTION_DYNTEXT(band_3_menu, MENU_FUNC_USEPARAM, | ||
202 | do_center_band_menu, (void*)3, 0, | ||
203 | centerband_get_name, (void*)3, NULL, Icon_EQ); | ||
201 | MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, | 204 | MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, |
202 | Icon_EQ, &cutoff_4, &q_4, &gain_4); | 205 | Icon_EQ, &cutoff_4, &q_4, &gain_4); |
203 | 206 | ||
@@ -625,13 +628,13 @@ bool eq_browse_presets(void) | |||
625 | } | 628 | } |
626 | 629 | ||
627 | 630 | ||
628 | MENUITEM_FUNCTION(eq_graphical, ID2P(LANG_EQUALIZER_GRAPHICAL), | 631 | MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), |
629 | (int(*)(void))eq_menu_graphical, NULL, | 632 | (int(*)(void))eq_menu_graphical, NULL, 0, NULL, |
630 | Icon_EQ); | 633 | Icon_EQ); |
631 | MENUITEM_FUNCTION(eq_save, ID2P(LANG_EQUALIZER_SAVE), | 634 | MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), |
632 | (int(*)(void))eq_save_preset, NULL, Icon_NOICON); | 635 | (int(*)(void))eq_save_preset, NULL, 0, NULL, Icon_NOICON); |
633 | MENUITEM_FUNCTION(eq_browse, ID2P(LANG_EQUALIZER_BROWSE), | 636 | MENUITEM_FUNCTION(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), |
634 | (int(*)(void))eq_browse_presets, NULL, Icon_NOICON); | 637 | (int(*)(void))eq_browse_presets, NULL, 0, NULL, Icon_NOICON); |
635 | 638 | ||
636 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, | 639 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, |
637 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, | 640 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, |