Merge pull request #10804 from jepler/issue10066

audio: Tidy code

Author: dhalbert

shared-bindings/audiodelays/Chorus.h

@@ -18,10 +18,6 @@ void common_hal_audiodelays_chorus_construct(audiodelays_chorus_obj_t *self, uin
 void common_hal_audiodelays_chorus_deinit(audiodelays_chorus_obj_t *self);
 bool common_hal_audiodelays_chorus_deinited(audiodelays_chorus_obj_t *self);
 
-uint32_t common_hal_audiodelays_chorus_get_sample_rate(audiodelays_chorus_obj_t *self);
-uint8_t common_hal_audiodelays_chorus_get_channel_count(audiodelays_chorus_obj_t *self);
-uint8_t common_hal_audiodelays_chorus_get_bits_per_sample(audiodelays_chorus_obj_t *self);
-
 mp_obj_t common_hal_audiodelays_chorus_get_delay_ms(audiodelays_chorus_obj_t *self);
 void common_hal_audiodelays_chorus_set_delay_ms(audiodelays_chorus_obj_t *self, mp_obj_t delay_ms);
 

shared-bindings/audiofreeverb/Freeverb.h

@@ -18,10 +18,6 @@ void common_hal_audiofreeverb_freeverb_construct(audiofreeverb_freeverb_obj_t *s
 void common_hal_audiofreeverb_freeverb_deinit(audiofreeverb_freeverb_obj_t *self);
 bool common_hal_audiofreeverb_freeverb_deinited(audiofreeverb_freeverb_obj_t *self);
 
-uint32_t common_hal_audiofreeverb_freeverb_get_sample_rate(audiofreeverb_freeverb_obj_t *self);
-uint8_t common_hal_audiofreeverb_freeverb_get_channel_count(audiofreeverb_freeverb_obj_t *self);
-uint8_t common_hal_audiofreeverb_freeverb_get_bits_per_sample(audiofreeverb_freeverb_obj_t *self);
-
 mp_obj_t common_hal_audiofreeverb_freeverb_get_roomsize(audiofreeverb_freeverb_obj_t *self);
 void common_hal_audiofreeverb_freeverb_set_roomsize(audiofreeverb_freeverb_obj_t *self, mp_obj_t feedback);
 

shared-module/audiodelays/Chorus.c

@@ -4,6 +4,7 @@
 //
 // SPDX-License-Identifier: MIT
 #include "shared-bindings/audiodelays/Chorus.h"
+#include "shared-bindings/audiocore/__init__.h"
 
 #include <stdint.h>
 #include <math.h>
@@ -104,9 +105,7 @@ bool common_hal_audiodelays_chorus_deinited(audiodelays_chorus_obj_t *self) {
 }
 
 void common_hal_audiodelays_chorus_deinit(audiodelays_chorus_obj_t *self) {
-    if (common_hal_audiodelays_chorus_deinited(self)) {
-        return;
-    }
+    audiosample_mark_deinit(&self->base);
     self->chorus_buffer = NULL;
     self->buffer[0] = NULL;
     self->buffer[1] = NULL;

shared-module/audiofreeverb/Freeverb.c

@@ -8,6 +8,7 @@
 // Fixed point ideas from - Paul Stoffregen in the Teensy audio library https://github.com/PaulStoffregen/Audio/blob/master/effect_freeverb.cpp
 //
 #include "shared-bindings/audiofreeverb/Freeverb.h"
+#include "shared-bindings/audiocore/__init__.h"
 #include "shared-module/synthio/__init__.h"
 
 #include <stdint.h>
@@ -124,9 +125,7 @@ bool common_hal_audiofreeverb_freeverb_deinited(audiofreeverb_freeverb_obj_t *se
 }
 
 void common_hal_audiofreeverb_freeverb_deinit(audiofreeverb_freeverb_obj_t *self) {
-    if (common_hal_audiofreeverb_freeverb_deinited(self)) {
-        return;
-    }
+    audiosample_mark_deinit(&self->base);
     self->buffer[0] = NULL;
     self->buffer[1] = NULL;
 }