[asterisk-commits] dvossel: branch dvossel/shortbus r325042 - /team/dvossel/shortbus/apps/

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Jun 27 15:43:37 2011
New Revision: 325042

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325042
Log:
Fixes issue will switching single source of video

Modified:
    team/dvossel/shortbus/apps/app_confbridge.c

Modified: team/dvossel/shortbus/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/shortbus/apps/app_confbridge.c?view=diff&rev=325042&r1=325041&r2=325042
==============================================================================
--- team/dvossel/shortbus/apps/app_confbridge.c (original)
+++ team/dvossel/shortbus/apps/app_confbridge.c Mon Jun 27 15:43:37 2011
@@ -640,7 +640,7 @@
 			if (tmp_user == conference_bridge_user) {
 				continue;
 			}
-			if (conf_member_is_video_capable(tmp_user)) {
+			if (ast_bridge_is_video_src(conference_bridge->bridge, tmp_user->chan)) {
 				set = 0;
 				break;
 			}
@@ -658,9 +658,6 @@
 static void handle_video_on_exit(struct conference_bridge *conference_bridge, struct conference_bridge_user *conference_bridge_user)
 {
 	struct conference_bridge_user *tmp_user = NULL;
-	if (!conf_member_is_video_capable(conference_bridge_user)) {
-		return;
-	}
 
 	/* if this isn't a video source, nothing to update */
 	if (!ast_bridge_is_video_src(conference_bridge->bridge, conference_bridge_user->chan)) {
@@ -674,7 +671,7 @@
 			continue;
 		}
 		if (conf_member_is_video_capable(tmp_user)) {
-			ast_bridge_set_single_src_video_mode(conference_bridge->bridge, conference_bridge_user->chan);
+			ast_bridge_set_single_src_video_mode(conference_bridge->bridge, tmp_user->chan);
 		}
 	}
 	ao2_unlock(conference_bridge);