projects
/
profile
/
ivi
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9755bfa
)
volume: when passing NULL as channel map to pa_cvolume_scale_mask() handle this the...
author
Lennart Poettering
<lennart@poettering.net>
Mon, 7 Sep 2009 18:00:58 +0000
(20:00 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 7 Sep 2009 18:11:08 +0000
(20:11 +0200)
src/pulse/volume.c
patch
|
blob
|
history
diff --git
a/src/pulse/volume.c
b/src/pulse/volume.c
index
1b26cc7
..
8a28b33
100644
(file)
--- 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);