diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-08 20:32:02 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-08 20:32:02 +0000 |
commit | 8bd7fde45c2c7e56c3d28c417cf355473d7f1e41 (patch) | |
tree | d68d5628fdce389f212f881070852311c22e49b9 /apps/app_meetme.c | |
parent | b5fc57edf4e4b2f7e8b90da235c33edc87f0e7bb (diff) |
Merged revisions 217199 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r217199 | tilghman | 2009-09-08 15:28:41 -0500 (Tue, 08 Sep 2009) | 14 lines
Merged revisions 217156 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r217156 | tilghman | 2009-09-08 15:01:45 -0500 (Tue, 08 Sep 2009) | 7 lines
When MOH is playing on the channel, announcements sent through the conference are not heard.
(closes issue #14588)
Reported by: voipas
Patches:
20090716__issue14588__2.diff.txt uploaded by tilghman (license 14)
Tested by: lmadsen, twisted, tilghman
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@217213 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r-- | apps/app_meetme.c | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 45a15a45a..4b1ddf91c 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1644,7 +1644,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c int res; int retrydahdi; int origfd; - int musiconhold = 0; + int musiconhold = 0, mohtempstopped = 0; int firstpass = 0; int lastmarked = 0; int currentmarked = 0; @@ -1684,6 +1684,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c struct timeval nexteventts = { 0, }; int to; int setusercount = 0; + int confsilence = 0, totalsilence = 0; if (!(user = ast_calloc(1, sizeof(*user)))) return ret; @@ -2114,6 +2115,11 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c conf_flush(fd, chan); + if (!(dsp = ast_dsp_new())) { + ast_log(LOG_WARNING, "Unable to allocate DSP!\n"); + res = -1; + } + if (confflags & CONFFLAG_AGI) { /* Get name of AGI file to run from $(MEETME_AGI_BACKGROUND) or use default filename of conf-background.agi */ @@ -2150,10 +2156,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c x = 1; ast_channel_setoption(chan, AST_OPTION_TONE_VERIFY, &x, sizeof(char), 0); } - if (confflags & (CONFFLAG_OPTIMIZETALKER | CONFFLAG_MONITORTALKER) && !(dsp = ast_dsp_new())) { - ast_log(LOG_WARNING, "Unable to allocate DSP!\n"); - res = -1; - } for (;;) { int menu_was_active = 0; @@ -2467,8 +2469,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c ast_frame_adjust_volume(f, user->talk.actual); if (confflags & (CONFFLAG_OPTIMIZETALKER | CONFFLAG_MONITORTALKER)) { - int totalsilence; - if (user->talking == -1) user->talking = 0; @@ -2756,7 +2756,11 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c if ((conf->transframe[idx]->frametype != AST_FRAME_NULL) && can_write(chan, confflags)) { struct ast_frame *cur; - + if (musiconhold && !ast_dsp_silence(dsp, conf->transframe[index], &confsilence) && confsilence < MEETME_DELAYDETECTTALK) { + ast_moh_stop(chan); + mohtempstopped = 1; + } + /* the translator may have returned a list of frames, so write each one onto the channel */ @@ -2766,6 +2770,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c break; } } + if (musiconhold && mohtempstopped && confsilence > MEETME_DELAYDETECTENDTALK) { + mohtempstopped = 0; + ast_moh_start(chan, NULL, NULL); + } } } else { ast_mutex_unlock(&conf->listenlock); @@ -2773,12 +2781,20 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } ast_mutex_unlock(&conf->listenlock); } else { -bailoutandtrynormal: +bailoutandtrynormal: + if (musiconhold && !ast_dsp_silence(dsp, &fr, &confsilence) && confsilence < MEETME_DELAYDETECTTALK) { + ast_moh_stop(chan); + mohtempstopped = 1; + } if (user->listen.actual) ast_frame_adjust_volume(&fr, user->listen.actual); if (can_write(chan, confflags) && ast_write(chan, &fr) < 0) { ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name); } + if (musiconhold && mohtempstopped && confsilence > MEETME_DELAYDETECTENDTALK) { + mohtempstopped = 0; + ast_moh_start(chan, NULL, NULL); + } } } else ast_log(LOG_WARNING, "Failed to read frame: %s\n", strerror(errno)); |