pcm_{channels,resample}: pass channel count as integer, not uint8_t

Reduces number of implicit integer conversions.

7 files changed, 27 insertions, 27 deletions

diff --git a/src/pcm_channels.c b/src/pcm_channels.c
index 5e648f1a..31fab5e2 100644
--- a/src/pcm_channels.c
+++ b/src/pcm_channels.c
@@ -71,8 +71,8 @@ pcm_convert_channels_16_n_to_2(int16_t *dest,
 
 const int16_t *
 pcm_convert_channels_16(struct pcm_buffer *buffer,
-			uint8_t dest_channels,
-			uint8_t src_channels, const int16_t *src,
+			unsigned dest_channels,
+			unsigned src_channels, const int16_t *src,
 			size_t src_size, size_t *dest_size_r)
 {
 	assert(src_size % (sizeof(*src) * src_channels) == 0);
@@ -144,8 +144,8 @@ pcm_convert_channels_24_n_to_2(int32_t *dest,
 
 const int32_t *
 pcm_convert_channels_24(struct pcm_buffer *buffer,
-			uint8_t dest_channels,
-			uint8_t src_channels, const int32_t *src,
+			unsigned dest_channels,
+			unsigned src_channels, const int32_t *src,
 			size_t src_size, size_t *dest_size_r)
 {
 	assert(src_size % (sizeof(*src) * src_channels) == 0);
@@ -212,8 +212,8 @@ pcm_convert_channels_32_n_to_2(int32_t *dest,
 
 const int32_t *
 pcm_convert_channels_32(struct pcm_buffer *buffer,
-			uint8_t dest_channels,
-			uint8_t src_channels, const int32_t *src,
+			unsigned dest_channels,
+			unsigned src_channels, const int32_t *src,
 			size_t src_size, size_t *dest_size_r)
 {
 	assert(src_size % (sizeof(*src) * src_channels) == 0);
diff --git a/src/pcm_channels.h b/src/pcm_channels.h
index ee27697b..1e4a0991 100644
--- a/src/pcm_channels.h
+++ b/src/pcm_channels.h
@@ -38,8 +38,8 @@ struct pcm_buffer;
  */
 const int16_t *
 pcm_convert_channels_16(struct pcm_buffer *buffer,
-			uint8_t dest_channels,
-			uint8_t src_channels, const int16_t *src,
+			unsigned dest_channels,
+			unsigned src_channels, const int16_t *src,
 			size_t src_size, size_t *dest_size_r);
 
 /**
@@ -56,8 +56,8 @@ pcm_convert_channels_16(struct pcm_buffer *buffer,
  */
 const int32_t *
 pcm_convert_channels_24(struct pcm_buffer *buffer,
-			uint8_t dest_channels,
-			uint8_t src_channels, const int32_t *src,
+			unsigned dest_channels,
+			unsigned src_channels, const int32_t *src,
 			size_t src_size, size_t *dest_size_r);
 
 /**
@@ -73,8 +73,8 @@ pcm_convert_channels_24(struct pcm_buffer *buffer,
  */
 const int32_t *
 pcm_convert_channels_32(struct pcm_buffer *buffer,
-			uint8_t dest_channels,
-			uint8_t src_channels, const int32_t *src,
+			unsigned dest_channels,
+			unsigned src_channels, const int32_t *src,
 			size_t src_size, size_t *dest_size_r);
 
 #endif
diff --git a/src/pcm_resample.c b/src/pcm_resample.c
index d4b117c5..26f1431e 100644
--- a/src/pcm_resample.c
+++ b/src/pcm_resample.c
@@ -78,7 +78,7 @@ void pcm_resample_deinit(struct pcm_resample_state *state)
 
 const int16_t *
 pcm_resample_16(struct pcm_resample_state *state,
-		uint8_t channels,
+		unsigned channels,
 		unsigned src_rate, const int16_t *src_buffer, size_t src_size,
 		unsigned dest_rate, size_t *dest_size_r,
 		GError **error_r)
@@ -100,7 +100,7 @@ pcm_resample_16(struct pcm_resample_state *state,
 
 const int32_t *
 pcm_resample_32(struct pcm_resample_state *state,
-		uint8_t channels,
+		unsigned channels,
 		unsigned src_rate, const int32_t *src_buffer, size_t src_size,
 		unsigned dest_rate, size_t *dest_size_r,
 		GError **error_r)
diff --git a/src/pcm_resample.h b/src/pcm_resample.h
index 1c71124a..73f98ec0 100644
--- a/src/pcm_resample.h
+++ b/src/pcm_resample.h
@@ -45,7 +45,7 @@ struct pcm_resample_state {
 	struct {
 		unsigned src_rate;
 		unsigned dest_rate;
-		uint8_t channels;
+		unsigned channels;
 	} prev;
 
 	int error;
@@ -82,7 +82,7 @@ void pcm_resample_deinit(struct pcm_resample_state *state);
  */
 const int16_t *
 pcm_resample_16(struct pcm_resample_state *state,
-		uint8_t channels,
+		unsigned channels,
 		unsigned src_rate,
 		const int16_t *src_buffer, size_t src_size,
 		unsigned dest_rate, size_t *dest_size_r,
@@ -102,7 +102,7 @@ pcm_resample_16(struct pcm_resample_state *state,
  */
 const int32_t *
 pcm_resample_32(struct pcm_resample_state *state,
-		uint8_t channels,
+		unsigned channels,
 		unsigned src_rate,
 		const int32_t *src_buffer, size_t src_size,
 		unsigned dest_rate, size_t *dest_size_r,
@@ -122,7 +122,7 @@ pcm_resample_32(struct pcm_resample_state *state,
  */
 static inline const int32_t *
 pcm_resample_24(struct pcm_resample_state *state,
-		uint8_t channels,
+		unsigned channels,
 		unsigned src_rate,
 		const int32_t *src_buffer, size_t src_size,
 		unsigned dest_rate, size_t *dest_size_r,
diff --git a/src/pcm_resample_fallback.c b/src/pcm_resample_fallback.c
index b4d9d010..1d1dfdf5 100644
--- a/src/pcm_resample_fallback.c
+++ b/src/pcm_resample_fallback.c
@@ -37,7 +37,7 @@ pcm_resample_fallback_deinit(struct pcm_resample_state *state)
 /* resampling code blatantly ripped from ESD */
 const int16_t *
 pcm_resample_fallback_16(struct pcm_resample_state *state,
-			 uint8_t channels,
+			 unsigned channels,
 			 unsigned src_rate,
 			 const int16_t *src_buffer, size_t src_size,
 			 unsigned dest_rate,
@@ -78,7 +78,7 @@ pcm_resample_fallback_16(struct pcm_resample_state *state,
 
 const int32_t *
 pcm_resample_fallback_32(struct pcm_resample_state *state,
-			 uint8_t channels,
+			 unsigned channels,
 			 unsigned src_rate,
 			 const int32_t *src_buffer, size_t src_size,
 			 unsigned dest_rate,
diff --git a/src/pcm_resample_internal.h b/src/pcm_resample_internal.h
index ea75df34..e947eebf 100644
--- a/src/pcm_resample_internal.h
+++ b/src/pcm_resample_internal.h
@@ -43,7 +43,7 @@ pcm_resample_lsr_deinit(struct pcm_resample_state *state);
 
 const int16_t *
 pcm_resample_lsr_16(struct pcm_resample_state *state,
-		    uint8_t channels,
+		    unsigned channels,
 		    unsigned src_rate,
 		    const int16_t *src_buffer, size_t src_size,
 		    unsigned dest_rate, size_t *dest_size_r,
@@ -51,7 +51,7 @@ pcm_resample_lsr_16(struct pcm_resample_state *state,
 
 const int32_t *
 pcm_resample_lsr_32(struct pcm_resample_state *state,
-		    uint8_t channels,
+		    unsigned channels,
 		    unsigned src_rate,
 		    const int32_t *src_buffer,
 		    G_GNUC_UNUSED size_t src_size,
@@ -68,7 +68,7 @@ pcm_resample_fallback_deinit(struct pcm_resample_state *state);
 
 const int16_t *
 pcm_resample_fallback_16(struct pcm_resample_state *state,
-			 uint8_t channels,
+			 unsigned channels,
 			 unsigned src_rate,
 			 const int16_t *src_buffer, size_t src_size,
 			 unsigned dest_rate,
@@ -76,7 +76,7 @@ pcm_resample_fallback_16(struct pcm_resample_state *state,
 
 const int32_t *
 pcm_resample_fallback_32(struct pcm_resample_state *state,
-			 uint8_t channels,
+			 unsigned channels,
 			 unsigned src_rate,
 			 const int32_t *src_buffer,
 			 G_GNUC_UNUSED size_t src_size,
diff --git a/src/pcm_resample_libsamplerate.c b/src/pcm_resample_libsamplerate.c
index ccee76d0..88487437 100644
--- a/src/pcm_resample_libsamplerate.c
+++ b/src/pcm_resample_libsamplerate.c
@@ -106,7 +106,7 @@ pcm_resample_lsr_deinit(struct pcm_resample_state *state)
 
 static bool
 pcm_resample_set(struct pcm_resample_state *state,
-		 uint8_t channels, unsigned src_rate, unsigned dest_rate,
+		 unsigned channels, unsigned src_rate, unsigned dest_rate,
 		 GError **error_r)
 {
 	int error;
@@ -159,7 +159,7 @@ lsr_process(struct pcm_resample_state *state, GError **error_r)
 
 const int16_t *
 pcm_resample_lsr_16(struct pcm_resample_state *state,
-		    uint8_t channels,
+		    unsigned channels,
 		    unsigned src_rate,
 		    const int16_t *src_buffer, size_t src_size,
 		    unsigned dest_rate, size_t *dest_size_r,
@@ -223,7 +223,7 @@ src_float_to_int_array (const float *in, int *out, int len)
 
 const int32_t *
 pcm_resample_lsr_32(struct pcm_resample_state *state,
-		    uint8_t channels,
+		    unsigned channels,
 		    unsigned src_rate,
 		    const int32_t *src_buffer, size_t src_size,
 		    unsigned dest_rate, size_t *dest_size_r,