diff options
Diffstat (limited to 'apps/menus/eq_menu.c')
-rw-r--r-- | apps/menus/eq_menu.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index 25ab170169..65b17a73c9 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c | |||
@@ -144,21 +144,21 @@ 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_WPARAM_DYNTEXT(gain_item_0, do_option, (void*)&gain_0, NULL, |
146 | gainitem_get_name, | 146 | gainitem_get_name, |
147 | &global_settings.eq_band0_cutoff, NOICON); | 147 | &global_settings.eq_band0_cutoff, Icon_NOICON); |
148 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_1, do_option, (void*)&gain_1, NULL, | 148 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_1, do_option, (void*)&gain_1, NULL, |
149 | gainitem_get_name, | 149 | gainitem_get_name, |
150 | &global_settings.eq_band1_cutoff, NOICON); | 150 | &global_settings.eq_band1_cutoff, Icon_NOICON); |
151 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_2, do_option, (void*)&gain_2, NULL, | 151 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_2, do_option, (void*)&gain_2, NULL, |
152 | gainitem_get_name, | 152 | gainitem_get_name, |
153 | &global_settings.eq_band2_cutoff, NOICON); | 153 | &global_settings.eq_band2_cutoff, Icon_NOICON); |
154 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_3, do_option, (void*)&gain_3, NULL, | 154 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_3, do_option, (void*)&gain_3, NULL, |
155 | gainitem_get_name, | 155 | gainitem_get_name, |
156 | &global_settings.eq_band3_cutoff, NOICON); | 156 | &global_settings.eq_band3_cutoff, Icon_NOICON); |
157 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_4, do_option, (void*)&gain_4, NULL, | 157 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_4, do_option, (void*)&gain_4, NULL, |
158 | gainitem_get_name, | 158 | gainitem_get_name, |
159 | &global_settings.eq_band4_cutoff, NOICON); | 159 | &global_settings.eq_band4_cutoff, Icon_NOICON); |
160 | 160 | ||
161 | MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, 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); |
163 | 163 | ||
164 | static const struct menu_item_ex *band_items[3][3] = { | 164 | static const struct menu_item_ex *band_items[3][3] = { |
@@ -183,7 +183,7 @@ int do_center_band_menu(void* param) | |||
183 | cb_and_desc.menu_callback = NULL; | 183 | cb_and_desc.menu_callback = NULL; |
184 | snprintf(desc, MAX_PATH, str(LANG_EQUALIZER_BAND_PEAK), band); | 184 | snprintf(desc, MAX_PATH, str(LANG_EQUALIZER_BAND_PEAK), band); |
185 | cb_and_desc.desc = desc; | 185 | cb_and_desc.desc = desc; |
186 | cb_and_desc.icon = bitmap_icons_6x8[Icon_EQ]; | 186 | cb_and_desc.icon_id = Icon_EQ; |
187 | menu.flags = MT_MENU|(3<<MENU_COUNT_SHIFT)|MENU_HAS_DESC; | 187 | menu.flags = MT_MENU|(3<<MENU_COUNT_SHIFT)|MENU_HAS_DESC; |
188 | menu.submenus = band_items[band-1]; | 188 | menu.submenus = band_items[band-1]; |
189 | menu.callback_and_desc = &cb_and_desc; | 189 | menu.callback_and_desc = &cb_and_desc; |
@@ -191,17 +191,17 @@ int do_center_band_menu(void* param) | |||
191 | return 0; | 191 | return 0; |
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 | bitmap_icons_6x8[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_WPARAM_DYNTEXT(band_1_menu, do_center_band_menu, (void*)1, NULL, |
196 | centerband_get_name, (void*)1, bitmap_icons_6x8[Icon_EQ]); | 196 | centerband_get_name, (void*)1, Icon_EQ); |
197 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_2_menu, do_center_band_menu, (void*)2, NULL, | 197 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_2_menu, do_center_band_menu, (void*)2, NULL, |
198 | centerband_get_name, (void*)2, bitmap_icons_6x8[Icon_EQ]); | 198 | centerband_get_name, (void*)2, Icon_EQ); |
199 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_3_menu, do_center_band_menu, (void*)3, NULL, | 199 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_3_menu, do_center_band_menu, (void*)3, NULL, |
200 | centerband_get_name, (void*)3, bitmap_icons_6x8[Icon_EQ]); | 200 | centerband_get_name, (void*)3, Icon_EQ); |
201 | MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, | 201 | MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, |
202 | bitmap_icons_6x8[Icon_EQ], &cutoff_4, &q_4, &gain_4); | 202 | Icon_EQ, &cutoff_4, &q_4, &gain_4); |
203 | 203 | ||
204 | MAKE_MENU(advanced_eq_menu_, ID2P(LANG_EQUALIZER_ADVANCED), NULL, bitmap_icons_6x8[Icon_EQ], | 204 | MAKE_MENU(advanced_eq_menu_, ID2P(LANG_EQUALIZER_ADVANCED), NULL, Icon_EQ, |
205 | &band_0_menu, &band_1_menu, &band_2_menu, &band_3_menu, &band_4_menu); | 205 | &band_0_menu, &band_1_menu, &band_2_menu, &band_3_menu, &band_4_menu); |
206 | 206 | ||
207 | 207 | ||
@@ -627,13 +627,13 @@ bool eq_browse_presets(void) | |||
627 | 627 | ||
628 | MENUITEM_FUNCTION(eq_graphical, ID2P(LANG_EQUALIZER_GRAPHICAL), | 628 | MENUITEM_FUNCTION(eq_graphical, ID2P(LANG_EQUALIZER_GRAPHICAL), |
629 | (int(*)(void))eq_menu_graphical, NULL, | 629 | (int(*)(void))eq_menu_graphical, NULL, |
630 | bitmap_icons_6x8[Icon_EQ]); | 630 | Icon_EQ); |
631 | MENUITEM_FUNCTION(eq_save, ID2P(LANG_EQUALIZER_SAVE), | 631 | MENUITEM_FUNCTION(eq_save, ID2P(LANG_EQUALIZER_SAVE), |
632 | (int(*)(void))eq_save_preset, NULL, NOICON); | 632 | (int(*)(void))eq_save_preset, NULL, Icon_NOICON); |
633 | MENUITEM_FUNCTION(eq_browse, ID2P(LANG_EQUALIZER_BROWSE), | 633 | MENUITEM_FUNCTION(eq_browse, ID2P(LANG_EQUALIZER_BROWSE), |
634 | (int(*)(void))eq_browse_presets, NULL, NOICON); | 634 | (int(*)(void))eq_browse_presets, NULL, Icon_NOICON); |
635 | 635 | ||
636 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, bitmap_icons_6x8[Icon_EQ], | 636 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, |
637 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, | 637 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, |
638 | &advanced_eq_menu_, &eq_save, &eq_browse); | 638 | &advanced_eq_menu_, &eq_save, &eq_browse); |
639 | 639 | ||
@@ -753,33 +753,33 @@ MENUITEM_SETTING(hw_eq_enable, &global_settings.eq_hw_enabled, hweq_enable_callb | |||
753 | 753 | ||
754 | MENUITEM_SETTING(hw_eq_cutoff_0, &global_settings.eq_hw_band0_cutoff, band0_callback); | 754 | MENUITEM_SETTING(hw_eq_cutoff_0, &global_settings.eq_hw_band0_cutoff, band0_callback); |
755 | MENUITEM_SETTING(hw_eq_gain_0, &global_settings.eq_hw_band0_gain, band0_callback); | 755 | MENUITEM_SETTING(hw_eq_gain_0, &global_settings.eq_hw_band0_gain, band0_callback); |
756 | MAKE_MENU(hw_eq_band0, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, NOICON, | 756 | MAKE_MENU(hw_eq_band0, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, Icon_NOICON, |
757 | &hw_eq_cutoff_0, &hw_eq_gain_0); | 757 | &hw_eq_cutoff_0, &hw_eq_gain_0); |
758 | 758 | ||
759 | MENUITEM_SETTING(hw_eq_cutoff_1, &global_settings.eq_hw_band1_center, band1_callback); | 759 | MENUITEM_SETTING(hw_eq_cutoff_1, &global_settings.eq_hw_band1_center, band1_callback); |
760 | MENUITEM_SETTING(hw_eq_bandwidth_1, &global_settings.eq_hw_band1_bandwidth, band1_callback); | 760 | MENUITEM_SETTING(hw_eq_bandwidth_1, &global_settings.eq_hw_band1_bandwidth, band1_callback); |
761 | MENUITEM_SETTING(hw_eq_gain_1, &global_settings.eq_hw_band1_gain, band1_callback); | 761 | MENUITEM_SETTING(hw_eq_gain_1, &global_settings.eq_hw_band1_gain, band1_callback); |
762 | MAKE_MENU(hw_eq_band1, "Peak Filter 1", NULL, NOICON, | 762 | MAKE_MENU(hw_eq_band1, "Peak Filter 1", NULL, Icon_NOICON, |
763 | &hw_eq_cutoff_1, &hw_eq_bandwidth_1, &hw_eq_gain_1); | 763 | &hw_eq_cutoff_1, &hw_eq_bandwidth_1, &hw_eq_gain_1); |
764 | 764 | ||
765 | MENUITEM_SETTING(hw_eq_cutoff_2, &global_settings.eq_hw_band2_center, band2_callback); | 765 | MENUITEM_SETTING(hw_eq_cutoff_2, &global_settings.eq_hw_band2_center, band2_callback); |
766 | MENUITEM_SETTING(hw_eq_bandwidth_2, &global_settings.eq_hw_band2_bandwidth, band2_callback); | 766 | MENUITEM_SETTING(hw_eq_bandwidth_2, &global_settings.eq_hw_band2_bandwidth, band2_callback); |
767 | MENUITEM_SETTING(hw_eq_gain_2, &global_settings.eq_hw_band2_gain, band2_callback); | 767 | MENUITEM_SETTING(hw_eq_gain_2, &global_settings.eq_hw_band2_gain, band2_callback); |
768 | MAKE_MENU(hw_eq_band2, "Peak Filter 2", NULL, NOICON, | 768 | MAKE_MENU(hw_eq_band2, "Peak Filter 2", NULL, Icon_NOICON, |
769 | &hw_eq_cutoff_2, &hw_eq_bandwidth_2, &hw_eq_gain_2); | 769 | &hw_eq_cutoff_2, &hw_eq_bandwidth_2, &hw_eq_gain_2); |
770 | 770 | ||
771 | MENUITEM_SETTING(hw_eq_cutoff_3, &global_settings.eq_hw_band3_center, band3_callback); | 771 | MENUITEM_SETTING(hw_eq_cutoff_3, &global_settings.eq_hw_band3_center, band3_callback); |
772 | MENUITEM_SETTING(hw_eq_bandwidth_3, &global_settings.eq_hw_band3_bandwidth, band3_callback); | 772 | MENUITEM_SETTING(hw_eq_bandwidth_3, &global_settings.eq_hw_band3_bandwidth, band3_callback); |
773 | MENUITEM_SETTING(hw_eq_gain_3, &global_settings.eq_hw_band3_gain, band3_callback); | 773 | MENUITEM_SETTING(hw_eq_gain_3, &global_settings.eq_hw_band3_gain, band3_callback); |
774 | MAKE_MENU(hw_eq_band3, "Peak Filter 3", NULL, NOICON, | 774 | MAKE_MENU(hw_eq_band3, "Peak Filter 3", NULL, Icon_NOICON, |
775 | &hw_eq_cutoff_3, &hw_eq_bandwidth_3, &hw_eq_gain_3); | 775 | &hw_eq_cutoff_3, &hw_eq_bandwidth_3, &hw_eq_gain_3); |
776 | 776 | ||
777 | MENUITEM_SETTING(hw_eq_cutoff_4, &global_settings.eq_hw_band4_cutoff, band4_callback); | 777 | MENUITEM_SETTING(hw_eq_cutoff_4, &global_settings.eq_hw_band4_cutoff, band4_callback); |
778 | MENUITEM_SETTING(hw_eq_gain_4, &global_settings.eq_hw_band4_gain, band4_callback); | 778 | MENUITEM_SETTING(hw_eq_gain_4, &global_settings.eq_hw_band4_gain, band4_callback); |
779 | MAKE_MENU(hw_eq_band4, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, NOICON, | 779 | MAKE_MENU(hw_eq_band4, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, Icon_NOICON, |
780 | &hw_eq_cutoff_4, &hw_eq_gain_4); | 780 | &hw_eq_cutoff_4, &hw_eq_gain_4); |
781 | 781 | ||
782 | MAKE_MENU(hw_eq_menu, ID2P(LANG_EQUALIZER_HARDWARE), NULL, bitmap_icons_6x8[Icon_EQ], | 782 | MAKE_MENU(hw_eq_menu, ID2P(LANG_EQUALIZER_HARDWARE), NULL, Icon_EQ, |
783 | &hw_eq_enable, &hw_eq_band0, &hw_eq_band1, | 783 | &hw_eq_enable, &hw_eq_band0, &hw_eq_band1, |
784 | &hw_eq_band2, &hw_eq_band3, &hw_eq_band4); | 784 | &hw_eq_band2, &hw_eq_band3, &hw_eq_band4); |
785 | 785 | ||