|
@@ -636,17 +636,15 @@ var VideoLayout = (function (my) {
|
636
|
636
|
|
637
|
637
|
var myResourceJid = APP.xmpp.myResource();
|
638
|
638
|
|
639
|
|
- VideoLayout.updateLargeVideo(localVideoSrc, 0,
|
640
|
|
- myResourceJid);
|
|
639
|
+ VideoLayout.updateLargeVideo(localVideoSrc, 0, myResourceJid);
|
641
|
640
|
|
642
|
641
|
};
|
643
|
642
|
|
644
|
643
|
my.mucJoined = function () {
|
645
|
644
|
var myResourceJid = APP.xmpp.myResource();
|
646
|
645
|
|
647
|
|
- if(!largeVideoState.userResourceJid)
|
648
|
|
- VideoLayout.updateLargeVideo(localVideoSrc, 0,
|
649
|
|
- myResourceJid, true);
|
|
646
|
+ if (!largeVideoState.userResourceJid)
|
|
647
|
+ VideoLayout.updateLargeVideo(localVideoSrc, 0, myResourceJid, true);
|
650
|
648
|
};
|
651
|
649
|
|
652
|
650
|
/**
|
|
@@ -1882,8 +1880,7 @@ var VideoLayout = (function (my) {
|
1882
|
1880
|
*/
|
1883
|
1881
|
my.onDominantSpeakerChanged = function (resourceJid) {
|
1884
|
1882
|
// We ignore local user events.
|
1885
|
|
- if (resourceJid
|
1886
|
|
- === APP.xmpp.myResource())
|
|
1883
|
+ if (resourceJid === APP.xmpp.myResource())
|
1887
|
1884
|
return;
|
1888
|
1885
|
|
1889
|
1886
|
var members = APP.xmpp.getMembers();
|
|
@@ -1919,8 +1916,10 @@ var VideoLayout = (function (my) {
|
1919
|
1916
|
|
1920
|
1917
|
// Update the large video if the video source is already available,
|
1921
|
1918
|
// otherwise wait for the "videoactive.jingle" event.
|
1922
|
|
- if (video.length && video[0].currentTime > 0)
|
1923
|
|
- VideoLayout.updateLargeVideo(APP.RTC.getVideoSrc(video[0]), resourceJid);
|
|
1919
|
+ if (video.length && video[0].currentTime > 0) {
|
|
1920
|
+ VideoLayout.updateLargeVideo(
|
|
1921
|
+ APP.RTC.getVideoSrc(video[0]), 1, resourceJid);
|
|
1922
|
+ }
|
1924
|
1923
|
}
|
1925
|
1924
|
};
|
1926
|
1925
|
|
|
@@ -2065,7 +2064,7 @@ var VideoLayout = (function (my) {
|
2065
|
2064
|
continue;
|
2066
|
2065
|
|
2067
|
2066
|
// videoSrcToSsrc needs to be update for this call to succeed.
|
2068
|
|
- VideoLayout.updateLargeVideo(src);
|
|
2067
|
+ VideoLayout.updateLargeVideo(src, 1, resource);
|
2069
|
2068
|
break;
|
2070
|
2069
|
|
2071
|
2070
|
}
|