diff options
| author | Corey Farrell <git@cfware.com> | 2017-10-30 01:32:32 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2017-10-30 00:40:12 -0500 |
| commit | cee81b3c8bb8b95ea3c1a9c29d556a3e6c9c7614 (patch) | |
| tree | 16adc4a1233df9e3568ad8d78d6827e78f332520 /apps | |
| parent | 2e5e7e0b143c2fdbd852d98a5d356a3fe1c3bc43 (diff) | |
Modules: Fix issues with CLI completion.
* Stop using ast_module_helper to check if a module is loaded, use
ast_module_check instead (app_confbridge and app_meetme).
* Stop ast_module_helper from listing reload classes when needsreload
was not requested.
ASTERISK-27378
Change-Id: Iaed8c1e4fcbeb242921dbac7929a0fe75ff4b239
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_confbridge.c | 17 | ||||
| -rw-r--r-- | apps/app_meetme.c | 6 |
2 files changed, 6 insertions, 17 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 3ea336a84..ae3df7208 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -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 */ diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 2cf252d45..1d3c324c2 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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"); } |