[asterisk-commits] rmudgett: trunk r396783 - in /trunk: bridges/ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Aug 15 12:57:33 2013
New Revision: 396783

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396783
Log:
Resolve some BUGBUG comments.

Modified:
    trunk/bridges/bridge_softmix.c
    trunk/include/asterisk/bridge.h
    trunk/main/bridge.c
    trunk/main/features.c

Modified: trunk/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/trunk/bridges/bridge_softmix.c?view=diff&rev=396783&r1=396782&r2=396783
==============================================================================
--- trunk/bridges/bridge_softmix.c (original)
+++ trunk/bridges/bridge_softmix.c Thu Aug 15 12:57:33 2013
@@ -594,8 +594,10 @@
  */
 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 @@
 		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 @@
 		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;

Modified: trunk/include/asterisk/bridge.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/bridge.h?view=diff&rev=396783&r1=396782&r2=396783
==============================================================================
--- trunk/include/asterisk/bridge.h (original)
+++ trunk/include/asterisk/bridge.h Thu Aug 15 12:57:33 2013
@@ -733,7 +733,6 @@
  * \retval -1 on error.
  *
  * \note This API call is meant for internal bridging operations.
- * \note BUGBUG This may get moved.
  */
 int ast_bridge_queue_action(struct ast_bridge *bridge, struct ast_frame *action);
 

Modified: trunk/main/bridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge.c?view=diff&rev=396783&r1=396782&r2=396783
==============================================================================
--- trunk/main/bridge.c (original)
+++ trunk/main/bridge.c Thu Aug 15 12:57:33 2013
@@ -2682,7 +2682,11 @@
 
 void ast_bridge_technology_unsuspend(struct ast_bridge_technology *technology)
 {
-/* BUGBUG unsuspending a bridge technology probably needs to prod all existing bridges to see if they should start using it. */
+	/*
+	 * XXX We may want the act of unsuspending a bridge technology
+	 * to prod all existing bridges to see if they should start
+	 * using it.
+	 */
 	technology->suspended = 0;
 }
 

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=396783&r1=396782&r2=396783
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Thu Aug 15 12:57:33 2013
@@ -1068,7 +1068,6 @@
 
 	ast_bridge_features_cleanup(&chan_features);
 
-/* BUGBUG this is used by Dial and FollowMe for CDR information.  By Queue for Queue stats like CDRs. */
 	if (res && config->end_bridge_callback) {
 		config->end_bridge_callback(config->end_bridge_callback_data);
 	}