haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move GUM to body.onload

This commit is contained in:
Philipp Hancke 2014-08-25 15:29:54 +02:00
parent 54ea1da98e
commit c6f7e192d0
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app.js
View File

@ -69,6 +69,24 @@ function init() {
return; return;
} }
obtainAudioAndVideoPermissions(function (stream) {
var audioStream = new webkitMediaStream(stream);
var videoStream = new webkitMediaStream(stream);
var videoTracks = stream.getVideoTracks();
var audioTracks = stream.getAudioTracks();
for (var i = 0; i < videoTracks.length; i++) {
audioStream.removeTrack(videoTracks[i]);
}
VideoLayout.changeLocalAudio(audioStream);
startLocalRtpStatsCollector(audioStream);
for (i = 0; i < audioTracks.length; i++) {
videoStream.removeTrack(audioTracks[i]);
}
VideoLayout.changeLocalVideo(videoStream, true);
maybeDoJoin();
});
var jid = document.getElementById('jid').value || config.hosts.anonymousdomain || config.hosts.domain || window.location.hostname; var jid = document.getElementById('jid').value || config.hosts.anonymousdomain || config.hosts.domain || window.location.hostname;
connect(jid); connect(jid);
} }
@ -100,29 +118,11 @@ function connect(jid, password) {
if (config.useStunTurn) { if (config.useStunTurn) {
connection.jingle.getStunAndTurnCredentials(); connection.jingle.getStunAndTurnCredentials();
} }
obtainAudioAndVideoPermissions(function (stream) {
audioStream = new webkitMediaStream(stream);
videoStream = new webkitMediaStream(stream);
var videoTracks = stream.getVideoTracks();
var audioTracks = stream.getAudioTracks();
for (var i = 0; i < videoTracks.length; i++) {
audioStream.removeTrack(videoTracks[i]);
}
audioStreamReady(audioStream);
VideoLayout.changeLocalAudio(audioStream);
startLocalRtpStatsCollector(audioStream);
for (i = 0; i < audioTracks.length; i++) {
videoStream.removeTrack(audioTracks[i]);
}
VideoLayout.changeLocalVideo(videoStream, true);
doJoin();
});
document.getElementById('connect').disabled = true; document.getElementById('connect').disabled = true;
if(password) if(password)
authenticatedUser = true; authenticatedUser = true;
maybeDoJoin();
} else if (status === Strophe.Status.CONNFAIL) { } else if (status === Strophe.Status.CONNFAIL) {
if(msg === 'x-strophe-bad-non-anon-jid') { if(msg === 'x-strophe-bad-non-anon-jid') {
anonymousConnectionFailed = true; anonymousConnectionFailed = true;
@ -165,17 +165,14 @@ function obtainAudioAndVideoPermissions(callback) {
}); });
} }
function audioStreamReady(stream) { function maybeDoJoin() {
if (connection && connection.connected && Strophe.getResourceFromJid(connection.jid) // .connected is true while connecting?
&& (connection.jingle.localAudio || connection.jingle.localVideo)) {
}
function videoStreamFailed(error) {
console.warn("Failed to obtain video stream - continue anyway", error);
doJoin(); doJoin();
}
} }
function doJoin() { function doJoin() {
var roomnode = null; var roomnode = null;
var path = window.location.pathname; var path = window.location.pathname;