Remove unnecessary deinited functions for audiosample objects.

relic-se · relic-se · commit 94a234fbc110 · 2025-02-18T20:38:44.000-06:00
diff --git a/shared-bindings/audiocore/RawSample.h b/shared-bindings/audiocore/RawSample.h
@@ -15,4 +15,3 @@ void common_hal_audioio_rawsample_construct(audioio_rawsample_obj_t *self,
     uint8_t channel_count, uint32_t sample_rate, bool single_buffer);
 
 void common_hal_audioio_rawsample_deinit(audioio_rawsample_obj_t *self);
-bool common_hal_audioio_rawsample_deinited(audioio_rawsample_obj_t *self);
diff --git a/shared-bindings/audiocore/WaveFile.h b/shared-bindings/audiocore/WaveFile.h
@@ -17,4 +17,3 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t *self,
     pyb_file_obj_t *file, uint8_t *buffer, size_t buffer_size);
 
 void common_hal_audioio_wavefile_deinit(audioio_wavefile_obj_t *self);
-bool common_hal_audioio_wavefile_deinited(audioio_wavefile_obj_t *self);
diff --git a/shared-bindings/audiodelays/Echo.h b/shared-bindings/audiodelays/Echo.h
@@ -16,7 +16,6 @@ void common_hal_audiodelays_echo_construct(audiodelays_echo_obj_t *self, uint32_
     uint8_t channel_count, uint32_t sample_rate, bool freq_shift);
 
 void common_hal_audiodelays_echo_deinit(audiodelays_echo_obj_t *self);
-bool common_hal_audiodelays_echo_deinited(audiodelays_echo_obj_t *self);
 
 mp_obj_t common_hal_audiodelays_echo_get_delay_ms(audiodelays_echo_obj_t *self);
 void common_hal_audiodelays_echo_set_delay_ms(audiodelays_echo_obj_t *self, mp_obj_t delay_ms);
diff --git a/shared-bindings/audiodelays/PitchShift.h b/shared-bindings/audiodelays/PitchShift.h
@@ -16,7 +16,6 @@ void common_hal_audiodelays_pitch_shift_construct(audiodelays_pitch_shift_obj_t
     uint8_t channel_count, uint32_t sample_rate);
 
 void common_hal_audiodelays_pitch_shift_deinit(audiodelays_pitch_shift_obj_t *self);
-bool common_hal_audiodelays_pitch_shift_deinited(audiodelays_pitch_shift_obj_t *self);
 
 mp_obj_t common_hal_audiodelays_pitch_shift_get_semitones(audiodelays_pitch_shift_obj_t *self);
 void common_hal_audiodelays_pitch_shift_set_semitones(audiodelays_pitch_shift_obj_t *self, mp_obj_t semitones);
diff --git a/shared-bindings/audiofilters/Distortion.h b/shared-bindings/audiofilters/Distortion.h
@@ -18,7 +18,6 @@ void common_hal_audiofilters_distortion_construct(audiofilters_distortion_obj_t
     uint8_t channel_count, uint32_t sample_rate);
 
 void common_hal_audiofilters_distortion_deinit(audiofilters_distortion_obj_t *self);
-bool common_hal_audiofilters_distortion_deinited(audiofilters_distortion_obj_t *self);
 
 mp_obj_t common_hal_audiofilters_distortion_get_drive(audiofilters_distortion_obj_t *self);
 void common_hal_audiofilters_distortion_set_drive(audiofilters_distortion_obj_t *self, mp_obj_t arg);
diff --git a/shared-bindings/audiofilters/Filter.h b/shared-bindings/audiofilters/Filter.h
@@ -16,7 +16,6 @@ void common_hal_audiofilters_filter_construct(audiofilters_filter_obj_t *self,
     uint8_t channel_count, uint32_t sample_rate);
 
 void common_hal_audiofilters_filter_deinit(audiofilters_filter_obj_t *self);
-bool common_hal_audiofilters_filter_deinited(audiofilters_filter_obj_t *self);
 
 mp_obj_t common_hal_audiofilters_filter_get_filter(audiofilters_filter_obj_t *self);
 void common_hal_audiofilters_filter_set_filter(audiofilters_filter_obj_t *self, mp_obj_t arg);
diff --git a/shared-bindings/audiomixer/Mixer.h b/shared-bindings/audiomixer/Mixer.h
@@ -20,6 +20,5 @@ void common_hal_audiomixer_mixer_construct(audiomixer_mixer_obj_t *self,
     uint32_t sample_rate);
 
 void common_hal_audiomixer_mixer_deinit(audiomixer_mixer_obj_t *self);
-bool common_hal_audiomixer_mixer_deinited(audiomixer_mixer_obj_t *self);
 
 bool common_hal_audiomixer_mixer_get_playing(audiomixer_mixer_obj_t *self);
diff --git a/shared-module/audiodelays/Echo.c b/shared-module/audiodelays/Echo.c
@@ -105,17 +105,7 @@ void common_hal_audiodelays_echo_construct(audiodelays_echo_obj_t *self, uint32_
     self->echo_buffer_left_pos = self->echo_buffer_right_pos = 0;
 }
 
-bool common_hal_audiodelays_echo_deinited(audiodelays_echo_obj_t *self) {
-    if (self->echo_buffer == NULL) {
-        return true;
-    }
-    return false;
-}
-
 void common_hal_audiodelays_echo_deinit(audiodelays_echo_obj_t *self) {
-    if (common_hal_audiodelays_echo_deinited(self)) {
-        return;
-    }
     audiosample_mark_deinit(&self->base);
     self->echo_buffer = NULL;
     self->buffer[0] = NULL;
diff --git a/shared-module/audiodelays/PitchShift.c b/shared-module/audiodelays/PitchShift.c
@@ -95,17 +95,7 @@ void common_hal_audiodelays_pitch_shift_construct(audiodelays_pitch_shift_obj_t
     recalculate_rate(self, f_semitones);
 }
 
-bool common_hal_audiodelays_pitch_shift_deinited(audiodelays_pitch_shift_obj_t *self) {
-    if (self->window_buffer == NULL) {
-        return true;
-    }
-    return false;
-}
-
 void common_hal_audiodelays_pitch_shift_deinit(audiodelays_pitch_shift_obj_t *self) {
-    if (common_hal_audiodelays_pitch_shift_deinited(self)) {
-        return;
-    }
     audiosample_mark_deinit(&self->base);
     self->window_buffer = NULL;
     self->overlap_buffer = NULL;
diff --git a/shared-module/audiofilters/Distortion.c b/shared-module/audiofilters/Distortion.c
@@ -74,13 +74,6 @@ void common_hal_audiofilters_distortion_construct(audiofilters_distortion_obj_t
     self->soft_clip = soft_clip;
 }
 
-bool common_hal_audiofilters_distortion_deinited(audiofilters_distortion_obj_t *self) {
-    if (self->buffer[0] == NULL) {
-        return true;
-    }
-    return false;
-}
-
 void common_hal_audiofilters_distortion_deinit(audiofilters_distortion_obj_t *self) {
     audiosample_mark_deinit(&self->base);
     self->buffer[0] = NULL;
diff --git a/shared-module/audiofilters/Filter.c b/shared-module/audiofilters/Filter.c
@@ -57,17 +57,7 @@ void common_hal_audiofilters_filter_construct(audiofilters_filter_obj_t *self,
     synthio_block_assign_slot(mix, &self->mix, MP_QSTR_mix);
 }
 
-bool common_hal_audiofilters_filter_deinited(audiofilters_filter_obj_t *self) {
-    if (self->buffer[0] == NULL) {
-        return true;
-    }
-    return false;
-}
-
 void common_hal_audiofilters_filter_deinit(audiofilters_filter_obj_t *self) {
-    if (common_hal_audiofilters_filter_deinited(self)) {
-        return;
-    }
     audiosample_mark_deinit(&self->base);
     self->buffer[0] = NULL;
     self->buffer[1] = NULL;
diff --git a/shared-module/audiomixer/Mixer.c b/shared-module/audiomixer/Mixer.c
@@ -53,10 +53,6 @@ void common_hal_audiomixer_mixer_deinit(audiomixer_mixer_obj_t *self) {
     self->second_buffer = NULL;
 }
 
-bool common_hal_audiomixer_mixer_deinited(audiomixer_mixer_obj_t *self) {
-    return self->first_buffer == NULL;
-}
-
 bool common_hal_audiomixer_mixer_get_playing(audiomixer_mixer_obj_t *self) {
     for (uint8_t v = 0; v < self->voice_count; v++) {
         if (common_hal_audiomixer_mixervoice_get_playing(MP_OBJ_TO_PTR(self->voice[v]))) {

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,3 @@ void common_hal_audioio_rawsample_construct(audioio_rawsample_obj_t *self,`
`15`	`15`	`uint8_t channel_count, uint32_t sample_rate, bool single_buffer);`
`16`	`16`
`17`	`17`	`void common_hal_audioio_rawsample_deinit(audioio_rawsample_obj_t *self);`
`18`		`-bool common_hal_audioio_rawsample_deinited(audioio_rawsample_obj_t *self);`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,3 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t *self,`
`17`	`17`	`pyb_file_obj_t file, uint8_t buffer, size_t buffer_size);`
`18`	`18`
`19`	`19`	`void common_hal_audioio_wavefile_deinit(audioio_wavefile_obj_t *self);`
`20`		`-bool common_hal_audioio_wavefile_deinited(audioio_wavefile_obj_t *self);`