- start jws screen sharing
- disable webrtc screen sharing
This commit is contained in:
parent
5bc2638c47
commit
4348a0736a
@ -21,98 +21,99 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<mx:Module xmlns:mx="http://www.adobe.com/2006/mxml"
|
||||
|
||||
implements="org.bigbluebutton.common.IBigBlueButtonModule"
|
||||
creationComplete="onCreationComplete()" xmlns:maps1="org.bigbluebutton.modules.screenshare.maps.*">
|
||||
|
||||
<maps1:ScreenshareEventMap id="deskshareGlobalEventMap" />
|
||||
<maps1:WebRTCDeskshareEventMap id="webRTCDeskshareEventMap" />
|
||||
|
||||
<mx:Script>
|
||||
<![CDATA[
|
||||
implements="org.bigbluebutton.common.IBigBlueButtonModule"
|
||||
creationComplete="onCreationComplete()" xmlns:maps1="org.bigbluebutton.modules.screenshare.maps.*">
|
||||
|
||||
<maps1:ScreenshareEventMap id="deskshareGlobalEventMap" />
|
||||
<!--
|
||||
<maps1:WebRTCDeskshareEventMap id="webRTCDeskshareEventMap" /> -->
|
||||
|
||||
<mx:Script>
|
||||
<![CDATA[
|
||||
import com.asfusion.mate.events.Dispatcher;
|
||||
import org.as3commons.logging.api.ILogger;
|
||||
import org.as3commons.logging.api.getClassLogger;
|
||||
import org.bigbluebutton.modules.screenshare.events.ModuleEvent;
|
||||
import org.bigbluebutton.modules.screenshare.maps.ScreenshareEventMap;
|
||||
import org.bigbluebutton.modules.screenshare.maps.ScreenshareEventMap;
|
||||
|
||||
private static const LOGGER:ILogger = getClassLogger(ScreenshareModule);
|
||||
|
||||
private var _moduleName:String = "Desk Share";
|
||||
|
||||
private var _moduleName:String = "Desk Share";
|
||||
private var _attributes:Object;
|
||||
|
||||
private var globalDispatcher:Dispatcher = new Dispatcher();;
|
||||
|
||||
private function onCreationComplete():void{
|
||||
LOGGER.debug("DeskShareModule initialized");
|
||||
}
|
||||
|
||||
public function get moduleName():String{
|
||||
return _moduleName;
|
||||
}
|
||||
|
||||
public function get uri():String{
|
||||
return _attributes.uri;
|
||||
}
|
||||
|
||||
public function get username():String{
|
||||
return _attributes.username;
|
||||
}
|
||||
|
||||
public function get mode():String{
|
||||
if (_attributes.mode == null){
|
||||
_attributes.mode = "LIVE";
|
||||
LOGGER.debug("Setting DeskShare mode: " + _attributes.mode);
|
||||
}
|
||||
LOGGER.debug("DeskShare mode: " + _attributes.mode);
|
||||
return _attributes.mode;
|
||||
}
|
||||
|
||||
public function get userid():Number{
|
||||
return _attributes.userid as Number;
|
||||
}
|
||||
|
||||
public function get role():String{
|
||||
return _attributes.userrole as String;
|
||||
}
|
||||
|
||||
public function start(attributes:Object):void{
|
||||
LOGGER.debug("desk share attr: " + attributes.username);
|
||||
private var globalDispatcher:Dispatcher = new Dispatcher();;
|
||||
|
||||
private function onCreationComplete():void{
|
||||
LOGGER.debug("DeskShareModule initialized");
|
||||
}
|
||||
|
||||
public function get moduleName():String{
|
||||
return _moduleName;
|
||||
}
|
||||
|
||||
public function get uri():String{
|
||||
return _attributes.uri;
|
||||
}
|
||||
|
||||
public function get username():String{
|
||||
return _attributes.username;
|
||||
}
|
||||
|
||||
public function get mode():String{
|
||||
if (_attributes.mode == null){
|
||||
_attributes.mode = "LIVE";
|
||||
LOGGER.debug("Setting DeskShare mode: " + _attributes.mode);
|
||||
}
|
||||
LOGGER.debug("DeskShare mode: " + _attributes.mode);
|
||||
return _attributes.mode;
|
||||
}
|
||||
|
||||
public function get userid():Number{
|
||||
return _attributes.userid as Number;
|
||||
}
|
||||
|
||||
public function get role():String{
|
||||
return _attributes.userrole as String;
|
||||
}
|
||||
|
||||
public function start(attributes:Object):void{
|
||||
LOGGER.debug("desk share attr: " + attributes.username);
|
||||
_attributes = attributes;
|
||||
|
||||
var startEvent:ModuleEvent = new ModuleEvent(ModuleEvent.START);
|
||||
startEvent.module = this;
|
||||
globalDispatcher.dispatchEvent(startEvent);
|
||||
}
|
||||
|
||||
globalDispatcher.dispatchEvent(startEvent);
|
||||
}
|
||||
|
||||
public function stop():void{
|
||||
LOGGER.debug("STOPPING DESKSHARE MODULE!!!");
|
||||
var stopEvent:ModuleEvent = new ModuleEvent(ModuleEvent.STOP);
|
||||
globalDispatcher.dispatchEvent(stopEvent);
|
||||
}
|
||||
|
||||
public function getRoom():String{
|
||||
return _attributes.room;
|
||||
}
|
||||
|
||||
public function getRed5ServerUri():String{
|
||||
return _attributes.uri;
|
||||
}
|
||||
|
||||
public function getCaptureServerUri():String{
|
||||
var uri:String = _attributes.uri;
|
||||
uri = uri.split("/")[2];
|
||||
return uri;
|
||||
globalDispatcher.dispatchEvent(stopEvent);
|
||||
}
|
||||
|
||||
public function getRoom():String{
|
||||
return _attributes.room;
|
||||
}
|
||||
|
||||
public function getRed5ServerUri():String{
|
||||
return _attributes.uri;
|
||||
}
|
||||
|
||||
public function getCaptureServerUri():String{
|
||||
var uri:String = _attributes.uri;
|
||||
uri = uri.split("/")[2];
|
||||
return uri;
|
||||
}
|
||||
|
||||
public function tunnel():Boolean {
|
||||
if (_attributes.protocol == "RTMPT") {
|
||||
LOGGER.debug("Use tunneling for desktop sharing");
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
]]>
|
||||
</mx:Script>
|
||||
|
||||
</mx:Module>
|
||||
return false;
|
||||
}
|
||||
]]>
|
||||
</mx:Script>
|
||||
|
||||
</mx:Module>
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user