[svn-commits] file: branch 1.6.1 r179293 - in /branches/1.6.1: ./ main/audiohook.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Mar  2 08:14:51 2009
New Revision: 179293

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179293
Log:
Merged revisions 179291 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r179291 | file | 2009-03-02 10:13:45 -0400 (Mon, 02 Mar 2009) | 7 lines
  
  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)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/audiohook.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/audiohook.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/audiohook.c?view=diff&rev=179293&r1=179292&r2=179293
==============================================================================
--- branches/1.6.1/main/audiohook.c (original)
+++ branches/1.6.1/main/audiohook.c Mon Mar  2 08:14:51 2009
@@ -915,7 +915,8 @@
 	/* 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 @@
 	/* 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;
 	}