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

Updated verto audio joining

Browse Source
This commit is contained in:
perroned 2016-01-13 10:01:00 -08:00
parent ee2f4a5dc3
commit 4ae45bff9b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bigbluebutton-html5/app/client/globals_audio.coffee
View File

@ -34,8 +34,9 @@
# join the conference. If listen only send the request to the server
@joinVoiceCall = (event, options) ->
extension = Meteor.Meetings.findOne().voiceConf
#TODO get rid of these references to verto_extensions global vars (conferenceUsername, conferenceIdNumber)
extension = Meteor.Meetings.findOne().voiceConf;
conferenceUsername = "FreeSWITCH User"
conferenceIdNumber = "1008";
if !isWebRTCAvailable()
notification_WebRTCNotSupported()
return
@ -44,6 +45,13 @@
if options.watchOnly?
toggleWhiteboardVideo("video")
vertoServerCredentials = {
vertoPort: "8082",
hostName: Meteor.config.vertoServerAddress,
login: "1008",
password: Meteor.config.freeswitchProfilePassword,
}
wasCallSuccessful = false
debuggerCallback = (message) ->
console.log("CALLBACK: "+JSON.stringify(message));
@ -52,11 +60,11 @@
# Always fail the first time. Retry on failure.
#
if !!navigator.mozGetUserMedia and message.errorcode is 1001
callIntoConference_verto(extension, conferenceUsername, conferenceIdNumber, ((m) -> console.log("CALLBACK: "+JSON.stringify(m))), "webcam", options)
callIntoConference_verto(extension, conferenceUsername, conferenceIdNumber, ((m) -> console.log("CALLBACK: "+JSON.stringify(m))), "webcam", options, vertoServerCredentials)
#
# End of hacky method
#
callIntoConference_verto(extension, conferenceUsername, conferenceIdNumber, debuggerCallback, "webcam", options);
callIntoConference_verto(extension, conferenceUsername, conferenceIdNumber, debuggerCallback, "webcam", options, vertoServerCredentials);
return
else
# create voice call params