summaryrefslogtreecommitdiffstats
path: root/src/pulsecore
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2011-05-20 19:21:02 +0530
committerArun Raghavan <arun.raghavan@collabora.co.uk>2011-05-20 19:21:02 +0530
commit117c7145944fb227703d72dd2f03e88d439c187d (patch)
tree7398a2c44d446e028be5e3c9fccf65e1e5d03b5e /src/pulsecore
parentf4eccad1e64e1d494dbda30cccb86a848ceb1d1d (diff)
format: Fix channel map handling
Channel map handling in the extended API was broken. Thanks for Milos_SD for pointing this out on IRC.
Diffstat (limited to 'src/pulsecore')
-rw-r--r--src/pulsecore/sink-input.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 300b7286..f4f3258f 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -262,7 +262,8 @@ int pa_sink_input_new(
* to using the sample spec and channel map after all decisions w.r.t.
* routing are complete. */
pa_idxset *tmp = pa_idxset_new(NULL, NULL);
- pa_format_info *f = pa_format_info_from_sample_spec(&data->sample_spec, &data->channel_map);
+ pa_format_info *f = pa_format_info_from_sample_spec(&data->sample_spec,
+ data->channel_map_is_set ? &data->channel_map : NULL);
pa_idxset_put(tmp, f, NULL);
pa_sink_input_new_data_set_formats(data, tmp);
}