From 2c55b40a53eb537c7cda8cfdfdeacb644d775fd9 Mon Sep 17 00:00:00 2001 From: sommersoft Date: Sat, 24 Aug 2019 07:56:12 -0500 Subject: use a MixerVoice constructor --- shared-bindings/audiocore/MixerVoice.c | 7 ++++--- shared-bindings/audiocore/MixerVoice.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'shared-bindings') diff --git a/shared-bindings/audiocore/MixerVoice.c b/shared-bindings/audiocore/MixerVoice.c index 2711be00f..36b3c35fc 100644 --- a/shared-bindings/audiocore/MixerVoice.c +++ b/shared-bindings/audiocore/MixerVoice.c @@ -50,10 +50,11 @@ //| // TODO: support mono or stereo voices STATIC mp_obj_t audioio_mixervoice_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - 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->sample = NULL; - self->level = ((1 << 15)-1); + + common_hal_audioio_mixervoice_construct(self); + return MP_OBJ_FROM_PTR(self); } diff --git a/shared-bindings/audiocore/MixerVoice.h b/shared-bindings/audiocore/MixerVoice.h index b5e447058..5849ce252 100644 --- a/shared-bindings/audiocore/MixerVoice.h +++ b/shared-bindings/audiocore/MixerVoice.h @@ -35,6 +35,7 @@ extern const mp_obj_type_t audioio_mixer_type; extern const mp_obj_type_t audioio_mixervoice_type; +void common_hal_audioio_mixervoice_construct(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_play(audioio_mixervoice_obj_t* self, mp_obj_t sample, bool loop); void common_hal_audioio_mixervoice_stop(audioio_mixervoice_obj_t* self); -- cgit v1.2.3