diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-07-25 02:20:23 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-07-25 02:20:23 +0000 |
| commit | 9d8a5ceb02f6559940bd94aaf163a544ce6e6f4c (patch) | |
| tree | d5bc0d582e66aa19f1ec14767edbd83bdfbb7b63 /bridges | |
| parent | 71609d58aa8e8cd9d0cbc4e2a29ab20d19599c27 (diff) | |
Move after bridge callbacks into their own file
One more major refactoring to go.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_builtin_features.c | 2 | ||||
| -rw-r--r-- | bridges/bridge_builtin_interval_features.c | 6 | ||||
| -rw-r--r-- | bridges/bridge_softmix.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c index 1252240ac..00c88710c 100644 --- a/bridges/bridge_builtin_features.c +++ b/bridges/bridge_builtin_features.c @@ -483,7 +483,7 @@ static int feature_hangup(struct ast_bridge *bridge, struct ast_bridge_channel * * bridge_channel to force the channel out of the bridge and the * core takes care of the rest. */ - ast_bridge_channel_leave_bridge(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END); + ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END); return 0; } diff --git a/bridges/bridge_builtin_interval_features.c b/bridges/bridge_builtin_interval_features.c index 7e5291ac8..5a02991d4 100644 --- a/bridges/bridge_builtin_interval_features.c +++ b/bridges/bridge_builtin_interval_features.c @@ -58,7 +58,7 @@ static int bridge_features_duration_callback(struct ast_bridge *bridge, struct a ast_stream_and_wait(bridge_channel->chan, limits->duration_sound, AST_DIGIT_NONE); } - ast_bridge_channel_leave_bridge(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END); + ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END); ast_test_suite_event_notify("BRIDGE_TIMELIMIT", "Channel1: %s", ast_channel_name(bridge_channel->chan)); return -1; @@ -114,7 +114,7 @@ static int bridge_features_connect_callback(struct ast_bridge *bridge, struct as { struct ast_bridge_features_limits *limits = hook_pvt; - if (bridge_channel->state != AST_BRIDGE_CHANNEL_STATE_WAIT) { + if (bridge_channel->state != BRIDGE_CHANNEL_STATE_WAIT) { return -1; } @@ -126,7 +126,7 @@ static int bridge_features_warning_callback(struct ast_bridge *bridge, struct as { struct ast_bridge_features_limits *limits = hook_pvt; - if (bridge_channel->state == AST_BRIDGE_CHANNEL_STATE_WAIT) { + if (bridge_channel->state == BRIDGE_CHANNEL_STATE_WAIT) { /* If we aren't in the wait state, something more important than this warning is happening and we should skip it. */ limits_interval_playback(bridge, bridge_channel, limits, limits->warning_sound); } diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index dcf11ec6a..503c0b9a5 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -576,7 +576,7 @@ static void softmix_bridge_write_voice(struct ast_bridge *bridge, struct ast_bri ast_mutex_unlock(&sc->lock); if (update_talking != -1) { - ast_bridge_notify_talking(bridge_channel, update_talking); + ast_bridge_channel_notify_talking(bridge_channel, update_talking); } } |