diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-19 20:44:39 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-19 20:44:39 +0000 |
| commit | 6049bb6539153c2f400f1f2dbc763c74d796204b (patch) | |
| tree | 3c36781db3a5a7a08967cbe8d83acb5d82e581cb /apps/app_dial.c | |
| parent | 28df168d0f9fd12f5914263015dc26898e834146 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@37988 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index f2834885d..24fe9b7e0 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1214,8 +1214,8 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags /* Our status will at least be NOANSWER */ strcpy(status, "NOANSWER"); if (ast_test_flag(outgoing, OPT_MUSICBACK)) { - moh=1; - ast_moh_start(chan, opt_args[OPT_ARG_MUSICBACK]); + moh = 1; + ast_moh_start(chan, opt_args[OPT_ARG_MUSICBACK], NULL); } else if (ast_test_flag(outgoing, OPT_RINGBACK)) { ast_indicate(chan, AST_CONTROL_RINGING); sentringing++; @@ -1273,7 +1273,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags if (ast_test_flag(&opts, OPT_MUSICBACK) && !ast_strlen_zero(opt_args[OPT_ARG_MUSICBACK])) { ast_indicate(chan, -1); - ast_moh_start(chan, opt_args[OPT_ARG_MUSICBACK]); + ast_moh_start(chan, opt_args[OPT_ARG_MUSICBACK], NULL); } else if (ast_test_flag(&opts, OPT_RINGBACK)) { ast_indicate(chan, AST_CONTROL_RINGING); sentringing++; @@ -1701,7 +1701,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data) res = ast_waitstream(chan, AST_DIGIT_ANY); if (!res && sleep) { if (!ast_test_flag(chan, AST_FLAG_MOH)) - ast_moh_start(chan, NULL); + ast_moh_start(chan, NULL, NULL); res = ast_waitfordigit(chan, sleep); } } else { @@ -1709,7 +1709,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data) res = ast_waitstream(chan, ""); if (sleep) { if (!ast_test_flag(chan, AST_FLAG_MOH)) - ast_moh_start(chan, NULL); + ast_moh_start(chan, NULL, NULL); if (!res) res = ast_waitfordigit(chan, sleep); } |