diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index eef666f4fe5a29e9e74755466b95ee8fff36a6ba..015b6ee309dd43111c49137f107b7241fc642ebf 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -51,10 +51,6 @@
baseTabIndex="201"
useWebRTCIfAvailable="false"
chromeExtensionKey=""
- vertoPort="PORT"
- vertoHostName="HOST.NAME"
- vertoLogin="LOGIN"
- vertoPassword="PASSWORD"
help="http://HOST/client/help/screenshare-help.html"
/>
diff --git a/bigbluebutton-client/resources/prod/lib/verto_extension.js b/bigbluebutton-client/resources/prod/lib/verto_extension.js
index dd29873862b3bf7774cb29d9e45c0e816b4172c5..3bed5ec621d9fb7cec2240b60418abb6c87a4cfb 100755
--- a/bigbluebutton-client/resources/prod/lib/verto_extension.js
+++ b/bigbluebutton-client/resources/prod/lib/verto_extension.js
@@ -2,9 +2,7 @@ Verto = function (
tag,
voiceBridge,
conferenceUsername,
- conferenceIdNumber,
userCallback,
- credentials,
onFail = null,
chromeExtension = null) {
@@ -28,11 +26,11 @@ Verto = function (
this.caller_id_name = conferenceUsername;
this.caller_id_number = conferenceIdNumber;
- this.vertoPort = credentials.vertoPort;
- this.hostName = credentials.hostName;
+ this.vertoPort = "8082";
+ this.hostName = window.location.hostname;
this.socketUrl = 'wss://' + this.hostName + ':' + this.vertoPort;
- this.login = credentials.login;
- this.password = credentials.password;
+ this.login = "bbbuser";
+ this.password = "secret";
this.minWidth = '640';
this.minHeight = '480';
this.maxWidth = '1920';
@@ -509,5 +507,3 @@ window.vertoExtensionGetChromeExtensionStatus = function (extensionid, callback)
callback = Verto.normalizeCallback(callback);
getChromeExtensionStatus(extensionid, callback);
};
-
-
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
index 9bc9e74698484f18b195f39e57f6ea767465d204..f183f04db7a625757463070166b86edd0dbef0ef 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
@@ -49,7 +49,6 @@ package org.bigbluebutton.modules.screenshare.managers
private var sharing:Boolean = false;
private var usingWebRTC:Boolean = false;
private var chromeExtensionKey:String = null;
- private var vertoServerCredentials:Object = new Object();
public function WebRTCDeskshareManager() {
JSLog.warn("WebRTCDeskshareManager::WebRTCDeskshareManager", {});
@@ -133,9 +132,7 @@ package org.bigbluebutton.modules.screenshare.managers
videoTag,
voiceBridge,
myName,
- '1008',
null,
- vertoServerCredentials,
"onFail",
chromeExtensionKey
);
@@ -150,24 +147,6 @@ package org.bigbluebutton.modules.screenshare.managers
if (options.chromeExtensionKey) {
chromeExtensionKey = options.chromeExtensionKey;
}
- if (options.vertoPort) {
- vertoServerCredentials.vertoPort = options.vertoPort;
- }
- if (options.vertoHostName) {
- vertoServerCredentials.hostName = options.vertoHostName;
- }
- if (options.vertoLogin) {
- vertoServerCredentials.login = options.vertoLogin;
- }
- if (options.vertoPassword) {
- vertoServerCredentials.password = options.vertoPassword;
- }
- JSLog.warn("WebRTCDeskshareManager::initDeskshare - options", options);
- JSLog.warn("WebRTCDeskshareManager::initDeskshare - chromeExtensionKey", chromeExtensionKey);
- JSLog.warn("WebRTCDeskshareManager::initDeskshare - vertoServerCredentials.vertoPort", vertoServerCredentials.vertoPort);
- JSLog.warn("WebRTCDeskshareManager::initDeskshare - vertoServerCredentials.hostName", vertoServerCredentials.hostName);
- JSLog.warn("WebRTCDeskshareManager::initDeskshare - vertoServerCredentials.login", vertoServerCredentials.login);
- JSLog.warn("WebRTCDeskshareManager::initDeskshare - vertoServerCredentials.password", vertoServerCredentials.password);
if (options.autoStart) {
handleStartSharingEvent(true);
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
index 2f5b824ce990f7a9f3647c321db87826eade87ff..f454cc664f98e190a5170b6373e710f2ee84b025 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
@@ -28,10 +28,6 @@ package org.bigbluebutton.modules.screenshare.model
[Bindable] public var baseTabIndex:int;
[Bindable] public var useWebRTCIfAvailable:Boolean = true;
[Bindable] public var chromeExtensionKey:String = null;
- [Bindable] public var vertoPort:String = null;
- [Bindable] public var vertoHostName:String = null;
- [Bindable] public var vertoLogin:String = null;
- [Bindable] public var vertoPassword:String = null;
[Bindable] public var helpUrl:String;
public function parseOptions():void {
@@ -58,18 +54,6 @@ package org.bigbluebutton.modules.screenshare.model
if (vxml.@chromeExtensionKey != undefined) {
chromeExtensionKey = vxml.@chromeExtensionKey.toString();
}
- if (vxml.@vertoPort != undefined) {
- vertoPort = vxml.@vertoPort.toString();
- }
- if (vxml.@vertoHostName != undefined) {
- vertoHostName = vxml.@vertoHostName.toString();
- }
- if (vxml.@vertoLogin != undefined) {
- vertoLogin = vxml.@vertoLogin.toString();
- }
- if (vxml.@vertoPassword != undefined) {
- vertoPassword = vxml.@vertoPassword.toString();
- }
if (vxml.@help != undefined){
helpUrl = vxml.@help;
}
diff --git a/bigbluebutton-html5/imports/api/verto/index.js b/bigbluebutton-html5/imports/api/verto/index.js
index 720a75fbdf94d8a8e73a7319ccb837faf6ac76a4..9bae27ad39bdae8a8f3e485138ea55e7d9f591bd 100755
--- a/bigbluebutton-html5/imports/api/verto/index.js
+++ b/bigbluebutton-html5/imports/api/verto/index.js
@@ -11,15 +11,6 @@ function createVertoUserName() {
return conferenceUsername;
}
-function getVertoCredentials() {
- return {
- vertoPort: clientConfig.media.vertoPort,
- hostName: clientConfig.media.vertoServerAddress,
- login: '1008',
- password: clientConfig.media.freeswitchProfilePassword,
- };
-}
-
function vertoExitAudio() {
window.vertoExitAudio();
}
@@ -29,9 +20,7 @@ function vertoJoinListenOnly() {
'remote-media',
getVoiceBridge(),
createVertoUserName(),
- '1008',
null,
- getVertoCredentials(),
);
}
@@ -40,9 +29,7 @@ function vertoJoinMicrophone() {
'remote-media',
getVoiceBridge(),
createVertoUserName(),
- '1008',
null,
- getVertoCredentials(),
);
}
@@ -51,9 +38,7 @@ function vertoWatchVideo() {
'deskshareVideo',
getVoiceBridge(),
createVertoUserName(),
- '1008',
null,
- getVertoCredentials(),
);
}
@@ -62,9 +47,7 @@ function shareVertoScreen() {
'deskshareVideo',
getVoiceBridge(),
createVertoUserName(),
- '1008',
null,
- getVertoCredentials(),
);
}
diff --git a/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
index 710c4ea9935ed376b637511690bc6d67e6303e4a..f7cfaad2058513e54efcf5de2303572c53861a68 100755
--- a/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
+++ b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
@@ -4,8 +4,6 @@ import Icon from '/imports/ui/components/icon/component';
import Button from '/imports/ui/components/button/component';
import BaseMenu from './BaseMenu';
import {joinListenOnly, joinMicrophone, exitAudio} from '/imports/api/phone';
-import {vertoWatchVideo} from '/imports/api/verto';
-import {presenterDeskshareHasStarted} from '/imports/ui/components/deskshare/service';
export default class AudioMenu extends BaseMenu {
constructor(props) {
@@ -16,29 +14,6 @@ export default class AudioMenu extends BaseMenu {
return (
<div>
<p>inside audio menu</p>
- <button onClick={
- function () {
- exitAudio(function () {console.log('exit callback');});
- }
- }>exit voice call</button>
- <br/>
- <button onClick={
- function () {
- joinListenOnly();
- }
- }>listen only</button>
-
- <button onClick={
- function () {
- joinMicrophone();
- }
- }>microphone</button>
-
- <button onClick={
- function () {
- vertoWatchVideo();
- }
- }>watch video</button>
</div>
);
}