kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "AGI: Only defer frames when in an interception routine."" into 13

Browse Source
This commit is contained in:
George Joseph
2016-11-10 07:42:36 -06:00
committed by Gerrit Code Review
parent 9e13c3e2a1 6be5d8de0d
commit 06045fc29e
2 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/channel.c
View File

@@ -10261,15 +10261,9 @@ int ast_channel_connected_line_macro(struct ast_channel *autoservice_chan, struc
ast_party_connected_line_copy(ast_channel_connected(macro_chan), connected);
}
ast_channel_start_defer_frames(macro_chan);
ast_channel_unlock(macro_chan);
retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args);
ast_channel_lock(macro_chan);
ast_channel_stop_defer_frames(macro_chan);
ast_channel_unlock(macro_chan);
if (!retval) {
struct ast_party_connected_line saved_connected;
@@ -10317,15 +10311,9 @@ int ast_channel_redirecting_macro(struct ast_channel *autoservice_chan, struct a
ast_party_redirecting_copy(ast_channel_redirecting(macro_chan), redirecting);
}
ast_channel_start_defer_frames(macro_chan);
ast_channel_unlock(macro_chan);
retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args);
ast_channel_lock(macro_chan);
ast_channel_stop_defer_frames(macro_chan);
ast_channel_unlock(macro_chan);
if (!retval) {
struct ast_party_redirecting saved_redirecting;
@@ -10366,15 +10354,9 @@ int ast_channel_connected_line_sub(struct ast_channel *autoservice_chan, struct
ast_party_connected_line_copy(ast_channel_connected(sub_chan), connected);
}
ast_channel_start_defer_frames(sub_chan);
ast_channel_unlock(sub_chan);
retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args, 0);
ast_channel_lock(sub_chan);
ast_channel_stop_defer_frames(sub_chan);
ast_channel_unlock(sub_chan);
if (!retval) {
struct ast_party_connected_line saved_connected;
@@ -10415,15 +10397,9 @@ int ast_channel_redirecting_sub(struct ast_channel *autoservice_chan, struct ast
ast_party_redirecting_copy(ast_channel_redirecting(sub_chan), redirecting);
}
ast_channel_start_defer_frames(sub_chan);
ast_channel_unlock(sub_chan);
retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args, 0);
ast_channel_lock(sub_chan);
ast_channel_stop_defer_frames(sub_chan);
ast_channel_unlock(sub_chan);
if (!retval) {
struct ast_party_redirecting saved_redirecting;