Quellcode durchsuchen

Merge pull request #287 from jitsi/disable-temasys-on-react-native

Disable Temasys on React Native
dev1
Дамян Минков vor 9 Jahren
Ursprung
Commit
4f450fb491
3 geänderte Dateien mit 15 neuen und 3 gelöschten Zeilen
  1. 4
    1
      modules/RTC/JitsiRemoteTrack.js
  2. 7
    1
      modules/RTC/RTCUtils.js
  3. 4
    1
      modules/RTC/ScreenObtainer.js

+ 4
- 1
modules/RTC/JitsiRemoteTrack.js Datei anzeigen

@@ -6,7 +6,6 @@ var logger = require("jitsi-meet-logger").getLogger(__filename);
6 6
 var RTCBrowserType = require("./RTCBrowserType");
7 7
 var RTCEvents = require("../../service/RTC/RTCEvents");
8 8
 var Statistics = require("../statistics/statistics");
9
-var AdapterJS = require("./adapter.screenshare");
10 9
 
11 10
 var ttfmTrackerAudioAttached = false;
12 11
 var ttfmTrackerVideoAttached = false;
@@ -170,6 +169,10 @@ JitsiRemoteTrack.prototype._attachTTFMTracker = function (container) {
170 169
         ttfmTrackerVideoAttached = true;
171 170
 
172 171
     if (RTCBrowserType.isTemasysPluginUsed()) {
172
+        // XXX Don't require Temasys unless it's to be used because it doesn't
173
+        // run on React Native, for example.
174
+        const AdapterJS = require("./adapter.screenshare");
175
+
173 176
         // FIXME: this is not working for IE11
174 177
         AdapterJS.addEvent(container, 'play', this._playCallback.bind(this));
175 178
     }

+ 7
- 1
modules/RTC/RTCUtils.js Datei anzeigen

@@ -16,7 +16,6 @@ var logger = require("jitsi-meet-logger").getLogger(__filename);
16 16
 var RTCBrowserType = require("./RTCBrowserType");
17 17
 var Resolutions = require("../../service/RTC/Resolutions");
18 18
 var RTCEvents = require("../../service/RTC/RTCEvents");
19
-var AdapterJS = require("./adapter.screenshare");
20 19
 var SDPUtil = require("../xmpp/SDPUtil");
21 20
 var EventEmitter = require("events");
22 21
 var screenObtainer = require("./ScreenObtainer");
@@ -26,6 +25,13 @@ var VideoType = require("../../service/RTC/VideoType");
26 25
 var CameraFacingMode = require("../../service/RTC/CameraFacingMode");
27 26
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
28 27
 
28
+// XXX Don't require Temasys unless it's to be used because it doesn't run on
29
+// React Native, for example.
30
+const AdapterJS
31
+    = RTCBrowserType.isTemasysPluginUsed()
32
+        ? require("./adapter.screenshare")
33
+        : undefined;
34
+
29 35
 var eventEmitter = new EventEmitter();
30 36
 
31 37
 var AVAILABLE_DEVICES_POLL_INTERVAL_TIME = 3000; // ms

+ 4
- 1
modules/RTC/ScreenObtainer.js Datei anzeigen

@@ -1,6 +1,5 @@
1 1
 /* global chrome, $, alert */
2 2
 
3
-var AdapterJS = require("./adapter.screenshare");
4 3
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
5 4
 var logger = require("jitsi-meet-logger").getLogger(__filename);
6 5
 var RTCBrowserType = require("./RTCBrowserType");
@@ -115,6 +114,10 @@ var ScreenObtainer = {
115 114
                     });
116 115
             };
117 116
         } else if (RTCBrowserType.isTemasysPluginUsed()) {
117
+            // XXX Don't require Temasys unless it's to be used because it
118
+            // doesn't run on React Native, for example.
119
+            const AdapterJS = require("./adapter.screenshare");
120
+
118 121
             if (!AdapterJS.WebRTCPlugin.plugin.HasScreensharingFeature) {
119 122
                 logger.info("Screensharing not supported by this plugin " +
120 123
                     "version");

Laden…
Abbrechen
Speichern