summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2013-08-15 17:57:33 +0000
committerRichard Mudgett <rmudgett@digium.com>2013-08-15 17:57:33 +0000
commitc3466db29dddc245f81e9b6da26534a232cda3fb (patch)
treeb037f66496b43035d96dd7a2d2bed9ffea2d8083 /bridges
parentbd352e0827f9df2290599bb6bcb2f819ca7b5ee6 (diff)
Resolve some BUGBUG comments.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396783 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
-rw-r--r--bridges/bridge_softmix.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 4e4adcb22..e5835f732 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -594,8 +594,10 @@ static void softmix_bridge_write_voice(struct ast_bridge *bridge, struct ast_bri
*/
static int softmix_bridge_write_control(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_frame *frame)
{
-/* BUGBUG need to look at channel roles to determine what to do with control frame. */
- /*! \todo BUGBUG softmix_bridge_write_control() not written */
+ /*
+ * XXX Softmix needs to use channel roles to determine what to
+ * do with control frames.
+ */
return 0;
}
@@ -622,6 +624,11 @@ static int softmix_bridge_write(struct ast_bridge *bridge, struct ast_bridge_cha
return 0;
}
+ /*
+ * XXX Softmix needs to use channel roles to determine who gets
+ * what frame. Possible roles: announcer, recorder, agent,
+ * supervisor.
+ */
switch (frame->frametype) {
case AST_FRAME_NULL:
/* "Accept" the frame and discard it. */
@@ -820,6 +827,10 @@ static int softmix_mixing_loop(struct ast_bridge *bridge)
goto softmix_cleanup;
}
+ /*
+ * XXX Softmix needs to use channel roles to determine who gets
+ * what audio mixed.
+ */
while (!softmix_data->stop && bridge->num_active) {
struct ast_bridge_channel *bridge_channel;
int timeout = -1;