kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 316644 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r316644 | dvossel | 2011-05-04 09:23:39 -0500 (Wed, 04 May 2011) | 9 lines
  
  Fixes one-way-audio when chanspy activated with the 'o' option
  
  (closes issue #18382)
  Reported by: jkister
  Patches: 
        0001-Bugfix-18382-one-way-audio-when-chanspy-activated.patch.txt uploaded by malin (license )
  Tested by: firstsip, Greenlightcrm, malin, wdoekes, boroda, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@316650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2011-05-04 14:25:03 +00:00
parent e389fab7dd
commit eaf8673a16
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_chanspy.c
View File

@@ -404,6 +404,7 @@ struct chanspy_translation_helper {
struct ast_audiohook bridge_whisper_audiohook; struct ast_audiohook bridge_whisper_audiohook;
int fd; int fd;
int volfactor; int volfactor;
struct ast_flags flags;
}; };
struct spy_dtmf_options { struct spy_dtmf_options {
@@ -435,7 +436,7 @@ static int spy_generate(struct ast_channel *chan, void *data, int len, int sampl
return -1; return -1;
} }
if (ast_test_flag(&csth->spy_audiohook, OPTION_READONLY)) { if (ast_test_flag(&csth->flags, OPTION_READONLY)) {
/* Option 'o' was set, so don't mix channel audio */ /* Option 'o' was set, so don't mix channel audio */
f = ast_audiohook_read_frame(&csth->spy_audiohook, samples, AST_AUDIOHOOK_DIRECTION_READ, AST_FORMAT_SLINEAR); f = ast_audiohook_read_frame(&csth->spy_audiohook, samples, AST_AUDIOHOOK_DIRECTION_READ, AST_FORMAT_SLINEAR);
} else { } else {
@@ -536,7 +537,7 @@ static int channel_spy(struct ast_channel *chan, struct ast_autochan *spyee_auto
spyer_name, name); spyer_name, name);
memset(&csth, 0, sizeof(csth)); memset(&csth, 0, sizeof(csth));
ast_copy_flags(&csth.spy_audiohook, flags, AST_FLAGS_ALL); ast_copy_flags(&csth.flags, flags, AST_FLAGS_ALL);
ast_audiohook_init(&csth.spy_audiohook, AST_AUDIOHOOK_TYPE_SPY, "ChanSpy"); ast_audiohook_init(&csth.spy_audiohook, AST_AUDIOHOOK_TYPE_SPY, "ChanSpy");