Browse Source

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

j8
paweldomas 10 years ago
parent
commit
1d57cb9dae
3 changed files with 23237 additions and 23238 deletions
  1. 1
    1
      index.html
  2. 23227
    23227
      libs/app.bundle.js
  3. 9
    10
      modules/UI/videolayout/VideoLayout.js

+ 1
- 1
index.html View File

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

+ 23227
- 23227
libs/app.bundle.js
File diff suppressed because it is too large
View File


+ 9
- 10
modules/UI/videolayout/VideoLayout.js View File

636
 
636
 
637
         var myResourceJid = APP.xmpp.myResource();
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
     my.mucJoined = function () {
643
     my.mucJoined = function () {
645
         var myResourceJid = APP.xmpp.myResource();
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
      */
1880
      */
1883
     my.onDominantSpeakerChanged = function (resourceJid) {
1881
     my.onDominantSpeakerChanged = function (resourceJid) {
1884
         // We ignore local user events.
1882
         // We ignore local user events.
1885
-        if (resourceJid
1886
-                === APP.xmpp.myResource())
1883
+        if (resourceJid === APP.xmpp.myResource())
1887
             return;
1884
             return;
1888
 
1885
 
1889
         var members = APP.xmpp.getMembers();
1886
         var members = APP.xmpp.getMembers();
1919
 
1916
 
1920
             // Update the large video if the video source is already available,
1917
             // Update the large video if the video source is already available,
1921
             // otherwise wait for the "videoactive.jingle" event.
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
                     continue;
2064
                     continue;
2066
 
2065
 
2067
                 // videoSrcToSsrc needs to be update for this call to succeed.
2066
                 // videoSrcToSsrc needs to be update for this call to succeed.
2068
-                VideoLayout.updateLargeVideo(src);
2067
+                VideoLayout.updateLargeVideo(src, 1, resource);
2069
                 break;
2068
                 break;
2070
 
2069
 
2071
             }
2070
             }

Loading…
Cancel
Save