From 7d48aa7dc60e7895246c8801af63588794c6fc63 Mon Sep 17 00:00:00 2001 From: jpeeler Date: Tue, 7 Dec 2010 22:59:30 +0000 Subject: Merged revisions 297824 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r297824 | jpeeler | 2010-12-07 16:58:54 -0600 (Tue, 07 Dec 2010) | 19 lines Merged revisions 297823 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r297823 | jpeeler | 2010-12-07 16:57:48 -0600 (Tue, 07 Dec 2010) | 12 lines Revert code that changed SSRC for DTMF. Some previous behavior was attempted to be restored, but mistakingly I did not realize that the previous behavior was incorrect. This fixes DTMF not being detected since DTMF shouldn't cause the SSRC to change. (related to issue #17404) (closes issue #18189) (closes issue #18352) Reported by: marcbou Tested by: cmbaker82 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@297825 f38db490-d61c-443f-a65b-d21fe96a405b --- main/channel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/channel.c b/main/channel.c index e6eb214ce..0e5b72308 100644 --- a/main/channel.c +++ b/main/channel.c @@ -7094,8 +7094,8 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha manager_bridge_event(1, 1, c0, c1); /* Before we enter in and bridge these two together tell them both the source of audio has changed */ - ast_indicate(c0, AST_CONTROL_SRCCHANGE); - ast_indicate(c1, AST_CONTROL_SRCCHANGE); + ast_indicate(c0, AST_CONTROL_SRCUPDATE); + ast_indicate(c1, AST_CONTROL_SRCUPDATE); for (/* ever */;;) { struct timeval now = { 0, }; -- cgit v1.2.3