diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-14 19:21:31 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-14 19:21:31 +0000 |
| commit | 07da3730d463bda199582531a70b621fba52cf7e (patch) | |
| tree | 238d4842e17b05af937a0b6be72166904e33632a /channels/chan_alsa.c | |
| parent | d185cf49286aaf5940c1d70b9d00768207934990 (diff) | |
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.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@64322 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_alsa.c')
| -rw-r--r-- | channels/chan_alsa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index aa444c5db..feed79e04 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -758,6 +758,7 @@ static int alsa_indicate(struct ast_channel *chan, int cond, const void *data, s res = 2; break; case AST_CONTROL_RINGING: + case AST_CONTROL_PROGRESS: break; case -1: res = -1; |