[asterisk-commits] jpeeler: branch 1.6.2 r297824 - in /branches/1.6.2: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Dec  7 16:58:54 2010
New Revision: 297824

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=297824
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/channel.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/channel.c?view=diff&rev=297824&r1=297823&r2=297824
==============================================================================
--- branches/1.6.2/main/channel.c (original)
+++ branches/1.6.2/main/channel.c Tue Dec  7 16:58:54 2010
@@ -5449,8 +5449,8 @@
 	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, };