svn commit: r1626061 - /openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml

[so...@apache.org]

Author: solomax
Date: Thu Sep 18 19:50:39 2014
New Revision: 1626061

URL: http://svn.apache.org/r1626061
Log:
[OPENMEETINGS-1003] setMode works as expected

Modified:
    openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml

Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml?rev=1626061&r1=1626060&r2=1626061&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml Thu Sep 18 19:50:39 2014
@@ -44,7 +44,7 @@
 		private var roomid:int;
 		private var audioOnly:Boolean = false;
 		private var labels:Object = new Object();
-		private var FPS:int = 5;
+		private var FPS:int;
 		private var bandwidth:int = 0;
 		private var quality:int = 100;
 		private var echoPath:int = 256;
@@ -95,7 +95,7 @@
 			audioOnly = 'true' == tla.parameters['audioOnly'];
 			interview = 'true' == tla.parameters['interview'];
 			var _fps:int = parseInt(tla.parameters['fps']);
-			FPS = interview ? 24 : (isNaN(_fps) ? 30 : _fps);
+			FPS = interview ? 24 : (isNaN(_fps) || _fps < 1 ? 30 : _fps);
 
 			var lbls:Array = JSON.parse(tla.parameters['labels']) as Array;
 			for (var i:int = 0; i < lbls.length; ++i) {
@@ -275,14 +275,14 @@
 				return null;
 			}
 			var _camera:Camera = Camera.getCamera(cams.selectedItem.data);
-			if (_camera != null) {
+			if (_camera != null && !_camera.muted) {
 				if (interview) {
 					//we need a fixed frame rate for the videos to merge them later on
-					//_camera.setMode(video.width, video.height, 24, true);
+					_camera.setMode(video.width, video.height, 24, true);
 					debug("IS INTERVIEW ");
 					_camera.setQuality(0, 98);
 				} else {
-					//_camera.setMode(video.width, video.height, FPS);
+					_camera.setMode(video.width, video.height, FPS);
 					debug("IS NO INTERVIEW ");
 					_camera.setQuality(bandwidth, quality);
 				}