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 /bridges | |
| 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 'bridges')
| -rw-r--r-- | bridges/bridge_builtin_interval_features.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bridges/bridge_builtin_interval_features.c b/bridges/bridge_builtin_interval_features.c index a0e767ed3..a4fd97ba0 100644 --- a/bridges/bridge_builtin_interval_features.c +++ b/bridges/bridge_builtin_interval_features.c @@ -146,7 +146,8 @@ static void copy_bridge_features_limits(struct ast_bridge_features_limits *dst, ast_string_field_set(dst, connect_sound, src->connect_sound); } -static int bridge_builtin_set_limits(struct ast_bridge_features *features, struct ast_bridge_features_limits *limits, int remove_on_pull) +static int bridge_builtin_set_limits(struct ast_bridge_features *features, + struct ast_bridge_features_limits *limits, enum ast_bridge_hook_remove_flags remove_flags) { struct ast_bridge_features_limits *feature_limits; @@ -173,7 +174,7 @@ static int bridge_builtin_set_limits(struct ast_bridge_features *features, struc /* BUGBUG feature interval hooks need to be reimplemented to be more stand alone. */ if (ast_bridge_interval_hook(features, feature_limits->duration, - bridge_features_duration_callback, feature_limits, NULL, remove_on_pull)) { + bridge_features_duration_callback, feature_limits, NULL, remove_flags)) { ast_log(LOG_ERROR, "Failed to schedule the duration limiter to the bridge channel.\n"); return -1; } @@ -182,14 +183,14 @@ static int bridge_builtin_set_limits(struct ast_bridge_features *features, struc if (!ast_strlen_zero(feature_limits->connect_sound)) { if (ast_bridge_interval_hook(features, 1, - bridge_features_connect_callback, feature_limits, NULL, remove_on_pull)) { + bridge_features_connect_callback, feature_limits, NULL, remove_flags)) { ast_log(LOG_WARNING, "Failed to schedule connect sound to the bridge channel.\n"); } } if (feature_limits->warning && feature_limits->warning < feature_limits->duration) { if (ast_bridge_interval_hook(features, feature_limits->duration - feature_limits->warning, - bridge_features_warning_callback, feature_limits, NULL, remove_on_pull)) { + bridge_features_warning_callback, feature_limits, NULL, remove_flags)) { ast_log(LOG_WARNING, "Failed to schedule warning sound playback to the bridge channel.\n"); } } |