소스 검색

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

Disable Temasys on React Native
dev1
Дамян Минков 9 년 전
부모
커밋
4f450fb491
3개의 변경된 파일15개의 추가작업 그리고 3개의 파일을 삭제
  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 파일 보기

6
 var RTCBrowserType = require("./RTCBrowserType");
6
 var RTCBrowserType = require("./RTCBrowserType");
7
 var RTCEvents = require("../../service/RTC/RTCEvents");
7
 var RTCEvents = require("../../service/RTC/RTCEvents");
8
 var Statistics = require("../statistics/statistics");
8
 var Statistics = require("../statistics/statistics");
9
-var AdapterJS = require("./adapter.screenshare");
10
 
9
 
11
 var ttfmTrackerAudioAttached = false;
10
 var ttfmTrackerAudioAttached = false;
12
 var ttfmTrackerVideoAttached = false;
11
 var ttfmTrackerVideoAttached = false;
170
         ttfmTrackerVideoAttached = true;
169
         ttfmTrackerVideoAttached = true;
171
 
170
 
172
     if (RTCBrowserType.isTemasysPluginUsed()) {
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
         // FIXME: this is not working for IE11
176
         // FIXME: this is not working for IE11
174
         AdapterJS.addEvent(container, 'play', this._playCallback.bind(this));
177
         AdapterJS.addEvent(container, 'play', this._playCallback.bind(this));
175
     }
178
     }

+ 7
- 1
modules/RTC/RTCUtils.js 파일 보기

16
 var RTCBrowserType = require("./RTCBrowserType");
16
 var RTCBrowserType = require("./RTCBrowserType");
17
 var Resolutions = require("../../service/RTC/Resolutions");
17
 var Resolutions = require("../../service/RTC/Resolutions");
18
 var RTCEvents = require("../../service/RTC/RTCEvents");
18
 var RTCEvents = require("../../service/RTC/RTCEvents");
19
-var AdapterJS = require("./adapter.screenshare");
20
 var SDPUtil = require("../xmpp/SDPUtil");
19
 var SDPUtil = require("../xmpp/SDPUtil");
21
 var EventEmitter = require("events");
20
 var EventEmitter = require("events");
22
 var screenObtainer = require("./ScreenObtainer");
21
 var screenObtainer = require("./ScreenObtainer");
26
 var CameraFacingMode = require("../../service/RTC/CameraFacingMode");
25
 var CameraFacingMode = require("../../service/RTC/CameraFacingMode");
27
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
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
 var eventEmitter = new EventEmitter();
35
 var eventEmitter = new EventEmitter();
30
 
36
 
31
 var AVAILABLE_DEVICES_POLL_INTERVAL_TIME = 3000; // ms
37
 var AVAILABLE_DEVICES_POLL_INTERVAL_TIME = 3000; // ms

+ 4
- 1
modules/RTC/ScreenObtainer.js 파일 보기

1
 /* global chrome, $, alert */
1
 /* global chrome, $, alert */
2
 
2
 
3
-var AdapterJS = require("./adapter.screenshare");
4
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
3
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
5
 var logger = require("jitsi-meet-logger").getLogger(__filename);
4
 var logger = require("jitsi-meet-logger").getLogger(__filename);
6
 var RTCBrowserType = require("./RTCBrowserType");
5
 var RTCBrowserType = require("./RTCBrowserType");
115
                     });
114
                     });
116
             };
115
             };
117
         } else if (RTCBrowserType.isTemasysPluginUsed()) {
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
             if (!AdapterJS.WebRTCPlugin.plugin.HasScreensharingFeature) {
121
             if (!AdapterJS.WebRTCPlugin.plugin.HasScreensharingFeature) {
119
                 logger.info("Screensharing not supported by this plugin " +
122
                 logger.info("Screensharing not supported by this plugin " +
120
                     "version");
123
                     "version");

Loading…
취소
저장