diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-09-07 20:08:07 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-09-07 20:11:11 +0200 |
| commit | 41a0dc1e9987ae00b605fd88bf887becbdf097d5 (patch) | |
| tree | 011f70ad38085eb3813c93658d60e2b70dc06c66 /src/pulse | |
| parent | d000dd6f4b976894558613f69bdad2974cce7d1e (diff) | |
volume: if pa_cvolume_set_{balance|fade}() is called with invalid fade/balance value log, but don't assert
Diffstat (limited to 'src/pulse')
| -rw-r--r-- | src/pulse/volume.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/pulse/volume.c b/src/pulse/volume.c index 8a28b334..47bccad2 100644 --- a/src/pulse/volume.c +++ b/src/pulse/volume.c @@ -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; |