diff --git a/bigbluebutton-client/src/WebcamViewStandalone.mxml b/bigbluebutton-client/src/WebcamViewStandalone.mxml index 30cf9e97bf..31c9bc92ac 100755 --- a/bigbluebutton-client/src/WebcamViewStandalone.mxml +++ b/bigbluebutton-client/src/WebcamViewStandalone.mxml @@ -164,7 +164,9 @@ $Id: $ } _videoHolder.visible = false; trace("WebcamViewSA:: closing stream"); - ns.close(); + if (ns != null) { + ns.close(); + } } private function playWebcamStream():void { diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as b/bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as index 6e455965fe..9b68ab3cce 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as +++ b/bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as @@ -21,6 +21,7 @@ package org.bigbluebutton.main.api import org.bigbluebutton.modules.listeners.events.ListenersCommand; import org.bigbluebutton.modules.videoconf.events.ClosePublishWindowEvent; import org.bigbluebutton.modules.videoconf.events.ShareCameraRequestEvent; + import org.bigbluebutton.modules.videoconf.model.VideoConfOptions; public class ExternalApiCallbacks { @@ -81,6 +82,9 @@ package org.bigbluebutton.main.api isUserPublishing = true; } + var vidConf:VideoConfOptions = new VideoConfOptions(); + obj.uri = vidConf.uri + "/" + UsersUtil.getInternalMeetingID(); + obj.userID = userID; obj.isUserPublishing = isUserPublishing; obj.streamName = streamName; @@ -94,7 +98,7 @@ package org.bigbluebutton.main.api private function handleGetMyUserInfoSynch():Object { var obj:Object = new Object(); obj.myUserID = UsersUtil.internalUserIDToExternalUserID(UsersUtil.getMyUserID()); - obj.myUserID = UsersUtil.getMyUsername(); + obj.myUsername = UsersUtil.getMyUsername(); obj.myAvatarURL = UsersUtil.getAvatarURL(); obj.myRole = UsersUtil.getMyRole(); obj.amIPresenter = UsersUtil.amIPresenter(); @@ -110,6 +114,13 @@ package org.bigbluebutton.main.api obj.camWidth = camSettings.camWidth; obj.camHeight = camSettings.camHeight; + var vidConf:VideoConfOptions = new VideoConfOptions(); + + obj.camKeyFrameInterval = vidConf.camKeyFrameInterval; + obj.camModeFps = vidConf.camModeFps; + obj.camQualityBandwidth = vidConf.camQualityBandwidth; + obj.camQualityPicture = vidConf.camQualityPicture; + return obj; }