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_meetme.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_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 698995d19..6b5355ae7 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1407,7 +1407,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } } if (musiconhold == 0 && (confflags & CONFFLAG_MOH)) { - ast_moh_start(chan, NULL); + ast_moh_start(chan, NULL, NULL); musiconhold = 1; } else { ztc.confmode = ZT_CONF_CONF; @@ -1445,7 +1445,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c if ((confflags & CONFFLAG_MOH) && !(confflags & CONFFLAG_WAITMARKED)) { if (conf->users == 1) { if (musiconhold == 0) { - ast_moh_start(chan, NULL); + ast_moh_start(chan, NULL, NULL); musiconhold = 1; } } else { @@ -1749,7 +1749,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } } if (musiconhold) - ast_moh_start(chan, NULL); + ast_moh_start(chan, NULL, NULL); if (ioctl(fd, ZT_SETCONF, &ztc)) { ast_log(LOG_WARNING, "Error setting conference\n"); |