mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +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
@@ -1175,8 +1175,6 @@ static int run_app_helper(struct ast_channel *chan, const char *app_name, const
|
||||
|
||||
if (!strcasecmp("Gosub", app_name)) {
|
||||
ast_app_exec_sub(NULL, chan, app_args, 0);
|
||||
} else if (!strcasecmp("Macro", app_name)) {
|
||||
ast_app_exec_macro(NULL, chan, app_args);
|
||||
} else {
|
||||
res = ast_pbx_exec_application(chan, app_name, app_args);
|
||||
}
|
||||
@@ -2263,21 +2261,16 @@ static void bridge_channel_handle_control(struct ast_bridge_channel *bridge_chan
|
||||
{
|
||||
struct ast_channel *chan;
|
||||
struct ast_option_header *aoh;
|
||||
int is_caller;
|
||||
|
||||
chan = bridge_channel->chan;
|
||||
switch (fr->subclass.integer) {
|
||||
case AST_CONTROL_REDIRECTING:
|
||||
is_caller = !ast_test_flag(ast_channel_flags(chan), AST_FLAG_OUTGOING);
|
||||
if (ast_channel_redirecting_sub(NULL, chan, fr, 1) &&
|
||||
ast_channel_redirecting_macro(NULL, chan, fr, is_caller, 1)) {
|
||||
if (ast_channel_redirecting_sub(NULL, chan, fr, 1)) {
|
||||
ast_indicate_data(chan, fr->subclass.integer, fr->data.ptr, fr->datalen);
|
||||
}
|
||||
break;
|
||||
case AST_CONTROL_CONNECTED_LINE:
|
||||
is_caller = !ast_test_flag(ast_channel_flags(chan), AST_FLAG_OUTGOING);
|
||||
if (ast_channel_connected_line_sub(NULL, chan, fr, 1) &&
|
||||
ast_channel_connected_line_macro(NULL, chan, fr, is_caller, 1)) {
|
||||
if (ast_channel_connected_line_sub(NULL, chan, fr, 1)) {
|
||||
ast_indicate_data(chan, fr->subclass.integer, fr->data.ptr, fr->datalen);
|
||||
}
|
||||
break;
|
||||
|
Reference in New Issue
Block a user