merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-07-19 20:44:39 +00:00
parent 54e1f06c46
commit 6d0742fc16
30 changed files with 572 additions and 398 deletions

View File

@@ -702,6 +702,16 @@ static int oh323_indicate(struct ast_channel *c, int condition, const void *data
if (token)
free(token);
return -1;
case AST_CONTROL_HOLD:
ast_moh_start(c, data, NULL);
if (token)
free(token);
return 0;
case AST_CONTROL_UNHOLD:
ast_moh_stop(c);
if (token)
free(token);
return 0;
case AST_CONTROL_PROCEEDING:
case -1:
if (token)