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

- start jws screen sharing

Browse Source 
- disable webrtc screen sharing
This commit is contained in:
Richard Alam 2016-08-09 17:54:07 +00:00
parent 5bc2638c47
commit 4348a0736a
3 changed files with 80 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-client/src/ScreenshareModule.mxml
View File

@ -26,7 +26,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
creationComplete="onCreationComplete()" xmlns:maps1="org.bigbluebutton.modules.screenshare.maps.*">
<maps1:ScreenshareEventMap id="deskshareGlobalEventMap" />
<maps1:WebRTCDeskshareEventMap id="webRTCDeskshareEventMap" />
<!--
<maps1:WebRTCDeskshareEventMap id="webRTCDeskshareEventMap" /> -->
<mx:Script>
<![CDATA[

8
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
View File

@ -147,12 +147,14 @@ package org.bigbluebutton.modules.screenshare.managers {
if (option.useWebRTCIfAvailable && !BrowserCheck.isWebRTCSupported()) {
usingJava = true;
var autoStart:Boolean = false; // harcode for now
publishWindowManager.startSharing(module.getCaptureServerUri(), module.getRoom(), autoStart, option.autoFullScreen);
publishWindowManager.startSharing(module.getCaptureServerUri(), module.getRoom(), option.autoStart, option.autoFullScreen);
sharing = true;
service.requestStartSharing();
} else {
sharing = true;
usingJava = false;
publishWindowManager.startSharing(module.getCaptureServerUri(), module.getRoom(), option.autoStart, option.autoFullScreen);
service.requestStartSharing();
}
}
@ -182,7 +184,7 @@ package org.bigbluebutton.modules.screenshare.managers {
toolbarButtonManager.startedSharing();
var option:ScreenshareOptions = new ScreenshareOptions();
option.parseOptions();
publishWindowManager.startSharing(module.getCaptureServerUri(), module.getRoom(), autoStart, option.autoFullScreen);
publishWindowManager.startSharing(module.getCaptureServerUri(), module.getRoom(), option.autoStart, option.autoFullScreen);
sharing = true;
}

2
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
View File

@ -26,7 +26,7 @@ package org.bigbluebutton.modules.screenshare.model
[Bindable] public var autoStart:Boolean = false;
[Bindable] public var autoFullScreen:Boolean = false;
[Bindable] public var baseTabIndex:int;
[Bindable] public var useWebRTCIfAvailable:Boolean = true;
[Bindable] public var useWebRTCIfAvailable:Boolean = false;
[Bindable] public var chromeExtensionKey:String = null;
[Bindable] public var helpUrl:String;