Browse Source

fix(screenshot-capture): Move the flag for enabling/disabling the feature to config.js

This will let us enable/disable the feature based on environment/deployment
master
Jaya Allamsetty 5 years ago
parent
commit
9855fac805

+ 6
- 3
conference.js View File

1460
         } else {
1460
         } else {
1461
             promise = promise.then(() => this.useVideoStream(null));
1461
             promise = promise.then(() => this.useVideoStream(null));
1462
         }
1462
         }
1463
-
1464
-        APP.store.dispatch(toggleScreenshotCaptureEffect(false));
1463
+        if (config.enableScreenshotCapture) {
1464
+            APP.store.dispatch(toggleScreenshotCaptureEffect(false));
1465
+        }
1465
 
1466
 
1466
         return promise.then(
1467
         return promise.then(
1467
             () => {
1468
             () => {
1734
             .then(stream => this.useVideoStream(stream))
1735
             .then(stream => this.useVideoStream(stream))
1735
             .then(() => {
1736
             .then(() => {
1736
                 this.videoSwitchInProgress = false;
1737
                 this.videoSwitchInProgress = false;
1737
-                APP.store.dispatch(toggleScreenshotCaptureEffect(true));
1738
+                if (config.enableScreenshotCapture) {
1739
+                    APP.store.dispatch(toggleScreenshotCaptureEffect(true));
1740
+                }
1738
                 sendAnalytics(createScreenSharingEvent('started'));
1741
                 sendAnalytics(createScreenSharingEvent('started'));
1739
                 logger.log('Screen sharing started');
1742
                 logger.log('Screen sharing started');
1740
             })
1743
             })

+ 0
- 5
interface_config.js View File

190
      */
190
      */
191
     AUTO_PIN_LATEST_SCREEN_SHARE: 'remote-only',
191
     AUTO_PIN_LATEST_SCREEN_SHARE: 'remote-only',
192
 
192
 
193
-    /**
194
-     * If we should capture periodic screenshots of the content sharing.
195
-     */
196
-    ENABLE_SCREENSHOT_CAPTURE: false,
197
-
198
     /**
193
     /**
199
      * If true, presence status: busy, calling, connected etc. is not displayed.
194
      * If true, presence status: busy, calling, connected etc. is not displayed.
200
      */
195
      */

+ 1
- 0
react/features/base/config/configWhitelist.js View File

96
     'enableLayerSuspension',
96
     'enableLayerSuspension',
97
     'enableLipSync',
97
     'enableLipSync',
98
     'enableRemb',
98
     'enableRemb',
99
+    'enableScreenshotCapture',
99
     'enableTalkWhileMuted',
100
     'enableTalkWhileMuted',
100
     'enableNoAudioDetection',
101
     'enableNoAudioDetection',
101
     'enableNoisyMicDetection',
102
     'enableNoisyMicDetection',

+ 1
- 5
react/features/stream-effects/screenshot-capture/ScreenshotCaptureEffect.js View File

57
      * @returns {boolean} - Returns true if this effect can run on the specified track, false otherwise.
57
      * @returns {boolean} - Returns true if this effect can run on the specified track, false otherwise.
58
      */
58
      */
59
     isEnabled(jitsiLocalTrack: Object) {
59
     isEnabled(jitsiLocalTrack: Object) {
60
-        return (
61
-            interfaceConfig.ENABLE_SCREENSHOT_CAPTURE
62
-            && jitsiLocalTrack.isVideoTrack()
63
-            && jitsiLocalTrack.videoType === 'desktop'
64
-        );
60
+        return jitsiLocalTrack.isVideoTrack() && jitsiLocalTrack.videoType === 'desktop';
65
     }
61
     }
66
 
62
 
67
     /**
63
     /**

Loading…
Cancel
Save