aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-07-22 19:12:04 +0200
committerMax Kellermann <max@duempel.org>2009-07-22 19:12:04 +0200
commit00ee3de7b260592a3c3a2109c019d87c662c0168 (patch)
treeed820fb982cadc3291a898da68767b2d4a99ee09
parent172a1dbdb9719cd71835d639f15fcac95e549915 (diff)
downloadmpd-00ee3de7b260592a3c3a2109c019d87c662c0168.tar.gz
mpd-00ee3de7b260592a3c3a2109c019d87c662c0168.tar.xz
mpd-00ee3de7b260592a3c3a2109c019d87c662c0168.zip
pcm_channels: num_channels is unsigned
You cannot have a negative number of channels, let's pass it as uint8_t instead of int8_t.
-rw-r--r--src/pcm_channels.c12
-rw-r--r--src/pcm_channels.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/src/pcm_channels.c b/src/pcm_channels.c
index 969ddff32..4f9343912 100644
--- a/src/pcm_channels.c
+++ b/src/pcm_channels.c
@@ -75,8 +75,8 @@ pcm_convert_channels_16_n_to_2(int16_t *dest,
const int16_t *
pcm_convert_channels_16(struct pcm_buffer *buffer,
- int8_t dest_channels,
- int8_t src_channels, const int16_t *src,
+ uint8_t dest_channels,
+ uint8_t src_channels, const int16_t *src,
size_t src_size, size_t *dest_size_r)
{
unsigned num_frames = src_size / src_channels / sizeof(*src);
@@ -149,8 +149,8 @@ pcm_convert_channels_24_n_to_2(int32_t *dest,
const int32_t *
pcm_convert_channels_24(struct pcm_buffer *buffer,
- int8_t dest_channels,
- int8_t src_channels, const int32_t *src,
+ uint8_t dest_channels,
+ uint8_t src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r)
{
unsigned num_frames = src_size / src_channels / sizeof(*src);
@@ -218,8 +218,8 @@ pcm_convert_channels_32_n_to_2(int32_t *dest,
const int32_t *
pcm_convert_channels_32(struct pcm_buffer *buffer,
- int8_t dest_channels,
- int8_t src_channels, const int32_t *src,
+ uint8_t dest_channels,
+ uint8_t src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r)
{
unsigned num_frames = src_size / src_channels / sizeof(*src);
diff --git a/src/pcm_channels.h b/src/pcm_channels.h
index accf4b07b..13b7ffbf3 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,
- int8_t dest_channels,
- int8_t src_channels, const int16_t *src,
+ uint8_t dest_channels,
+ uint8_t 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,
- int8_t dest_channels,
- int8_t src_channels, const int32_t *src,
+ uint8_t dest_channels,
+ uint8_t 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,
- int8_t dest_channels,
- int8_t src_channels, const int32_t *src,
+ uint8_t dest_channels,
+ uint8_t src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r);
#endif