From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 15 Oct 2009 15:57:49 +0000 (+0000)
Subject: Merged revisions 224178 via svnmerge from
X-Git-Tag: 1.6.0.18-rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7473efd6951a5b5c2007925c0319bb42a8b6bd8e;p=thirdparty%2Fasterisk.git

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.0@224179 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index dd69a8d3ba..baac4e7202 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -201,7 +201,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);