diff options
author | William Wilgus <wilgus.william@gmail.com> | 2022-12-17 02:43:41 -0500 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2022-12-17 02:51:43 -0500 |
commit | ccf1aaa5bede11c95d219adbf6267426b57613d2 (patch) | |
tree | a2670a79c42b743d19631055385004706369b5d2 /apps/menus/audiohw_eq_menu.c | |
parent | 6f54bb63fc1f0da06330806321fbba50b1364907 (diff) | |
download | rockbox-ccf1aaa5bede11c95d219adbf6267426b57613d2.tar.gz rockbox-ccf1aaa5bede11c95d219adbf6267426b57613d2.zip |
menus move functions with parameters to their own type
left the union with function(void) and function_w_param(param)
as a few areas might still need to use both (onplay.c)
there might be a few I missed yet..
Change-Id: I593a6875301923e19ba04ad1b0f3173dc9ebdf1f
Diffstat (limited to 'apps/menus/audiohw_eq_menu.c')
-rw-r--r-- | apps/menus/audiohw_eq_menu.c | 156 |
1 files changed, 78 insertions, 78 deletions
diff --git a/apps/menus/audiohw_eq_menu.c b/apps/menus/audiohw_eq_menu.c index 06ab32c151..8bfd2260b0 100644 --- a/apps/menus/audiohw_eq_menu.c +++ b/apps/menus/audiohw_eq_menu.c | |||
@@ -80,106 +80,106 @@ static int hw_eq_do_band_setting(void *param) | |||
80 | return 0; | 80 | return 0; |
81 | } | 81 | } |
82 | 82 | ||
83 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band1_gain, MENU_FUNC_USEPARAM, | 83 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band1_gain, 0, |
84 | hw_eq_do_band_setting, | 84 | hw_eq_do_band_setting, |
85 | HW_EQ_IDX(AUDIOHW_EQ_BAND1, AUDIOHW_EQ_GAIN), | 85 | HW_EQ_IDX(AUDIOHW_EQ_BAND1, AUDIOHW_EQ_GAIN), |
86 | hw_eq_get_name, hw_eq_speak_item, | 86 | hw_eq_get_name, hw_eq_speak_item, |
87 | HW_EQ_IDX(AUDIOHW_EQ_BAND1, AUDIOHW_EQ_GAIN), | 87 | HW_EQ_IDX(AUDIOHW_EQ_BAND1, AUDIOHW_EQ_GAIN), |
88 | NULL, Icon_Menu_setting); | 88 | NULL, Icon_Menu_setting); |
89 | #ifdef AUDIOHW_HAVE_EQ_BAND1_FREQUENCY | 89 | #ifdef AUDIOHW_HAVE_EQ_BAND1_FREQUENCY |
90 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band1_frequency, MENU_FUNC_USEPARAM, | 90 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band1_frequency, 0, |
91 | hw_eq_do_band_setting, | 91 | hw_eq_do_band_setting, |
92 | HW_EQ_IDX(AUDIOHW_EQ_BAND1, AUDIOHW_EQ_FREQUENCY), | 92 | HW_EQ_IDX(AUDIOHW_EQ_BAND1, AUDIOHW_EQ_FREQUENCY), |
93 | hw_eq_get_name, hw_eq_speak_item, | 93 | hw_eq_get_name, hw_eq_speak_item, |
94 | HW_EQ_IDX(AUDIOHW_EQ_BAND1, AUDIOHW_EQ_FREQUENCY), | 94 | HW_EQ_IDX(AUDIOHW_EQ_BAND1, AUDIOHW_EQ_FREQUENCY), |
95 | NULL, Icon_NOICON); | 95 | NULL, Icon_NOICON); |
96 | #endif | 96 | #endif |
97 | #ifdef AUDIOHW_HAVE_EQ_BAND2 | 97 | #ifdef AUDIOHW_HAVE_EQ_BAND2 |
98 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band2_gain, MENU_FUNC_USEPARAM, | 98 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band2_gain, 0, |
99 | hw_eq_do_band_setting, | 99 | hw_eq_do_band_setting, |
100 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_GAIN), | 100 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_GAIN), |
101 | hw_eq_get_name, hw_eq_speak_item, | 101 | hw_eq_get_name, hw_eq_speak_item, |
102 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_GAIN), | 102 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_GAIN), |
103 | NULL, Icon_Menu_setting); | 103 | NULL, Icon_Menu_setting); |
104 | #ifdef AUDIOHW_HAVE_EQ_BAND2_FREQUENCY | 104 | #ifdef AUDIOHW_HAVE_EQ_BAND2_FREQUENCY |
105 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band2_frequency, MENU_FUNC_USEPARAM, | 105 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band2_frequency, 0, |
106 | hw_eq_do_band_setting, | 106 | hw_eq_do_band_setting, |
107 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_FREQUENCY), | 107 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_FREQUENCY), |
108 | hw_eq_get_name, hw_eq_speak_item, | 108 | hw_eq_get_name, hw_eq_speak_item, |
109 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_FREQUENCY), | 109 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_FREQUENCY), |
110 | NULL, Icon_NOICON); | 110 | NULL, Icon_NOICON); |
111 | #endif | 111 | #endif |
112 | #ifdef AUDIOHW_HAVE_EQ_BAND2_WIDTH | 112 | #ifdef AUDIOHW_HAVE_EQ_BAND2_WIDTH |
113 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band2_width, MENU_FUNC_USEPARAM, | 113 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band2_width, 0, |
114 | hw_eq_do_band_setting, | 114 | hw_eq_do_band_setting, |
115 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_WIDTH), | 115 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_WIDTH), |
116 | hw_eq_get_name, hw_eq_speak_item, | 116 | hw_eq_get_name, hw_eq_speak_item, |
117 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_WIDTH), | 117 | HW_EQ_IDX(AUDIOHW_EQ_BAND2, AUDIOHW_EQ_WIDTH), |
118 | NULL, Icon_NOICON); | 118 | NULL, Icon_NOICON); |
119 | #endif | 119 | #endif |
120 | #endif /* AUDIOHW_HAVE_EQ_BAND2 */ | 120 | #endif /* AUDIOHW_HAVE_EQ_BAND2 */ |
121 | #ifdef AUDIOHW_HAVE_EQ_BAND3 | 121 | #ifdef AUDIOHW_HAVE_EQ_BAND3 |
122 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band3_gain, MENU_FUNC_USEPARAM, | 122 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band3_gain, 0, |
123 | hw_eq_do_band_setting, | 123 | hw_eq_do_band_setting, |
124 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_GAIN), | 124 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_GAIN), |
125 | hw_eq_get_name, hw_eq_speak_item, | 125 | hw_eq_get_name, hw_eq_speak_item, |
126 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_GAIN), | 126 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_GAIN), |
127 | NULL, Icon_Menu_setting); | 127 | NULL, Icon_Menu_setting); |
128 | #ifdef AUDIOHW_HAVE_EQ_BAND3_FREQUENCY | 128 | #ifdef AUDIOHW_HAVE_EQ_BAND3_FREQUENCY |
129 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band3_frequency, MENU_FUNC_USEPARAM, | 129 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band3_frequency, 0, |
130 | hw_eq_do_band_setting, | 130 | hw_eq_do_band_setting, |
131 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_FREQUENCY), | 131 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_FREQUENCY), |
132 | hw_eq_get_name, hw_eq_speak_item, | 132 | hw_eq_get_name, hw_eq_speak_item, |
133 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_FREQUENCY), | 133 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_FREQUENCY), |
134 | NULL, Icon_NOICON); | 134 | NULL, Icon_NOICON); |
135 | #endif | 135 | #endif |
136 | #ifdef AUDIOHW_HAVE_EQ_BAND3_WIDTH | 136 | #ifdef AUDIOHW_HAVE_EQ_BAND3_WIDTH |
137 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band3_width, MENU_FUNC_USEPARAM, | 137 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band3_width, 0, |
138 | hw_eq_do_band_setting, | 138 | hw_eq_do_band_setting, |
139 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_WIDTH), | 139 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_WIDTH), |
140 | hw_eq_get_name, hw_eq_speak_item, | 140 | hw_eq_get_name, hw_eq_speak_item, |
141 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_WIDTH), | 141 | HW_EQ_IDX(AUDIOHW_EQ_BAND3, AUDIOHW_EQ_WIDTH), |
142 | NULL, Icon_NOICON); | 142 | NULL, Icon_NOICON); |
143 | #endif | 143 | #endif |
144 | #endif /* AUDIOHW_HAVE_EQ_BAND3 */ | 144 | #endif /* AUDIOHW_HAVE_EQ_BAND3 */ |
145 | #ifdef AUDIOHW_HAVE_EQ_BAND4 | 145 | #ifdef AUDIOHW_HAVE_EQ_BAND4 |
146 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band4_gain, MENU_FUNC_USEPARAM, | 146 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band4_gain, 0, |
147 | hw_eq_do_band_setting, | 147 | hw_eq_do_band_setting, |
148 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_GAIN), | 148 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_GAIN), |
149 | hw_eq_get_name, hw_eq_speak_item, | 149 | hw_eq_get_name, hw_eq_speak_item, |
150 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_GAIN), | 150 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_GAIN), |
151 | NULL, Icon_Menu_setting); | 151 | NULL, Icon_Menu_setting); |
152 | #ifdef AUDIOHW_HAVE_EQ_BAND4_FREQUENCY | 152 | #ifdef AUDIOHW_HAVE_EQ_BAND4_FREQUENCY |
153 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band4_frequency, MENU_FUNC_USEPARAM, | 153 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band4_frequency, 0, |
154 | hw_eq_do_band_setting, | 154 | hw_eq_do_band_setting, |
155 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_FREQUENCY), | 155 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_FREQUENCY), |
156 | hw_eq_get_name, hw_eq_speak_item, | 156 | hw_eq_get_name, hw_eq_speak_item, |
157 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_FREQUENCY), | 157 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_FREQUENCY), |
158 | NULL, Icon_NOICON); | 158 | NULL, Icon_NOICON); |
159 | #endif | 159 | #endif |
160 | #ifdef AUDIOHW_HAVE_EQ_BAND4_WIDTH | 160 | #ifdef AUDIOHW_HAVE_EQ_BAND4_WIDTH |
161 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band4_width, MENU_FUNC_USEPARAM, | 161 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band4_width, 0, |
162 | hw_eq_do_band_setting, | 162 | hw_eq_do_band_setting, |
163 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_WIDTH), | 163 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_WIDTH), |
164 | hw_eq_get_name, hw_eq_speak_item, | 164 | hw_eq_get_name, hw_eq_speak_item, |
165 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_WIDTH), | 165 | HW_EQ_IDX(AUDIOHW_EQ_BAND4, AUDIOHW_EQ_WIDTH), |
166 | NULL, Icon_NOICON); | 166 | NULL, Icon_NOICON); |
167 | #endif | 167 | #endif |
168 | #endif /* AUDIOHW_HAVE_EQ_BAND4 */ | 168 | #endif /* AUDIOHW_HAVE_EQ_BAND4 */ |
169 | #ifdef AUDIOHW_HAVE_EQ_BAND5 | 169 | #ifdef AUDIOHW_HAVE_EQ_BAND5 |
170 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band5_gain, MENU_FUNC_USEPARAM, | 170 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band5_gain, 0, |
171 | hw_eq_do_band_setting, | 171 | hw_eq_do_band_setting, |
172 | HW_EQ_IDX(AUDIOHW_EQ_BAND5, AUDIOHW_EQ_GAIN), | 172 | HW_EQ_IDX(AUDIOHW_EQ_BAND5, AUDIOHW_EQ_GAIN), |
173 | hw_eq_get_name, hw_eq_speak_item, | 173 | hw_eq_get_name, hw_eq_speak_item, |
174 | HW_EQ_IDX(AUDIOHW_EQ_BAND5, AUDIOHW_EQ_GAIN), | 174 | HW_EQ_IDX(AUDIOHW_EQ_BAND5, AUDIOHW_EQ_GAIN), |
175 | NULL, Icon_Menu_setting); | 175 | NULL, Icon_Menu_setting); |
176 | #ifdef AUDIOHW_HAVE_EQ_BAND5_FREQUENCY | 176 | #ifdef AUDIOHW_HAVE_EQ_BAND5_FREQUENCY |
177 | MENUITEM_FUNCTION_DYNTEXT(hw_eq_band5_frequency, MENU_FUNC_USEPARAM, | 177 | MENUITEM_FUNCTION_DYNTEXT_W_PARAM(hw_eq_band5_frequency, 0, |
178 | hw_eq_do_band_setting, | 178 | hw_eq_do_band_setting, |
179 | HW_EQ_IDX(AUDIOHW_EQ_BAND5, AUDIOHW_EQ_FREQUENCY), | 179 | HW_EQ_IDX(AUDIOHW_EQ_BAND5, AUDIOHW_EQ_FREQUENCY), |
180 | hw_eq_get_name, hw_eq_speak_item, | 180 | hw_eq_get_name, hw_eq_speak_item, |
181 | HW_EQ_IDX(AUDIOHW_EQ_BAND5, AUDIOHW_EQ_FREQUENCY), | 181 | HW_EQ_IDX(AUDIOHW_EQ_BAND5, AUDIOHW_EQ_FREQUENCY), |
182 | NULL, Icon_NOICON); | 182 | NULL, Icon_NOICON); |
183 | #endif | 183 | #endif |
184 | #endif /* AUDIOHW_HAVE_EQ_BAND5 */ | 184 | #endif /* AUDIOHW_HAVE_EQ_BAND5 */ |
185 | 185 | ||