mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 20:56:39 +00:00
app_macro: Remove deprecated module.
For most modules that interacted with app_macro, this change is limited to no longer looking for the current context from the macrocontext when set. Additionally, the following modules are impacted: app_dial - no longer supports M^ connected/redirecting macro app_minivm - samples written using macro will no longer work. The sample needs a re-write app_queue - can no longer a macro on the called party's channel. Use gosub which is currently supported ccss - no callback macro, gosub only app_voicemail - no macro support channel - remove macrocontext and priority, no connected line or redirection macro options options - stdexten is deprecated to gosub as the default and only pbx - removed macrolock pbx_dundi - no longer look for macro snmp - removed macro context, exten, and priority ASTERISK-30304 Change-Id: I830daab293117179b8d61bd4df0d971a1b3d07f6
This commit is contained in:
committed by
Friendly Automation
parent
6ecec51e6a
commit
e8f548c155
@@ -1527,8 +1527,7 @@ static int app_exec(struct ast_channel *chan, const char *data)
|
||||
|
||||
/* Update connected line to caller if available. */
|
||||
if (targs->pending_out_connected_update) {
|
||||
if (ast_channel_connected_line_sub(outbound, caller, &targs->connected_out, 0) &&
|
||||
ast_channel_connected_line_macro(outbound, caller, &targs->connected_out, 1, 0)) {
|
||||
if (ast_channel_connected_line_sub(outbound, caller, &targs->connected_out, 0)) {
|
||||
ast_channel_update_connected_line(caller, &targs->connected_out, NULL);
|
||||
}
|
||||
}
|
||||
@@ -1553,8 +1552,7 @@ static int app_exec(struct ast_channel *chan, const char *data)
|
||||
|
||||
/* Update connected line to winner if changed. */
|
||||
if (targs->pending_in_connected_update) {
|
||||
if (ast_channel_connected_line_sub(caller, outbound, &targs->connected_in, 0) &&
|
||||
ast_channel_connected_line_macro(caller, outbound, &targs->connected_in, 0, 0)) {
|
||||
if (ast_channel_connected_line_sub(caller, outbound, &targs->connected_in, 0)) {
|
||||
ast_channel_update_connected_line(outbound, &targs->connected_in, NULL);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user