Pārlūkot izejas kodu

Simplify, properly format source code

master
Lyubomir Marinov 9 gadus atpakaļ
vecāks
revīzija
551f7b5374
1 mainītis faili ar 8 papildinājumiem un 9 dzēšanām
  1. 8
    9
      modules/RTC/RTCUtils.js

+ 8
- 9
modules/RTC/RTCUtils.js Parādīt failu

383
         var audioVideo = streams.audioVideo;
383
         var audioVideo = streams.audioVideo;
384
         if (audioVideo) {
384
         if (audioVideo) {
385
             var audioTracks = audioVideo.getAudioTracks();
385
             var audioTracks = audioVideo.getAudioTracks();
386
-            if(audioTracks.length) {
386
+            if (audioTracks.length) {
387
                 audioStream = new webkitMediaStream();
387
                 audioStream = new webkitMediaStream();
388
                 for (var i = 0; i < audioTracks.length; i++) {
388
                 for (var i = 0; i < audioTracks.length; i++) {
389
                     audioStream.addTrack(audioTracks[i]);
389
                     audioStream.addTrack(audioTracks[i]);
391
             }
391
             }
392
 
392
 
393
             var videoTracks = audioVideo.getVideoTracks();
393
             var videoTracks = audioVideo.getVideoTracks();
394
-            if(videoTracks.length) {
394
+            if (videoTracks.length) {
395
                 videoStream = new webkitMediaStream();
395
                 videoStream = new webkitMediaStream();
396
                 for (var j = 0; j < videoTracks.length; j++) {
396
                 for (var j = 0; j < videoTracks.length; j++) {
397
                     videoStream.addTrack(videoTracks[j]);
397
                     videoStream.addTrack(videoTracks[j]);
399
             }
399
             }
400
         }
400
         }
401
 
401
 
402
-        if (streams && streams.desktopStream)
402
+        // FIXME Checking streams here is unnecessary because there's
403
+        // streams.audioVideo above.
404
+        if (streams)
403
             desktopStream = streams.desktopStream;
405
             desktopStream = streams.desktopStream;
404
 
406
 
405
     }
407
     }
406
     else if (RTCBrowserType.isFirefox() || RTCBrowserType.isTemasysPluginUsed()) {   // Firefox and Temasys plugin
408
     else if (RTCBrowserType.isFirefox() || RTCBrowserType.isTemasysPluginUsed()) {   // Firefox and Temasys plugin
407
-        if (streams && streams.audio)
409
+        if (streams) {
408
             audioStream = streams.audio;
410
             audioStream = streams.audio;
409
-
410
-        if (streams && streams.video)
411
             videoStream = streams.video;
411
             videoStream = streams.video;
412
-
413
-        if(streams && streams.desktop)
414
             desktopStream = streams.desktop;
412
             desktopStream = streams.desktop;
413
+        }
415
     }
414
     }
416
 
415
 
417
     if (desktopStream)
416
     if (desktopStream)
755
                                     new Error("Unable to get the audio and " +
754
                                     new Error("Unable to get the audio and " +
756
                                         "video tracks."),
755
                                         "video tracks."),
757
                                     options.devices));
756
                                     options.devices));
758
-                                    return;
757
+                                return;
759
                             }
758
                             }
760
                             if(hasDesktop) {
759
                             if(hasDesktop) {
761
                                 screenObtainer.obtainStream(
760
                                 screenObtainer.obtainStream(

Notiek ielāde…
Atcelt
Saglabāt