mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 20:08:17 +00:00
res_monitor: Remove deprecated module.
ASTERISK-30303 Change-Id: I0462caefb4f9544e2e2baa23c498858310b52d50
This commit is contained in:
committed by
George Joseph
parent
cbaba132a7
commit
6b03d60c7d
@@ -3678,7 +3678,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
|
||||
ast_func_write(chan, "DENOISE(rx)", "on");
|
||||
}
|
||||
|
||||
retrydahdi = (strcasecmp(ast_channel_tech(chan)->type, "DAHDI") || (ast_channel_audiohooks(chan) || ast_channel_monitor(chan)) ? 1 : 0);
|
||||
retrydahdi = (strcasecmp(ast_channel_tech(chan)->type, "DAHDI") || (ast_channel_audiohooks(chan)) ? 1 : 0);
|
||||
user->dahdichannel = !retrydahdi;
|
||||
|
||||
dahdiretry:
|
||||
@@ -4196,14 +4196,14 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
|
||||
if (c) {
|
||||
char dtmfstr[2] = "";
|
||||
|
||||
if (ast_channel_fd(c, 0) != origfd || (user->dahdichannel && (ast_channel_audiohooks(c) || ast_channel_monitor(c)))) {
|
||||
if (ast_channel_fd(c, 0) != origfd || (user->dahdichannel && ast_channel_audiohooks(c))) {
|
||||
if (using_pseudo) {
|
||||
/* Kill old pseudo */
|
||||
close(fd);
|
||||
using_pseudo = 0;
|
||||
}
|
||||
ast_debug(1, "Ooh, something swapped out under us, starting over\n");
|
||||
retrydahdi = (strcasecmp(ast_channel_tech(c)->type, "DAHDI") || (ast_channel_audiohooks(c) || ast_channel_monitor(c)) ? 1 : 0);
|
||||
retrydahdi = (strcasecmp(ast_channel_tech(c)->type, "DAHDI") || ast_channel_audiohooks(c) ? 1 : 0);
|
||||
user->dahdichannel = !retrydahdi;
|
||||
goto dahdiretry;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user