Skip to content

Commit 7aa0840

Browse files
sommersoftsommersoft
committed
change voice 'gain' to 'level'
1 parent 15a1647 commit 7aa0840

5 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎shared-bindings/audioio/MixerVoice.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ STATIC mp_obj_t audioio_mixervoice_make_new(const mp_obj_type_t *type, size_t n_
3737
audioio_mixervoice_obj_t *self = m_new_obj(audioio_mixervoice_obj_t);
3838
self->base.type = &audioio_mixervoice_type;
3939
self->sample = NULL;
40-
self->gain = ((1 << 15)-1);
40+
self->level = ((1 << 15)-1);
4141
return MP_OBJ_FROM_PTR(self);
4242
}
4343

@@ -119,35 +119,35 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixervoice_stop_obj, 1, audioio_mixervoice_ob
119119
//|
120120
//| gain must be a floating point number between 0 and 1
121121
//|
122-
STATIC mp_obj_t audioio_mixervoice_obj_set_gain(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
123-
enum { ARG_gain };
122+
STATIC mp_obj_t audioio_mixervoice_obj_set_level(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
123+
enum { ARG_level };
124124
static const mp_arg_t allowed_args[] = {
125-
{ MP_QSTR_gain, MP_ARG_OBJ | MP_ARG_REQUIRED },
125+
{ MP_QSTR_level, MP_ARG_OBJ | MP_ARG_REQUIRED },
126126
};
127127
audioio_mixervoice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
128128
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
129129
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
130130

131131
#if MICROPY_PY_BUILTINS_FLOAT
132-
float gain = mp_obj_get_float(args[ARG_gain].u_obj);
132+
float level = mp_obj_get_float(args[ARG_level].u_obj);
133133
#else
134134
#error "floating point not supported"
135135
#endif
136136

137-
if (gain > 1 || gain < 0) {
138-
mp_raise_ValueError(translate("gain must be between 0 and 1"));
137+
if (level > 1 || level < 0) {
138+
mp_raise_ValueError(translate("level must be between 0 and 1"));
139139
}
140140

141-
common_hal_audioio_mixervoice_set_gain(self, gain);
141+
common_hal_audioio_mixervoice_set_level(self, level);
142142

143143
return mp_const_none;
144144
}
145-
MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixervoice_set_gain_obj, 1, audioio_mixervoice_obj_set_gain);
145+
MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixervoice_set_level_obj, 1, audioio_mixervoice_obj_set_level);
146146

147-
const mp_obj_property_t audioio_mixervoice_gain_obj = {
147+
const mp_obj_property_t audioio_mixervoice_level_obj = {
148148
.base.type = &mp_type_property,
149149
.proxy = {(mp_obj_t)&mp_const_none_obj,
150-
(mp_obj_t)&audioio_mixervoice_set_gain_obj,
150+
(mp_obj_t)&audioio_mixervoice_set_level_obj,
151151
(mp_obj_t)&mp_const_none_obj},
152152
};
153153

@@ -182,7 +182,7 @@ STATIC const mp_rom_map_elem_t audioio_mixervoice_locals_dict_table[] = {
182182

183183
// Properties
184184
{ MP_ROM_QSTR(MP_QSTR_playing), MP_ROM_PTR(&audioio_mixervoice_playing_obj) },
185-
{ MP_ROM_QSTR(MP_QSTR_gain), MP_ROM_PTR(&audioio_mixervoice_gain_obj) },
185+
{ MP_ROM_QSTR(MP_QSTR_level), MP_ROM_PTR(&audioio_mixervoice_level_obj) },
186186
};
187187
STATIC MP_DEFINE_CONST_DICT(audioio_mixervoice_locals_dict, audioio_mixervoice_locals_dict_table);
188188

‎shared-bindings/audioio/MixerVoice.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ void common_hal_audioio_mixervoice_deinit(audioio_mixervoice_obj_t* self);
2121
void common_hal_audioio_mixervoice_set_parent(audioio_mixervoice_obj_t* self, audioio_mixer_obj_t *parent);
2222
void common_hal_audioio_mixervoice_play(audioio_mixervoice_obj_t* self, mp_obj_t sample, bool loop);
2323
void common_hal_audioio_mixervoice_stop(audioio_mixervoice_obj_t* self);
24-
void common_hal_audioio_mixervoice_set_gain(audioio_mixervoice_obj_t* self, float gain);
24+
void common_hal_audioio_mixervoice_set_level(audioio_mixervoice_obj_t* self, float gain);
2525

2626
bool common_hal_audioio_mixervoice_get_playing(audioio_mixervoice_obj_t* self);
2727

‎shared-module/audioio/Mixer.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,19 +309,19 @@ audioio_get_buffer_result_t audioio_mixer_get_buffer(audioio_mixer_obj_t* self,
309309
sample_value = voice->remaining_buffer[j];
310310
}
311311

312-
// apply the mixer gain
312+
// apply the mixer level
313313
if (!self->samples_signed) {
314314
if (self->bits_per_sample == 8) {
315-
sample_value = mult8unsigned(sample_value, voice->gain);
315+
sample_value = mult8unsigned(sample_value, voice->level);
316316
} else {
317-
sample_value = mult16unsigned(sample_value, voice->gain);
317+
sample_value = mult16unsigned(sample_value, voice->level);
318318
}
319319
}
320320
else{
321321
if (self->bits_per_sample == 8) {
322-
sample_value = mult8signed(sample_value, voice->gain);
322+
sample_value = mult8signed(sample_value, voice->level);
323323
} else {
324-
sample_value = mult16signed(sample_value, voice->gain);
324+
sample_value = mult16signed(sample_value, voice->level);
325325
}
326326
}
327327

‎shared-module/audioio/MixerVoice.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ void common_hal_audioio_mixervoice_set_parent(audioio_mixervoice_obj_t* self, au
1818
self->parent = parent;
1919
}
2020

21-
void common_hal_audioio_mixervoice_set_gain(audioio_mixervoice_obj_t* self, float gain) {
22-
self->gain = gain * ((1 << 15)-1);
21+
void common_hal_audioio_mixervoice_set_level(audioio_mixervoice_obj_t* self, float level) {
22+
self->level = level * ((1 << 15)-1);
2323
}
2424

2525
void common_hal_audioio_mixervoice_play(audioio_mixervoice_obj_t* self, mp_obj_t sample, bool loop) {

‎shared-module/audioio/MixerVoice.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ typedef struct {
2121
bool more_data;
2222
uint32_t* remaining_buffer;
2323
uint32_t buffer_length;
24-
int16_t gain;
24+
int16_t level;
2525
} audioio_mixervoice_obj_t;
2626

2727

0 commit comments

Comments
 (0)