diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-02 14:14:51 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-02 14:14:51 +0000 |
| commit | 5bc9b7707d74548869551c562fde74c2e840b7af (patch) | |
| tree | fa7b6ed774c863692627bd61f9388f3f9592b5f0 | |
| parent | b8b9ab767eecf065800d5921c3ce22f906b97941 (diff) | |
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)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@179293 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/audiohook.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/audiohook.c b/main/audiohook.c index 2b0beac01..8156d0ff3 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; } |