Skip to content

Commit 053cdfc

Browse files
jeplerjepler
authored
Merge pull request #9864 from relic-se/remove-kwarg-in-setters
2 parents 407a31f + 412737d commit 053cdfc

File tree

2 files changed

+24
-72
lines changed

2 files changed

+24
-72
lines changed

‎shared-bindings/audiodelays/Echo.c‎

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -153,20 +153,12 @@ static mp_obj_t audiodelays_echo_obj_get_delay_ms(mp_obj_t self_in) {
153153
}
154154
MP_DEFINE_CONST_FUN_OBJ_1(audiodelays_echo_get_delay_ms_obj, audiodelays_echo_obj_get_delay_ms);
155155

156-
static mp_obj_t audiodelays_echo_obj_set_delay_ms(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
157-
enum { ARG_delay_ms };
158-
static const mp_arg_t allowed_args[] = {
159-
{ MP_QSTR_delay_ms, MP_ARG_OBJ | MP_ARG_REQUIRED, {} },
160-
};
161-
audiodelays_echo_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
162-
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
163-
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
164-
165-
common_hal_audiodelays_echo_set_delay_ms(self, args[ARG_delay_ms].u_obj);
166-
156+
static mp_obj_t audiodelays_echo_obj_set_delay_ms(mp_obj_t self_in, mp_obj_t delay_ms_in) {
157+
audiodelays_echo_obj_t *self = MP_OBJ_TO_PTR(self_in);
158+
common_hal_audiodelays_echo_set_delay_ms(self, delay_ms_in);
167159
return mp_const_none;
168160
}
169-
MP_DEFINE_CONST_FUN_OBJ_KW(audiodelays_echo_set_delay_ms_obj, 1, audiodelays_echo_obj_set_delay_ms);
161+
MP_DEFINE_CONST_FUN_OBJ_2(audiodelays_echo_set_delay_ms_obj, audiodelays_echo_obj_set_delay_ms);
170162

171163
MP_PROPERTY_GETSET(audiodelays_echo_delay_ms_obj,
172164
(mp_obj_t)&audiodelays_echo_get_delay_ms_obj,
@@ -179,20 +171,12 @@ static mp_obj_t audiodelays_echo_obj_get_decay(mp_obj_t self_in) {
179171
}
180172
MP_DEFINE_CONST_FUN_OBJ_1(audiodelays_echo_get_decay_obj, audiodelays_echo_obj_get_decay);
181173

182-
static mp_obj_t audiodelays_echo_obj_set_decay(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
183-
enum { ARG_decay };
184-
static const mp_arg_t allowed_args[] = {
185-
{ MP_QSTR_decay, MP_ARG_OBJ | MP_ARG_REQUIRED, {} },
186-
};
187-
audiodelays_echo_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
188-
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
189-
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
190-
191-
common_hal_audiodelays_echo_set_decay(self, args[ARG_decay].u_obj);
192-
174+
static mp_obj_t audiodelays_echo_obj_set_decay(mp_obj_t self_in, mp_obj_t decay_in) {
175+
audiodelays_echo_obj_t *self = MP_OBJ_TO_PTR(self_in);
176+
common_hal_audiodelays_echo_set_decay(self, decay_in);
193177
return mp_const_none;
194178
}
195-
MP_DEFINE_CONST_FUN_OBJ_KW(audiodelays_echo_set_decay_obj, 1, audiodelays_echo_obj_set_decay);
179+
MP_DEFINE_CONST_FUN_OBJ_2(audiodelays_echo_set_decay_obj, audiodelays_echo_obj_set_decay);
196180

197181
MP_PROPERTY_GETSET(audiodelays_echo_decay_obj,
198182
(mp_obj_t)&audiodelays_echo_get_decay_obj,
@@ -205,20 +189,12 @@ static mp_obj_t audiodelays_echo_obj_get_mix(mp_obj_t self_in) {
205189
}
206190
MP_DEFINE_CONST_FUN_OBJ_1(audiodelays_echo_get_mix_obj, audiodelays_echo_obj_get_mix);
207191

208-
static mp_obj_t audiodelays_echo_obj_set_mix(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
209-
enum { ARG_mix };
210-
static const mp_arg_t allowed_args[] = {
211-
{ MP_QSTR_mix, MP_ARG_OBJ | MP_ARG_REQUIRED, {} },
212-
};
213-
audiodelays_echo_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
214-
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
215-
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
216-
217-
common_hal_audiodelays_echo_set_mix(self, args[ARG_mix].u_obj);
218-
192+
static mp_obj_t audiodelays_echo_obj_set_mix(mp_obj_t self_in, mp_obj_t mix_in) {
193+
audiodelays_echo_obj_t *self = MP_OBJ_TO_PTR(self_in);
194+
common_hal_audiodelays_echo_set_mix(self, mix_in);
219195
return mp_const_none;
220196
}
221-
MP_DEFINE_CONST_FUN_OBJ_KW(audiodelays_echo_set_mix_obj, 1, audiodelays_echo_obj_set_mix);
197+
MP_DEFINE_CONST_FUN_OBJ_2(audiodelays_echo_set_mix_obj, audiodelays_echo_obj_set_mix);
222198

223199
MP_PROPERTY_GETSET(audiodelays_echo_mix_obj,
224200
(mp_obj_t)&audiodelays_echo_get_mix_obj,
@@ -233,20 +209,12 @@ static mp_obj_t audiodelays_echo_obj_get_freq_shift(mp_obj_t self_in) {
233209
}
234210
MP_DEFINE_CONST_FUN_OBJ_1(audiodelays_echo_get_freq_shift_obj, audiodelays_echo_obj_get_freq_shift);
235211

236-
static mp_obj_t audiodelays_echo_obj_set_freq_shift(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
237-
enum { ARG_freq_shift };
238-
static const mp_arg_t allowed_args[] = {
239-
{ MP_QSTR_freq_shift, MP_ARG_BOOL | MP_ARG_REQUIRED, {} },
240-
};
241-
audiodelays_echo_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
242-
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
243-
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
244-
245-
common_hal_audiodelays_echo_set_freq_shift(self, args[ARG_freq_shift].u_bool);
246-
212+
static mp_obj_t audiodelays_echo_obj_set_freq_shift(mp_obj_t self_in, mp_obj_t freq_shift_in) {
213+
audiodelays_echo_obj_t *self = MP_OBJ_TO_PTR(self_in);
214+
common_hal_audiodelays_echo_set_freq_shift(self, mp_obj_is_true(freq_shift_in));
247215
return mp_const_none;
248216
}
249-
MP_DEFINE_CONST_FUN_OBJ_KW(audiodelays_echo_set_freq_shift_obj, 1, audiodelays_echo_obj_set_freq_shift);
217+
MP_DEFINE_CONST_FUN_OBJ_2(audiodelays_echo_set_freq_shift_obj, audiodelays_echo_obj_set_freq_shift);
250218

251219
MP_PROPERTY_GETSET(audiodelays_echo_freq_shift_obj,
252220
(mp_obj_t)&audiodelays_echo_get_freq_shift_obj,

‎shared-bindings/audiofilters/Filter.c‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -139,20 +139,12 @@ static mp_obj_t audiofilters_filter_obj_get_filter(mp_obj_t self_in) {
139139
}
140140
MP_DEFINE_CONST_FUN_OBJ_1(audiofilters_filter_get_filter_obj, audiofilters_filter_obj_get_filter);
141141

142-
static mp_obj_t audiofilters_filter_obj_set_filter(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
143-
enum { ARG_filter };
144-
static const mp_arg_t allowed_args[] = {
145-
{ MP_QSTR_filter, MP_ARG_OBJ | MP_ARG_REQUIRED, {} },
146-
};
147-
audiofilters_filter_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
148-
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
149-
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
150-
151-
common_hal_audiofilters_filter_set_filter(self, args[ARG_filter].u_obj);
152-
142+
static mp_obj_t audiofilters_filter_obj_set_filter(mp_obj_t self_in, mp_obj_t filter_in) {
143+
audiofilters_filter_obj_t *self = MP_OBJ_TO_PTR(self_in);
144+
common_hal_audiofilters_filter_set_filter(self, filter_in);
153145
return mp_const_none;
154146
}
155-
MP_DEFINE_CONST_FUN_OBJ_KW(audiofilters_filter_set_filter_obj, 1, audiofilters_filter_obj_set_filter);
147+
MP_DEFINE_CONST_FUN_OBJ_2(audiofilters_filter_set_filter_obj, audiofilters_filter_obj_set_filter);
156148

157149
MP_PROPERTY_GETSET(audiofilters_filter_filter_obj,
158150
(mp_obj_t)&audiofilters_filter_get_filter_obj,
@@ -166,20 +158,12 @@ static mp_obj_t audiofilters_filter_obj_get_mix(mp_obj_t self_in) {
166158
}
167159
MP_DEFINE_CONST_FUN_OBJ_1(audiofilters_filter_get_mix_obj, audiofilters_filter_obj_get_mix);
168160

169-
static mp_obj_t audiofilters_filter_obj_set_mix(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
170-
enum { ARG_mix };
171-
static const mp_arg_t allowed_args[] = {
172-
{ MP_QSTR_mix, MP_ARG_OBJ | MP_ARG_REQUIRED, {} },
173-
};
174-
audiofilters_filter_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
175-
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
176-
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
177-
178-
common_hal_audiofilters_filter_set_mix(self, args[ARG_mix].u_obj);
179-
161+
static mp_obj_t audiofilters_filter_obj_set_mix(mp_obj_t self_in, mp_obj_t mix_in) {
162+
audiofilters_filter_obj_t *self = MP_OBJ_TO_PTR(self_in);
163+
common_hal_audiofilters_filter_set_mix(self, mix_in);
180164
return mp_const_none;
181165
}
182-
MP_DEFINE_CONST_FUN_OBJ_KW(audiofilters_filter_set_mix_obj, 1, audiofilters_filter_obj_set_mix);
166+
MP_DEFINE_CONST_FUN_OBJ_2(audiofilters_filter_set_mix_obj, audiofilters_filter_obj_set_mix);
183167

184168
MP_PROPERTY_GETSET(audiofilters_filter_mix_obj,
185169
(mp_obj_t)&audiofilters_filter_get_mix_obj,

0 commit comments

Comments
 (0)