From 6d9eb7a7276411519be90f0dcab73a14c674c9d5 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Thu, 15 Oct 2009 15:58:10 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@224180 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_chanspy.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 0932a842d1..93e433ce97 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); -- 2.47.3