Merge pull request #3183 from antobinary/audio

[HTML5] change audio to default to SIP and fix import glitch
bigbluebutton · Jun 21, 2016 · 2464911 · 2464911
2 parents c283f87 + 4195905
commit 2464911
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/bigbluebutton-html5/config.js b/bigbluebutton-html5/config.js
@@ -62,7 +62,7 @@ clientConfig.media.freeswitchProfilePassword = '1234';
 clientConfig.media.vertoPort = '8082';
 
 // specifies whether to use SIP.js for audio over mod_verto
-clientConfig.media.useSIPAudio = false;
+clientConfig.media.useSIPAudio = true;
 
 // Configs for redis
 const redisConfig = {

diff --git a/bigbluebutton-html5/imports/api/verto/index.js b/bigbluebutton-html5/imports/api/verto/index.js
@@ -34,6 +34,7 @@ function joinVertoCall(options) {
     };
 
     let wasCallSuccessful = false;
+    let conferenceUsername = createVertoUserName();
     let debuggerCallback = function (message) {
       console.log('CALLBACK: ' + JSON.stringify(message));
 

diff --git a/bigbluebutton-html5/imports/ui/components/deskshare/service.js b/bigbluebutton-html5/imports/ui/components/deskshare/service.js
@@ -1,5 +1,5 @@
 import Deskshare from '/imports/api/deskshare';
-import {conferenceUsername, joinVertoAudio, watchVertoVideo} from '/imports/api/verto';
+import {createVertoUserName, joinVertoAudio, watchVertoVideo} from '/imports/api/verto';
 import Auth from '/imports/ui/services/auth';
 import {getVoiceBridge} from '/imports/api/phone';