summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-09-07 20:00:58 +0200
committerLennart Poettering <lennart@poettering.net>2009-09-07 20:11:08 +0200
commitd000dd6f4b976894558613f69bdad2974cce7d1e (patch)
tree881f830e467c48124ee403971b707bede3e35afa /src
parent9755bfa58af0c27b478d5d8cc56013527a6f660b (diff)
volume: when passing NULL as channel map to pa_cvolume_scale_mask() handle this the same way as pa_cvolume_scale()
Diffstat (limited to 'src')
-rw-r--r--src/pulse/volume.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pulse/volume.c b/src/pulse/volume.c
index 1b26cc78..8a28b334 100644
--- a/src/pulse/volume.c
+++ b/src/pulse/volume.c
@@ -707,7 +707,11 @@ pa_cvolume* pa_cvolume_scale_mask(pa_cvolume *v, pa_volume_t max, pa_channel_map
pa_assert(v);
- pa_return_val_if_fail(max != (pa_volume_t) -1, NULL);
+ pa_return_val_if_fail(max != PA_VOLUME_INVALID, NULL);
+
+ if (!cm)
+ return pa_cvolume_scale(v, max);
+
pa_return_val_if_fail(pa_cvolume_compatible_with_channel_map(v, cm), NULL);
t = pa_cvolume_max_mask(v, cm, mask);