kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
George Joseph
2016-11-16 17:44:12 -06:00
committed by Gerrit Code Review
parent ac0a1ee6da f62c9c42fa
commit 013e7dd4a6
2 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/channel.c
View File

@@ -10323,9 +10323,15 @@ 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;
@@ -10373,9 +10379,15 @@ 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;
@@ -10416,9 +10428,15 @@ 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;
@@ -10459,9 +10477,15 @@ 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;