diff options
Diffstat (limited to 'shared-module')
| -rw-r--r-- | shared-module/audioio/Mixer.c | 10 | ||||
| -rw-r--r-- | shared-module/audioio/MixerVoice.c | 4 | ||||
| -rw-r--r-- | shared-module/audioio/MixerVoice.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/shared-module/audioio/Mixer.c b/shared-module/audioio/Mixer.c index ea53140ab..dc92ce1da 100644 --- a/shared-module/audioio/Mixer.c +++ b/shared-module/audioio/Mixer.c @@ -309,19 +309,19 @@ audioio_get_buffer_result_t audioio_mixer_get_buffer(audioio_mixer_obj_t* self, sample_value = voice->remaining_buffer[j]; } - // apply the mixer gain + // apply the mixer level if (!self->samples_signed) { if (self->bits_per_sample == 8) { - sample_value = mult8unsigned(sample_value, voice->gain); + sample_value = mult8unsigned(sample_value, voice->level); } else { - sample_value = mult16unsigned(sample_value, voice->gain); + sample_value = mult16unsigned(sample_value, voice->level); } } else{ if (self->bits_per_sample == 8) { - sample_value = mult8signed(sample_value, voice->gain); + sample_value = mult8signed(sample_value, voice->level); } else { - sample_value = mult16signed(sample_value, voice->gain); + sample_value = mult16signed(sample_value, voice->level); } } diff --git a/shared-module/audioio/MixerVoice.c b/shared-module/audioio/MixerVoice.c index 3579d500f..024460af1 100644 --- a/shared-module/audioio/MixerVoice.c +++ b/shared-module/audioio/MixerVoice.c @@ -18,8 +18,8 @@ void common_hal_audioio_mixervoice_set_parent(audioio_mixervoice_obj_t* self, au self->parent = parent; } -void common_hal_audioio_mixervoice_set_gain(audioio_mixervoice_obj_t* self, float gain) { - self->gain = gain * ((1 << 15)-1); +void common_hal_audioio_mixervoice_set_level(audioio_mixervoice_obj_t* self, float level) { + self->level = level * ((1 << 15)-1); } void common_hal_audioio_mixervoice_play(audioio_mixervoice_obj_t* self, mp_obj_t sample, bool loop) { diff --git a/shared-module/audioio/MixerVoice.h b/shared-module/audioio/MixerVoice.h index 1cf686a38..2811a741a 100644 --- a/shared-module/audioio/MixerVoice.h +++ b/shared-module/audioio/MixerVoice.h @@ -21,7 +21,7 @@ typedef struct { bool more_data; uint32_t* remaining_buffer; uint32_t buffer_length; - int16_t gain; + int16_t level; } audioio_mixervoice_obj_t; |
