diff options
| author | Mark Michelson <mmichelson@digium.com> | 2013-06-05 19:19:48 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2013-06-05 19:19:48 +0000 |
| commit | 94d8d0468f37184807c43559a02638cd922aebed (patch) | |
| tree | c5a7f1af40d39438e1992d7f96b22f9afc88cfdf /main/features.c | |
| parent | 79022c0f88dcee887b1ff76796393db3b225d126 (diff) | |
Remove remaining traces of remove_on_pull from hooks and hook APIs.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390550 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/main/features.c b/main/features.c index cd0f05a0b..d46342468 100644 --- a/main/features.c +++ b/main/features.c @@ -4173,36 +4173,42 @@ static int setup_bridge_features_builtin(struct ast_bridge_features *features, s builtin_feature_get_exten(chan, "blindxfer", dtmf, sizeof(dtmf)); if (!ast_strlen_zero(dtmf)) { /* BUGBUG need to supply a blind transfer structure and destructor to use other than defaults */ - res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_BLINDTRANSFER, dtmf, NULL, NULL, 1); + res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_BLINDTRANSFER, dtmf, + NULL, NULL, AST_BRIDGE_HOOK_REMOVE_ON_PULL); } builtin_feature_get_exten(chan, "atxfer", dtmf, sizeof(dtmf)); if (!ast_strlen_zero(dtmf)) { /* BUGBUG need to supply an attended transfer structure and destructor to use other than defaults */ - res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_ATTENDEDTRANSFER, dtmf, NULL, NULL, 1); + res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_ATTENDEDTRANSFER, dtmf, + NULL, NULL, AST_BRIDGE_HOOK_REMOVE_ON_PULL); } } if (ast_test_flag(flags, AST_FEATURE_DISCONNECT)) { builtin_feature_get_exten(chan, "disconnect", dtmf, sizeof(dtmf)); if (!ast_strlen_zero(dtmf)) { - res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_HANGUP, dtmf, NULL, NULL, 1); + res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_HANGUP, dtmf, + NULL, NULL, AST_BRIDGE_HOOK_REMOVE_ON_PULL); } } if (ast_test_flag(flags, AST_FEATURE_PARKCALL)) { builtin_feature_get_exten(chan, "parkcall", dtmf, sizeof(dtmf)); if (!ast_strlen_zero(dtmf)) { - res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_PARKCALL, dtmf, NULL, NULL, 1); + res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_PARKCALL, dtmf, + NULL, NULL, AST_BRIDGE_HOOK_REMOVE_ON_PULL); } } if (ast_test_flag(flags, AST_FEATURE_AUTOMON)) { builtin_feature_get_exten(chan, "automon", dtmf, sizeof(dtmf)); if (!ast_strlen_zero(dtmf)) { - res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_AUTOMON, dtmf, NULL, NULL, 1); + res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_AUTOMON, dtmf, + NULL, NULL, AST_BRIDGE_HOOK_REMOVE_ON_PULL); } } if (ast_test_flag(flags, AST_FEATURE_AUTOMIXMON)) { builtin_feature_get_exten(chan, "automixmon", dtmf, sizeof(dtmf)); if (!ast_strlen_zero(dtmf)) { - res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_AUTOMIXMON, dtmf, NULL, NULL, 1); + res |= ast_bridge_features_enable(features, AST_BRIDGE_BUILTIN_AUTOMIXMON, dtmf, + NULL, NULL, AST_BRIDGE_HOOK_REMOVE_ON_PULL); } } ast_unlock_call_features(); |