Skip to content

Commit 76a2a49

Browse files
authored
Merge pull request #9862 from jepler/audiomixer-nonstandard-setter
no need to support kwargs in a setter
2 parents 7016555 + 8a5bfc1 commit 76a2a49

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

shared-bindings/audiomixer/MixerVoice.c

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,26 +82,13 @@ static mp_obj_t audiomixer_mixervoice_obj_get_level(mp_obj_t self_in) {
8282
}
8383
MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixervoice_get_level_obj, audiomixer_mixervoice_obj_get_level);
8484

85-
static mp_obj_t audiomixer_mixervoice_obj_set_level(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
86-
enum { ARG_level };
87-
static const mp_arg_t allowed_args[] = {
88-
{ MP_QSTR_level, MP_ARG_OBJ | MP_ARG_REQUIRED, {} },
89-
};
90-
audiomixer_mixervoice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
91-
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
92-
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
93-
94-
mp_float_t level = mp_obj_get_float(args[ARG_level].u_obj);
95-
96-
if (level > 1 || level < 0) {
97-
mp_raise_ValueError(MP_ERROR_TEXT("level must be between 0 and 1"));
98-
}
99-
85+
static mp_obj_t audiomixer_mixervoice_obj_set_level(mp_obj_t self_in, mp_obj_t level_in) {
86+
audiomixer_mixervoice_obj_t *self = MP_OBJ_TO_PTR(self_in);
87+
mp_float_t level = mp_arg_validate_obj_float_range(level_in, 0, 1, MP_QSTR_level);
10088
common_hal_audiomixer_mixervoice_set_level(self, level);
101-
10289
return mp_const_none;
10390
}
104-
MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixervoice_set_level_obj, 1, audiomixer_mixervoice_obj_set_level);
91+
MP_DEFINE_CONST_FUN_OBJ_2(audiomixer_mixervoice_set_level_obj, audiomixer_mixervoice_obj_set_level);
10592

10693
MP_PROPERTY_GETSET(audiomixer_mixervoice_level_obj,
10794
(mp_obj_t)&audiomixer_mixervoice_get_level_obj,

0 commit comments

Comments
 (0)