kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-25 06:00:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Modules: Fix issues with CLI completion." into 13

Browse Source
This commit is contained in:
Jenkins2
2017-10-30 17:04:04 -05:00
committed by Gerrit Code Review
parent a87391cfcb cee81b3c8b
commit 6b14200093
3 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/app_confbridge.c
View File

@@ -2377,21 +2377,12 @@ static int confbridge_exec(struct ast_channel *chan, const char *data)
user.tech_args.drop_silence = 1;
}
if (ast_test_flag(&user.u_profile, USER_OPT_JITTERBUFFER)) {
char *func_jb;
if ((func_jb = ast_module_helper("", "func_jitterbuffer", 0, 0, 0, 0))) {
ast_free(func_jb);
ast_func_write(chan, "JITTERBUFFER(adaptive)", "default");
}
if (ast_test_flag(&user.u_profile, USER_OPT_JITTERBUFFER) && ast_module_check("func_jitterbuffer.so")) {
ast_func_write(chan, "JITTERBUFFER(adaptive)", "default");
}
if (ast_test_flag(&user.u_profile, USER_OPT_DENOISE)) {
char *mod_speex;
/* Reduce background noise from each participant */
if ((mod_speex = ast_module_helper("", "codec_speex", 0, 0, 0, 0))) {
ast_free(mod_speex);
ast_func_write(chan, "DENOISE(rx)", "on");
}
if (ast_test_flag(&user.u_profile, USER_OPT_DENOISE) && ast_module_check("codec_speex.so")) {
ast_func_write(chan, "DENOISE(rx)", "on");
}
/* if this user has a intro, play it before entering */

6
apps/app_meetme.c
View File

@@ -3201,7 +3201,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
struct timeval now;
struct ast_dsp *dsp = NULL;
struct ast_app *agi_app;
char *agifile, *mod_speex;
char *agifile;
const char *agifiledefault = "conf-background.agi", *tmpvar;
char meetmesecs[30] = "";
char exitcontext[AST_MAX_CONTEXT] = "";
@@ -3591,9 +3591,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
}
/* Reduce background noise from each participant */
if (!ast_test_flag64(confflags, CONFFLAG_DONT_DENOISE) &&
(mod_speex = ast_module_helper("", "func_speex", 0, 0, 0, 0))) {
ast_free(mod_speex);
if (!ast_test_flag64(confflags, CONFFLAG_DONT_DENOISE) && ast_module_check("func_speex.so")) {
ast_func_write(chan, "DENOISE(rx)", "on");
}