BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- skip check for cam setting even when starting sharing manually

Browse Source
This commit is contained in:
Richard Alam 2013-09-23 19:20:09 +00:00
parent c1d30dc72b
commit b1ae469c8a
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
View File

@ -144,17 +144,21 @@ package org.bigbluebutton.modules.videoconf.maps
private function autoStart():void { private function autoStart():void {
if (options.skipCamSettingsCheck) { if (options.skipCamSettingsCheck) {
skipCameraSettingsCheck();
} else {
_dispatcher.dispatchEvent(new ShareCameraRequestEvent());
}
}
private function skipCameraSettingsCheck():void {
var cam:Camera = Camera.getCamera(); var cam:Camera = Camera.getCamera();
var videoOptions:VideoConfOptions = new VideoConfOptions(); var videoOptions:VideoConfOptions = new VideoConfOptions();
cam.setMotionLevel(5, 1000); cam.setMotionLevel(5, 1000);
cam.setKeyFrameInterval(videoOptions.camKeyFrameInterval); cam.setKeyFrameInterval(videoOptions.camKeyFrameInterval);
cam.setMode(cam.width, cam.height, videoOptions.camModeFps); cam.setMode(cam.width, cam.height, videoOptions.camModeFps);
cam.setQuality(videoOptions.camQualityBandwidth, videoOptions.camQualityPicture); cam.setQuality(videoOptions.camQualityBandwidth, videoOptions.camQualityPicture);
initCameraWithSettings(cam.index, cam.width, cam.height); initCameraWithSettings(cam.index, cam.width, cam.height);
} else {
_dispatcher.dispatchEvent(new ShareCameraRequestEvent());
}
} }
private function openWebcamWindows():void { private function openWebcamWindows():void {
@ -355,10 +359,15 @@ package org.bigbluebutton.modules.videoconf.maps
_isWaitingActivation = false; _isWaitingActivation = false;
} }
public function handleShareCameraRequestEvent(event:ShareCameraRequestEvent):void { public function handleShareCameraRequestEvent(event:ShareCameraRequestEvent):void {
trace("Webcam: "+_isPublishing + " " + _isPreviewWebcamOpen + " " + _isWaitingActivation); if (options.skipCamSettingsCheck) {
if (!_isPublishing && !_isPreviewWebcamOpen && !_isWaitingActivation) skipCameraSettingsCheck();
openWebcamPreview(event.publishInClient); } else {
trace("Webcam: "+_isPublishing + " " + _isPreviewWebcamOpen + " " + _isWaitingActivation);
if (!_isPublishing && !_isPreviewWebcamOpen && !_isWaitingActivation) {
openWebcamPreview(event.publishInClient);
}
}
} }
public function handleCamSettingsClosedEvent(event:BBBEvent):void{ public function handleCamSettingsClosedEvent(event:BBBEvent):void{