djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change voice 'gain' to 'level'

Browse Source
This commit is contained in:
sommersoft 2019-03-12 10:24:54 -05:00
parent 15a1647c5c
commit 7aa0840b73
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
shared-bindings/audioio/MixerVoice.c
View File

@ -37,7 +37,7 @@ STATIC mp_obj_t audioio_mixervoice_make_new(const mp_obj_type_t *type, size_t n_
audioio_mixervoice_obj_t *self = m_new_obj(audioio_mixervoice_obj_t); audioio_mixervoice_obj_t *self = m_new_obj(audioio_mixervoice_obj_t);
self->base.type = &audioio_mixervoice_type; self->base.type = &audioio_mixervoice_type;
self->sample = NULL; self->sample = NULL;
self->gain = ((1 << 15)-1); self->level = ((1 << 15)-1);
return MP_OBJ_FROM_PTR(self); return MP_OBJ_FROM_PTR(self);
} }
@ -119,35 +119,35 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixervoice_stop_obj, 1, audioio_mixervoice_ob
//| //|
//| gain must be a floating point number between 0 and 1 //| gain must be a floating point number between 0 and 1
//| //|
STATIC mp_obj_t audioio_mixervoice_obj_set_gain(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { STATIC mp_obj_t audioio_mixervoice_obj_set_level(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
enum { ARG_gain }; enum { ARG_level };
static const mp_arg_t allowed_args[] = { static const mp_arg_t allowed_args[] = {
{ MP_QSTR_gain, MP_ARG_OBJ | MP_ARG_REQUIRED }, { MP_QSTR_level, MP_ARG_OBJ | MP_ARG_REQUIRED },
}; };
audioio_mixervoice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); audioio_mixervoice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
#if MICROPY_PY_BUILTINS_FLOAT #if MICROPY_PY_BUILTINS_FLOAT
float gain = mp_obj_get_float(args[ARG_gain].u_obj); float level = mp_obj_get_float(args[ARG_level].u_obj);
#else #else
#error "floating point not supported" #error "floating point not supported"
#endif #endif
if (gain > 1 || gain < 0) { if (level > 1 || level < 0) {
mp_raise_ValueError(translate("gain must be between 0 and 1")); mp_raise_ValueError(translate("level must be between 0 and 1"));
} }
common_hal_audioio_mixervoice_set_gain(self, gain); common_hal_audioio_mixervoice_set_level(self, level);
return mp_const_none; return mp_const_none;
} }
MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixervoice_set_gain_obj, 1, audioio_mixervoice_obj_set_gain); MP_DEFINE_CONST_FUN_OBJ_KW(audioio_mixervoice_set_level_obj, 1, audioio_mixervoice_obj_set_level);
const mp_obj_property_t audioio_mixervoice_gain_obj = { const mp_obj_property_t audioio_mixervoice_level_obj = {
.base.type = &mp_type_property, .base.type = &mp_type_property,
.proxy = {(mp_obj_t)&mp_const_none_obj, .proxy = {(mp_obj_t)&mp_const_none_obj,
(mp_obj_t)&audioio_mixervoice_set_gain_obj, (mp_obj_t)&audioio_mixervoice_set_level_obj,
(mp_obj_t)&mp_const_none_obj}, (mp_obj_t)&mp_const_none_obj},
}; };
@ -182,7 +182,7 @@ STATIC const mp_rom_map_elem_t audioio_mixervoice_locals_dict_table[] = {
// Properties // Properties
{ MP_ROM_QSTR(MP_QSTR_playing), MP_ROM_PTR(&audioio_mixervoice_playing_obj) }, { MP_ROM_QSTR(MP_QSTR_playing), MP_ROM_PTR(&audioio_mixervoice_playing_obj) },
{ MP_ROM_QSTR(MP_QSTR_gain), MP_ROM_PTR(&audioio_mixervoice_gain_obj) }, { MP_ROM_QSTR(MP_QSTR_level), MP_ROM_PTR(&audioio_mixervoice_level_obj) },
}; };
STATIC MP_DEFINE_CONST_DICT(audioio_mixervoice_locals_dict, audioio_mixervoice_locals_dict_table); STATIC MP_DEFINE_CONST_DICT(audioio_mixervoice_locals_dict, audioio_mixervoice_locals_dict_table);

2
shared-bindings/audioio/MixerVoice.h
View File

@ -21,7 +21,7 @@ void common_hal_audioio_mixervoice_deinit(audioio_mixervoice_obj_t* self);
void common_hal_audioio_mixervoice_set_parent(audioio_mixervoice_obj_t* self, audioio_mixer_obj_t *parent); void common_hal_audioio_mixervoice_set_parent(audioio_mixervoice_obj_t* self, audioio_mixer_obj_t *parent);
void common_hal_audioio_mixervoice_play(audioio_mixervoice_obj_t* self, mp_obj_t sample, bool loop); void common_hal_audioio_mixervoice_play(audioio_mixervoice_obj_t* self, mp_obj_t sample, bool loop);
void common_hal_audioio_mixervoice_stop(audioio_mixervoice_obj_t* self); void common_hal_audioio_mixervoice_stop(audioio_mixervoice_obj_t* self);
void common_hal_audioio_mixervoice_set_gain(audioio_mixervoice_obj_t* self, float gain); void common_hal_audioio_mixervoice_set_level(audioio_mixervoice_obj_t* self, float gain);
bool common_hal_audioio_mixervoice_get_playing(audioio_mixervoice_obj_t* self); bool common_hal_audioio_mixervoice_get_playing(audioio_mixervoice_obj_t* self);

10
shared-module/audioio/Mixer.c
View File

@ -309,19 +309,19 @@ audioio_get_buffer_result_t audioio_mixer_get_buffer(audioio_mixer_obj_t* self,
sample_value = voice->remaining_buffer[j]; sample_value = voice->remaining_buffer[j];
} }
// apply the mixer gain // apply the mixer level
if (!self->samples_signed) { if (!self->samples_signed) {
if (self->bits_per_sample == 8) { if (self->bits_per_sample == 8) {
sample_value = mult8unsigned(sample_value, voice->gain); sample_value = mult8unsigned(sample_value, voice->level);
} else { } else {
sample_value = mult16unsigned(sample_value, voice->gain); sample_value = mult16unsigned(sample_value, voice->level);
} }
} }
else{ else{
if (self->bits_per_sample == 8) { if (self->bits_per_sample == 8) {
sample_value = mult8signed(sample_value, voice->gain); sample_value = mult8signed(sample_value, voice->level);
} else { } else {
sample_value = mult16signed(sample_value, voice->gain); sample_value = mult16signed(sample_value, voice->level);
} }
} }

4
shared-module/audioio/MixerVoice.c
View File

@ -18,8 +18,8 @@ void common_hal_audioio_mixervoice_set_parent(audioio_mixervoice_obj_t* self, au
self->parent = parent; self->parent = parent;
} }
void common_hal_audioio_mixervoice_set_gain(audioio_mixervoice_obj_t* self, float gain) { void common_hal_audioio_mixervoice_set_level(audioio_mixervoice_obj_t* self, float level) {
self->gain = gain * ((1 << 15)-1); self->level = level * ((1 << 15)-1);
} }
void common_hal_audioio_mixervoice_play(audioio_mixervoice_obj_t* self, mp_obj_t sample, bool loop) { void common_hal_audioio_mixervoice_play(audioio_mixervoice_obj_t* self, mp_obj_t sample, bool loop) {

2
shared-module/audioio/MixerVoice.h
View File

@ -21,7 +21,7 @@ typedef struct {
bool more_data; bool more_data;
uint32_t* remaining_buffer; uint32_t* remaining_buffer;
uint32_t buffer_length; uint32_t buffer_length;
int16_t gain; int16_t level;
} audioio_mixervoice_obj_t; } audioio_mixervoice_obj_t;