[asterisk-commits] russell: trunk r64322 - in /trunk: ./ channels/chan_alsa.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon May 14 14:21:31 2007
New Revision: 64322

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64322
Log:
Merged revisions 64306 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r64306 | russell | 2007-05-14 14:13:00 -0500 (Mon, 14 May 2007) | 3 lines

Properly handle AST_CONTROL_PROGRESS by just ignoring it.  An unknown indication
will trigger an error and cause sounds to stop, which in this case, is ringing.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_alsa.c

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

Modified: trunk/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_alsa.c?view=diff&rev=64322&r1=64321&r2=64322
==============================================================================
--- trunk/channels/chan_alsa.c (original)
+++ trunk/channels/chan_alsa.c Mon May 14 14:21:31 2007
@@ -758,6 +758,7 @@
 			res = 2;
 			break;
 		case AST_CONTROL_RINGING:
+		case AST_CONTROL_PROGRESS:
 			break;
 		case -1:
 			res = -1;