Add pa_channels_valid()

I think this makes the code a bit nicer to read and write. This also
reduces the chances of off-by-one errors when checking the bounds of
channel count values.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/pulse/sample.c b/src/pulse/sample.c
index 70f7f7243..82c1b01d4 100644
--- a/src/pulse/sample.c
+++ b/src/pulse/sample.c
@@ -111,12 +111,15 @@ int pa_sample_rate_valid(uint32_t rate) {
     return rate > 0 && rate <= PA_RATE_MAX;
 }
 
+int pa_channels_valid(uint8_t channels) {
+    return channels > 0 && channels <= PA_CHANNELS_MAX;
+}
+
 int pa_sample_spec_valid(const pa_sample_spec *spec) {
     pa_assert(spec);
 
     if (PA_UNLIKELY(!pa_sample_rate_valid(spec->rate) ||
-        spec->channels <= 0 ||
-        spec->channels > PA_CHANNELS_MAX ||
+        !pa_channels_valid(spec->channels) ||
         !pa_sample_format_valid(spec->format)))
         return 0;