summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/source-output.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-10-07 22:44:43 +0200
committerLennart Poettering <lennart@poettering.net>2008-10-07 22:44:43 +0200
commitae83483cf01b3e690bbee430fab8b7f9ee1efda8 (patch)
treebb8a63553de8c706587ac30836f7555b66a098cb /src/pulsecore/source-output.c
parent72024cda54e8951cdf937b2dccdaa2cc2eb0231f (diff)
modernize a few checks
Diffstat (limited to 'src/pulsecore/source-output.c')
-rw-r--r--src/pulsecore/source-output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index d76f6e4e..6af78241 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -124,14 +124,14 @@ pa_source_output* pa_source_output_new(
pa_return_null_if_fail(pa_sample_spec_valid(&data->sample_spec));
if (!data->channel_map_is_set) {
- if (data->source->channel_map.channels == data->sample_spec.channels)
+ if (pa_channel_map_compatible(&data->source->channel_map, &data->sample_spec))
data->channel_map = data->source->channel_map;
else
pa_return_null_if_fail(pa_channel_map_init_auto(&data->channel_map, data->sample_spec.channels, PA_CHANNEL_MAP_DEFAULT));
}
pa_return_null_if_fail(pa_channel_map_valid(&data->channel_map));
- pa_return_null_if_fail(data->channel_map.channels == data->sample_spec.channels);
+ pa_return_null_if_fail(pa_channel_map_compatible(&data->channel_map, &data->sample_spec));
if (flags & PA_SOURCE_OUTPUT_FIX_FORMAT)
data->sample_spec.format = data->source->sample_spec.format;