diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-06-21 22:39:27 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-06-21 22:39:27 +0000 |
commit | 1267c91315f6850483022b4535beadbc0069b22e (patch) | |
tree | 17236bfa946838220112a3d80fb86913f0b70aa8 /bridges/bridge_native_rtp.c | |
parent | c14cdede125902fb5c59c92745ae10d6c1e57d33 (diff) |
Extract a useful routine from the softmix bridge technology.
* Extract a useful routine from the softmix bridge technology for other
technologies. Make other technologies use it if they can.
* Made native and 1-1 bridges write to all parties if the bridge channel
writing the frame into the bridge is NULL. Softmix will also do the same
for frame types that make sense.
* Tweak the bridge write routine return value meaning and adjust the
bridge technologies to match.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges/bridge_native_rtp.c')
-rw-r--r-- | bridges/bridge_native_rtp.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c index 120a509c1..4436f706a 100644 --- a/bridges/bridge_native_rtp.c +++ b/bridges/bridge_native_rtp.c @@ -389,16 +389,7 @@ static void native_rtp_bridge_leave(struct ast_bridge *bridge, struct ast_bridge static int native_rtp_bridge_write(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_frame *frame) { - struct ast_bridge_channel *other = ast_bridge_channel_peer(bridge_channel); - - if (!other) { - return -1; - } - - /* The bridging core takes care of freeing the passed in frame. */ - ast_bridge_channel_queue_frame(other, frame); - - return 0; + return ast_bridge_queue_everyone_else(bridge, bridge_channel, frame); } static struct ast_bridge_technology native_rtp_bridge = { |