fix 'audiomixer_mixer_reset_buffer'

sommersoft · sommersoft · commit 7f64af38cbd7 · 2019-08-25T09:33:23.000-05:00
diff --git a/shared-module/audiomixer/Mixer.c b/shared-module/audiomixer/Mixer.c
@@ -77,7 +77,7 @@ uint32_t common_hal_audiomixer_mixer_get_sample_rate(audiomixer_mixer_obj_t* sel
 }
 
 bool common_hal_audiomixer_mixer_get_playing(audiomixer_mixer_obj_t* self) {
-    for (int32_t v = 0; v < self->voice_count; v++) {
+    for (uint8_t v = 0; v < self->voice_count; v++) {
         if (common_hal_audiomixer_mixervoice_get_playing(MP_OBJ_TO_PTR(self->voice[v]))) {
             return true;
         }
@@ -88,11 +88,9 @@ bool common_hal_audiomixer_mixer_get_playing(audiomixer_mixer_obj_t* self) {
 void audiomixer_mixer_reset_buffer(audiomixer_mixer_obj_t* self,
                                    bool single_channel,
                                    uint8_t channel) {
-#if 0
-    for (int32_t i = 0; i < self->voice_count; i++) {
-        self->voice[i].sample = NULL;
+    for (uint8_t i = 0; i < self->voice_count; i++) {
+        common_hal_audiomixer_mixervoice_stop(self->voice[i]);
     }
-#endif
 }
 
 uint32_t add8signed(uint32_t a, uint32_t b) {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ uint32_t common_hal_audiomixer_mixer_get_sample_rate(audiomixer_mixer_obj_t* sel`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`bool common_hal_audiomixer_mixer_get_playing(audiomixer_mixer_obj_t* self) {`
`80`		`- for (int32_t v = 0; v < self->voice_count; v++) {`
	`80`	`+ for (uint8_t v = 0; v < self->voice_count; v++) {`
`81`	`81`	`if (common_hal_audiomixer_mixervoice_get_playing(MP_OBJ_TO_PTR(self->voice[v]))) {`
`82`	`82`	`return true;`
`83`	`83`	`}`
`@@ -88,11 +88,9 @@ bool common_hal_audiomixer_mixer_get_playing(audiomixer_mixer_obj_t* self) {`
`88`	`88`	`void audiomixer_mixer_reset_buffer(audiomixer_mixer_obj_t* self,`
`89`	`89`	`bool single_channel,`
`90`	`90`	`uint8_t channel) {`
`91`		`-#if 0`
`92`		`- for (int32_t i = 0; i < self->voice_count; i++) {`
`93`		`- self->voice[i].sample = NULL;`
	`91`	`+ for (uint8_t i = 0; i < self->voice_count; i++) {`
	`92`	`+ common_hal_audiomixer_mixervoice_stop(self->voice[i]);`
`94`	`93`	`}`
`95`		`-#endif`
`96`	`94`	`}`
`97`	`95`
`98`	`96`	`uint32_t add8signed(uint32_t a, uint32_t b) {`