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

@@ -1010,10 +1010,7 @@ static int app_exec(struct ast_channel *chan, void *data)
goto outrun;
if (ast_waitstream(chan, "") < 0)
goto outrun;
if (!strcmp(targs.mohclass, ""))
ast_moh_start(chan, NULL);
else
ast_moh_start(chan, targs.mohclass);
ast_moh_start(chan, S_OR(targs.mohclass, NULL), NULL);
targs.status = 0;