pcm_format: pass struct pcm_dither_24 to pcm_convert_to_16()

src/pcm_format.c

@@ -17,7 +17,7 @@
  */
 
 #include "pcm_format.h"
-#include "pcm_utils.h"
+#include "pcm_dither.h"
 
 #include <glib.h>
 
@@ -40,7 +40,7 @@ pcm_convert_24_to_16(struct pcm_dither_24 *dither,
 }
 
 const int16_t *
-pcm_convert_to_16(struct pcm_convert_state *convert,
+pcm_convert_to_16(struct pcm_dither_24 *dither,
 		  uint8_t bits, const void *src,
 		  size_t src_size, size_t *dest_size_r)
 {
@@ -74,7 +74,7 @@ pcm_convert_to_16(struct pcm_convert_state *convert,
 			buf = g_realloc(buf, len);
 		}
 
-		pcm_convert_24_to_16(&convert->dither,
+		pcm_convert_24_to_16(dither,
 				     (int16_t *)buf,
 				     (const int32_t *)src,
 				     num_samples);

src/pcm_format.h

@@ -22,10 +22,10 @@
 #include <stdint.h>
 #include <stddef.h>
 
-struct pcm_convert_state;
+struct pcm_dither_24;
 
 const int16_t *
-pcm_convert_to_16(struct pcm_convert_state *convert,
+pcm_convert_to_16(struct pcm_dither_24 *dither,
 		  uint8_t bits, const void *src,
 		  size_t src_size, size_t *dest_size_r);
 

src/pcm_utils.c

@@ -51,7 +51,7 @@ pcm_convert_16(const struct audio_format *src_format,
 
 	assert(dest_format->bits == 16);
 
-	buf = pcm_convert_to_16(state, src_format->bits,
+	buf = pcm_convert_to_16(&state->dither, src_format->bits,
 				src_buffer, src_size, &len);
 	if (!buf)
 		g_error("pcm_convert_to_16() failed");