diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-10-09 13:28:00 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2018-10-09 13:28:00 -0700 |
| commit | 6da25c8893afedfc195327f597fd3b0b45fc65d8 (patch) | |
| tree | 2ae42ed8374e23984c6baf3f4aae13719082c330 /shared-module | |
| parent | 2b0356c61f71afccbf10a9dcd3ad331bb4b856dd (diff) | |
Rename stop to stop_voice in case we want stop to stop everything later.
Diffstat (limited to 'shared-module')
| -rw-r--r-- | shared-module/audioio/Mixer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/shared-module/audioio/Mixer.c b/shared-module/audioio/Mixer.c index 0709e2e42..8020a621e 100644 --- a/shared-module/audioio/Mixer.c +++ b/shared-module/audioio/Mixer.c @@ -110,7 +110,7 @@ void common_hal_audioio_mixer_play(audioio_mixer_obj_t* self, mp_obj_t sample, u voice->more_data = result == GET_BUFFER_MORE_DATA; } -void common_hal_audioio_mixer_stop(audioio_mixer_obj_t* self, uint8_t voice) { +void common_hal_audioio_mixer_stop_voice(audioio_mixer_obj_t* self, uint8_t voice) { self->voice[voice].sample = NULL; } @@ -131,8 +131,6 @@ void audioio_mixer_reset_buffer(audioio_mixer_obj_t* self, } } - #pragma GCC push_options - #pragma GCC optimize ("O0") uint32_t add8signed(uint32_t a, uint32_t b) { #if (defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)) return __QADD8(a, b); @@ -152,7 +150,6 @@ uint32_t add8signed(uint32_t a, uint32_t b) { return result; #endif } - #pragma GCC pop_options uint32_t add8unsigned(uint32_t a, uint32_t b) { #if (defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)) |