Fixes calls to updateLargeVideo, so that it is called with user resource jid.

pull/299/head 523
paweldomas 10 years ago
parent be64bd883c
commit 1d57cb9dae
  1. 2
      index.html
  2. 27728
      libs/app.bundle.js
  3. 19
      modules/UI/videolayout/VideoLayout.js

@ -19,7 +19,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=79"></script> <script src="libs/app.bundle.js?v=80"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=7"/> <link rel="stylesheet" href="css/font.css?v=7"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">

File diff suppressed because it is too large Load Diff

@ -636,17 +636,15 @@ var VideoLayout = (function (my) {
var myResourceJid = APP.xmpp.myResource(); var myResourceJid = APP.xmpp.myResource();
VideoLayout.updateLargeVideo(localVideoSrc, 0, VideoLayout.updateLargeVideo(localVideoSrc, 0, myResourceJid);
myResourceJid);
}; };
my.mucJoined = function () { my.mucJoined = function () {
var myResourceJid = APP.xmpp.myResource(); var myResourceJid = APP.xmpp.myResource();
if(!largeVideoState.userResourceJid) if (!largeVideoState.userResourceJid)
VideoLayout.updateLargeVideo(localVideoSrc, 0, VideoLayout.updateLargeVideo(localVideoSrc, 0, myResourceJid, true);
myResourceJid, true);
}; };
/** /**
@ -1882,8 +1880,7 @@ var VideoLayout = (function (my) {
*/ */
my.onDominantSpeakerChanged = function (resourceJid) { my.onDominantSpeakerChanged = function (resourceJid) {
// We ignore local user events. // We ignore local user events.
if (resourceJid if (resourceJid === APP.xmpp.myResource())
=== APP.xmpp.myResource())
return; return;
var members = APP.xmpp.getMembers(); var members = APP.xmpp.getMembers();
@ -1919,8 +1916,10 @@ var VideoLayout = (function (my) {
// Update the large video if the video source is already available, // Update the large video if the video source is already available,
// otherwise wait for the "videoactive.jingle" event. // otherwise wait for the "videoactive.jingle" event.
if (video.length && video[0].currentTime > 0) if (video.length && video[0].currentTime > 0) {
VideoLayout.updateLargeVideo(APP.RTC.getVideoSrc(video[0]), resourceJid); VideoLayout.updateLargeVideo(
APP.RTC.getVideoSrc(video[0]), 1, resourceJid);
}
} }
}; };
@ -2065,7 +2064,7 @@ var VideoLayout = (function (my) {
continue; continue;
// videoSrcToSsrc needs to be update for this call to succeed. // videoSrcToSsrc needs to be update for this call to succeed.
VideoLayout.updateLargeVideo(src); VideoLayout.updateLargeVideo(src, 1, resource);
break; break;
} }

Loading…
Cancel
Save