From 554c818d21acb66dbfdd477165f6a25f88c334f1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 3 Feb 2009 04:05:41 +0100 Subject: before applying balance/fade check it actually makes sense --- src/pulse/volume.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/pulse/volume.c') diff --git a/src/pulse/volume.c b/src/pulse/volume.c index ba2ee8fb..01a28e83 100644 --- a/src/pulse/volume.c +++ b/src/pulse/volume.c @@ -467,6 +467,9 @@ float pa_cvolume_get_balance(const pa_cvolume *v, const pa_channel_map *map) { pa_assert(map); pa_assert(map->channels == v->channels); + if (!pa_channel_map_can_balance(map)) + return 0.0f; + get_avg_lr(map, v, &left, &right); if (left == right) @@ -497,6 +500,9 @@ pa_cvolume* pa_cvolume_set_balance(pa_cvolume *v, const pa_channel_map *map, flo pa_assert(new_balance >= -1.0f); pa_assert(new_balance <= 1.0f); + if (!pa_channel_map_can_balance(map)) + return v; + get_avg_lr(map, v, &left, &right); m = PA_MAX(left, right); @@ -584,6 +590,9 @@ float pa_cvolume_get_fade(const pa_cvolume *v, const pa_channel_map *map) { pa_assert(map); pa_assert(map->channels == v->channels); + if (!pa_channel_map_can_fade(map)) + return 0.0f; + get_avg_fr(map, v, &front, &rear); if (front == rear) @@ -605,6 +614,9 @@ pa_cvolume* pa_cvolume_set_fade(pa_cvolume *v, const pa_channel_map *map, float pa_assert(new_fade >= -1.0f); pa_assert(new_fade <= 1.0f); + if (!pa_channel_map_can_fade(map)) + return v; + get_avg_fr(map, v, &front, &rear); m = PA_MAX(front, rear); -- cgit