diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-04-21 18:11:40 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-04-21 18:11:40 +0000 |
| commit | c7b7b920afe4afccb39c7ea3c8d0bd4e56ad41f9 (patch) | |
| tree | 3be8de1bbbce5eb12a63028caa39167d69b54e96 /bridges/bridge_builtin_features.c | |
| parent | c064284e6c7e022570158f7ac3f1b522e411007a (diff) | |
New HD ConfBridge conferencing application.
Includes a new highly optimized and customizable
ConfBridge application capable of mixing audio at
sample rates ranging from 8khz-192khz.
Review: https://reviewboard.asterisk.org/r/1147/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@314598 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'bridges/bridge_builtin_features.c')
| -rw-r--r-- | bridges/bridge_builtin_features.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c index 67da6489b..2b21933e2 100644 --- a/bridges/bridge_builtin_features.c +++ b/bridges/bridge_builtin_features.c @@ -198,12 +198,12 @@ static int feature_attended_transfer(struct ast_bridge *bridge, struct ast_bridg ast_bridge_features_enable(&caller_features, AST_BRIDGE_BUILTIN_HANGUP, (attended_transfer && !ast_strlen_zero(attended_transfer->complete) ? attended_transfer->complete : "*1"), NULL); ast_bridge_features_hook(&caller_features, (attended_transfer && !ast_strlen_zero(attended_transfer->threeway) ? attended_transfer->threeway : "*2"), - attended_threeway_transfer, NULL); + attended_threeway_transfer, NULL, NULL); ast_bridge_features_hook(&caller_features, (attended_transfer && !ast_strlen_zero(attended_transfer->abort) ? attended_transfer->abort : "*3"), - attended_abort_transfer, NULL); + attended_abort_transfer, NULL, NULL); /* But for the caller we want to join the bridge in a blocking fashion so we don't spin around in this function doing nothing while waiting */ - attended_bridge_result = ast_bridge_join(attended_bridge, bridge_channel->chan, NULL, &caller_features); + attended_bridge_result = ast_bridge_join(attended_bridge, bridge_channel->chan, NULL, &caller_features, NULL); /* Since the above returned the caller features structure is of no more use */ ast_bridge_features_cleanup(&caller_features); |