DM: mixer voice object skeleton

2 files changed, 5 insertions, 5 deletions

diff --git a/shared-module/audioio/Mixer.c b/shared-module/audioio/Mixer.c
index a6ce1937b..5125574ef 100644
--- a/shared-module/audioio/Mixer.c
+++ b/shared-module/audioio/Mixer.c
@@ -100,7 +100,7 @@ void common_hal_audioio_mixer_play(audioio_mixer_obj_t* self, mp_obj_t sample, u
     if (samples_signed != self->samples_signed) {
         mp_raise_ValueError(translate("The sample's signedness does not match the mixer's"));
     }
-    audioio_mixer_voice_t* voice = &self->voice[v];
+    audioio_mixer_voice_obj_t* voice = &self->voice[v];
     voice->sample = sample;
     voice->loop = loop;
 
@@ -133,7 +133,7 @@ void audioio_mixer_reset_buffer(audioio_mixer_obj_t* self,
 }
 
 void common_hal_audioio_mixer_set_gain(audioio_mixer_obj_t* self, uint8_t voice, float gain) {
-	audioio_mixer_voice_t* v = &self->voice[voice];
+	audioio_mixer_voice_obj_t* v = &self->voice[voice];
 	v->gain = gain * ((1 << 15)-1);
 }
 
@@ -311,7 +311,7 @@ audioio_get_buffer_result_t audioio_mixer_get_buffer(audioio_mixer_obj_t* self,
         self->use_first_buffer = !self->use_first_buffer;
         bool voices_active = false;
         for (int32_t v = 0; v < self->voice_count; v++) {
-            audioio_mixer_voice_t* voice = &self->voice[v];
+            audioio_mixer_voice_obj_t* voice = &self->voice[v];
 
             uint32_t j = 0;
             bool voice_done = voice->sample == NULL;
diff --git a/shared-module/audioio/Mixer.h b/shared-module/audioio/Mixer.h
index a48793a8f..3451aa25d 100644
--- a/shared-module/audioio/Mixer.h
+++ b/shared-module/audioio/Mixer.h
@@ -38,7 +38,7 @@ typedef struct {
     uint32_t* remaining_buffer;
     uint32_t buffer_length;
     int16_t gain;
-} audioio_mixer_voice_t;
+} audioio_mixer_voice_obj_t;
 
 typedef struct {
     mp_obj_base_t base;
@@ -56,7 +56,7 @@ typedef struct {
     uint32_t right_read_count;
 
     uint8_t voice_count;
-    audioio_mixer_voice_t voice[];
+    audioio_mixer_voice_obj_t voice[];
 } audioio_mixer_obj_t;