From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 7 Sep 2009 18:08:07 +0000 (+0200)
Subject: volume: if pa_cvolume_set_{balance|fade}() is called with invalid fade/balance value... 
X-Git-Tag: submit/2.0-panda/20130828.192557~1369
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41a0dc1e9987ae00b605fd88bf887becbdf097d5;p=profile%2Fivi%2Fpulseaudio-panda.git

volume: if pa_cvolume_set_{balance|fade}() is called with invalid fade/balance value log, but don't assert
---

diff --git a/src/pulse/volume.c b/src/pulse/volume.c
index 8a28b33..47bccad 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;