From: Joshua Colp <jcolp@digium.com>
Date: Mon, 2 Mar 2009 14:13:45 +0000 (+0000)
Subject: Fix issue where changing the volume of both directions of audio did not work.
X-Git-Tag: 1.6.2.0-beta1~110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93749ba001d55f463e32b08a6053b32ef64a30af;p=thirdparty%2Fasterisk.git

Fix issue where changing the volume of both directions of audio did not work.

(closes issue #14574)
Reported by: KNK
Patches:
      audiohook_volume_fix.diff uploaded by KNK (license 545)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@179291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/audiohook.c b/main/audiohook.c
index 2b0beac011..8156d0ff37 100644
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -915,7 +915,8 @@ int ast_audiohook_volume_set(struct ast_channel *chan, enum ast_audiohook_direct
 	/* Now based on the direction set the proper value */
 	if (direction == AST_AUDIOHOOK_DIRECTION_READ || direction == AST_AUDIOHOOK_DIRECTION_BOTH) {
 		audiohook_volume->read_adjustment = volume;
-	} else if (direction == AST_AUDIOHOOK_DIRECTION_WRITE || direction == AST_AUDIOHOOK_DIRECTION_BOTH) {
+	}
+	if (direction == AST_AUDIOHOOK_DIRECTION_WRITE || direction == AST_AUDIOHOOK_DIRECTION_BOTH) {
 		audiohook_volume->write_adjustment = volume;
 	}
 
@@ -965,7 +966,8 @@ int ast_audiohook_volume_adjust(struct ast_channel *chan, enum ast_audiohook_dir
 	/* Based on the direction change the specific adjustment value */
 	if (direction == AST_AUDIOHOOK_DIRECTION_READ || direction == AST_AUDIOHOOK_DIRECTION_BOTH) {
 		audiohook_volume->read_adjustment += volume;
-	} else if (direction == AST_AUDIOHOOK_DIRECTION_WRITE || direction == AST_AUDIOHOOK_DIRECTION_BOTH) {
+	}
+	if (direction == AST_AUDIOHOOK_DIRECTION_WRITE || direction == AST_AUDIOHOOK_DIRECTION_BOTH) {
 		audiohook_volume->write_adjustment += volume;
 	}