2 files changed, 12 insertions, 14 deletions
diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c
index 5590563..086498e 100644
--- a/src/mixer/mixer.c
+++ b/src/mixer/mixer.c
@@ -136,9 +136,9 @@ static void add_buffer_internal(struct camu_mixer *mixer, struct camu_audio_buff
 
 static void remove_buffer_internal(struct camu_mixer *mixer, struct camu_audio_buffer *buf)
 {
-    struct camu_audio_buffer *cbuf;
-    al_array_foreach(mixer->buffers, i, cbuf) {
-        if (cbuf == buf) {
+    struct camu_audio_buffer *rbuf;
+    al_array_foreach(mixer->buffers, i, rbuf) {
+        if (rbuf == buf) {
 #ifdef CAMU_MIXER_THREADED
             al_atomic_store(u8)(&buf->ref, 0, AL_ATOMIC_RELAXED);
 #endif
@@ -244,6 +244,14 @@ void camu_mixer_run_queue(struct camu_mixer *mixer)
     run_queue_internal(mixer);
     aki_mutex_unlock(&mixer->mutex);
 }
+
+void camu_mixer_clear(struct camu_mixer *mixer)
+{
+    struct camu_audio_buffer *buf;
+    al_array_foreach(mixer->buffers, i, buf) {
+        al_atomic_store(u8)(&buf->ref, 0, AL_ATOMIC_RELAXED);
+    }
+}
 #endif
 
 void camu_mixer_pause(struct camu_mixer *mixer)
@@ -279,16 +287,6 @@ void camu_mixer_resume(struct camu_mixer *mixer)
 #endif
 }
 
-void camu_mixer_clear(struct camu_mixer *mixer)
-{
-#ifdef CAMU_MIXER_THREADED
-    struct camu_audio_buffer *buf;
-    al_array_foreach(mixer->buffers, i, buf) {
-        al_atomic_store(u8)(&buf->ref, 0, AL_ATOMIC_RELAXED);
-    }
-#endif
-}
-
 void camu_mixer_close(struct camu_mixer *mixer)
 {
     al_array_free(mixer->buffers);
diff --git a/src/mixer/mixer.h b/src/mixer/mixer.h
index 356e2b1..a925e0c 100644
--- a/src/mixer/mixer.h
+++ b/src/mixer/mixer.h
@@ -39,8 +39,8 @@ void camu_mixer_add_buffer(struct camu_mixer *mixer, struct camu_audio_buffer *b
 void camu_mixer_remove_buffer(struct camu_mixer *mixer, struct camu_audio_buffer *buf);
 #ifdef CAMU_MIXER_THREADED
 void camu_mixer_run_queue(struct camu_mixer *mixer);
+void camu_mixer_clear(struct camu_mixer *mixer);
 #endif
 void camu_mixer_pause(struct camu_mixer *mixer);
 void camu_mixer_resume(struct camu_mixer *mixer);
-void camu_mixer_clear(struct camu_mixer *mixer);
 void camu_mixer_close(struct camu_mixer *mixer);