@@ -82,26 +82,13 @@ static mp_obj_t audiomixer_mixervoice_obj_get_level(mp_obj_t self_in) {
82
82
}
83
83
MP_DEFINE_CONST_FUN_OBJ_1 (audiomixer_mixervoice_get_level_obj , audiomixer_mixervoice_obj_get_level );
84
84
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 );
100
88
common_hal_audiomixer_mixervoice_set_level (self , level );
101
-
102
89
return mp_const_none ;
103
90
}
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 );
105
92
106
93
MP_PROPERTY_GETSET (audiomixer_mixervoice_level_obj ,
107
94
(mp_obj_t )& audiomixer_mixervoice_get_level_obj ,
0 commit comments