mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-01 22:58:47 -04:00
volume: if pa_cvolume_set_{balance|fade}() is called with invalid fade/balance value log, but don't assert
This commit is contained in:
parent
d000dd6f4b
commit
41a0dc1e99
1 changed files with 4 additions and 8 deletions
|
|
@ -642,12 +642,10 @@ pa_cvolume* pa_cvolume_set_balance(pa_cvolume *v, const pa_channel_map *map, flo
|
|||
|
||||
pa_assert(map);
|
||||
pa_assert(v);
|
||||
pa_assert(new_balance >= -1.0f);
|
||||
pa_assert(new_balance <= 1.0f);
|
||||
|
||||
pa_return_val_if_fail(pa_cvolume_valid(v), NULL);
|
||||
pa_return_val_if_fail(pa_channel_map_valid(map), NULL);
|
||||
pa_return_val_if_fail(pa_cvolume_compatible_with_channel_map(v, map), NULL);
|
||||
pa_return_val_if_fail(new_balance >= -1.0f, NULL);
|
||||
pa_return_val_if_fail(new_balance <= 1.0f, NULL);
|
||||
|
||||
if (!pa_channel_map_can_balance(map))
|
||||
return v;
|
||||
|
|
@ -785,12 +783,10 @@ pa_cvolume* pa_cvolume_set_fade(pa_cvolume *v, const pa_channel_map *map, float
|
|||
|
||||
pa_assert(map);
|
||||
pa_assert(v);
|
||||
pa_assert(new_fade >= -1.0f);
|
||||
pa_assert(new_fade <= 1.0f);
|
||||
|
||||
pa_return_val_if_fail(pa_cvolume_valid(v), NULL);
|
||||
pa_return_val_if_fail(pa_channel_map_valid(map), NULL);
|
||||
pa_return_val_if_fail(pa_cvolume_compatible_with_channel_map(v, map), NULL);
|
||||
pa_return_val_if_fail(new_fade >= -1.0f, NULL);
|
||||
pa_return_val_if_fail(new_fade <= 1.0f, NULL);
|
||||
|
||||
if (!pa_channel_map_can_fade(map))
|
||||
return v;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue