summaryrefslogtreecommitdiff
path: root/apps/app_meetme.c
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2007-10-29 21:34:47 +0000
committerRussell Bryant <russell@russellbryant.com>2007-10-29 21:34:47 +0000
commitc1e08b1ae0d358f37a45836c9df3cbacebcb2a88 (patch)
tree0307a0528eefde0377898006aaa14fc1ad667615 /apps/app_meetme.c
parentf7782d60d1da9bffec048fec5a42c94ee17236f6 (diff)
If a caller is listen-only, then don't bother with doing talker detection.
(closes issue #10911, reported by junky, patched by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r--apps/app_meetme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 0639b6e1b..50b5116ee 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1803,7 +1803,7 @@ 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 (!(dsp = ast_dsp_new())) {
+ if (!(confflags & CONFFLAG_MONITOR) && !(dsp = ast_dsp_new())) {
ast_log(LOG_WARNING, "Unable to allocate DSP!\n");
res = -1;
}
@@ -2060,7 +2060,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if (user->talk.actual)
ast_frame_adjust_volume(f, user->talk.actual);
- {
+ if (!(confflags & CONFFLAG_MONITOR)) {
int totalsilence;
if (user->talking == -1)