diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-15 15:58:10 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-15 15:58:10 +0000 |
| commit | f8c9e702380221ddad02930fd4546ab4c39bab92 (patch) | |
| tree | d2b618623bc24105142149837d20ab1a9472a3a5 /apps | |
| parent | e63d37b8a0d6c7aaa91761ee1d694ffd33cff532 (diff) | |
Merged revisions 224178 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r224178 | jpeeler | 2009-10-15 10:57:14 -0500 (Thu, 15 Oct 2009) | 11 lines
Readd removed ability to allow listening to one side of the call in app_chanspy
(Option o)
(closes issue #15675)
Reported by: john8675309
Patches:
issue15675patchtrunk.txt uploaded by dbrooks (license 790)
Tested by: jgutierrez on users list:
http://lists.digium.com/pipermail/asterisk-users/2009-October/239155.html
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@224180 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_chanspy.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 0932a842d..93e433ce9 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -253,7 +253,12 @@ static int spy_generate(struct ast_channel *chan, void *data, int len, int sampl return -1; } - f = ast_audiohook_read_frame(&csth->spy_audiohook, samples, AST_AUDIOHOOK_DIRECTION_BOTH, AST_FORMAT_SLINEAR); + if (ast_test_flag(chan, OPTION_READONLY)) { + /* 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); + } else { + f = ast_audiohook_read_frame(&csth->spy_audiohook, samples, AST_AUDIOHOOK_DIRECTION_BOTH, AST_FORMAT_SLINEAR); + } ast_audiohook_unlock(&csth->spy_audiohook); |