diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-07-19 20:44:39 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-07-19 20:44:39 +0000 |
| commit | 6d0742fc1657017a3e69558b6192399b2f8469e6 (patch) | |
| tree | 3c36781db3a5a7a08967cbe8d83acb5d82e581cb /apps/app_queue.c | |
| parent | 54e1f06c463bf72fa730f9be042d62f4ee2c4593 (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: https://origsvn.digium.com/svn/asterisk/trunk@37988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_queue.c')
| -rw-r--r-- | apps/app_queue.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index b9b578df1..84583250a 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -761,7 +761,8 @@ static void queue_set_param(struct call_queue *q, const char *param, const char char *c, *lastc; char buff[80]; - if (!strcasecmp(param, "music") || !strcasecmp(param, "musiconhold")) { + if (!strcasecmp(param, "musicclass") || + !strcasecmp(param, "music") || !strcasecmp(param, "musiconhold")) { ast_copy_string(q->moh, val, sizeof(q->moh)); } else if (!strcasecmp(param, "announce")) { ast_copy_string(q->announce, val, sizeof(q->announce)); @@ -1343,7 +1344,7 @@ playout: /* Don't restart music on hold if we're about to exit the caller from the queue */ if (!res) - ast_moh_start(qe->chan, qe->moh); + ast_moh_start(qe->chan, qe->moh, NULL); return res; } @@ -1782,7 +1783,7 @@ static int say_periodic_announcement(struct queue_ent *qe) /* Resume Music on Hold if the caller is going to stay in the queue */ if (!res) - ast_moh_start(qe->chan, qe->moh); + ast_moh_start(qe->chan, qe->moh, NULL); /* update last_periodic_announce_time */ qe->last_periodic_announce_time = now; @@ -3311,7 +3312,7 @@ check_turns: if (ringing) { ast_indicate(chan, AST_CONTROL_RINGING); } else { - ast_moh_start(chan, qe.moh); + ast_moh_start(chan, qe.moh, NULL); } for (;;) { /* This is the wait loop for callers 2 through maxlen */ |