Browse Source

s/isLocalVideoTrackMuted/isLocalCameraTrackMuted/

master
Hristo Terezov 5 years ago
parent
commit
35b5f6df06

+ 2
- 2
conference.js View File

98
     destroyLocalTracks,
98
     destroyLocalTracks,
99
     getLocalJitsiAudioTrack,
99
     getLocalJitsiAudioTrack,
100
     getLocalJitsiVideoTrack,
100
     getLocalJitsiVideoTrack,
101
-    isLocalVideoTrackMuted,
101
+    isLocalCameraTrackMuted,
102
     isLocalTrackMuted,
102
     isLocalTrackMuted,
103
     isUserInteractionRequiredForUnmute,
103
     isUserInteractionRequiredForUnmute,
104
     replaceLocalTrack,
104
     replaceLocalTrack,
811
     isLocalVideoMuted() {
811
     isLocalVideoMuted() {
812
         // If the tracks are not ready, read from base/media state
812
         // If the tracks are not ready, read from base/media state
813
         return this._localTracksInitialized
813
         return this._localTracksInitialized
814
-            ? isLocalVideoTrackMuted(
814
+            ? isLocalCameraTrackMuted(
815
                 APP.store.getState()['features/base/tracks'])
815
                 APP.store.getState()['features/base/tracks'])
816
             : isVideoMutedByUser(APP.store);
816
             : isVideoMutedByUser(APP.store);
817
     },
817
     },

+ 2
- 2
react/features/app/actions.js View File

16
 import { loadConfig } from '../base/lib-jitsi-meet';
16
 import { loadConfig } from '../base/lib-jitsi-meet';
17
 import { MEDIA_TYPE } from '../base/media';
17
 import { MEDIA_TYPE } from '../base/media';
18
 import { toState } from '../base/redux';
18
 import { toState } from '../base/redux';
19
-import { createDesiredLocalTracks, isLocalVideoTrackMuted, isLocalTrackMuted } from '../base/tracks';
19
+import { createDesiredLocalTracks, isLocalCameraTrackMuted, isLocalTrackMuted } from '../base/tracks';
20
 import {
20
 import {
21
     addHashParamsToURL,
21
     addHashParamsToURL,
22
     getBackendSafeRoomName,
22
     getBackendSafeRoomName,
232
 function addTrackStateToURL(url, stateful) {
232
 function addTrackStateToURL(url, stateful) {
233
     const state = toState(stateful);
233
     const state = toState(stateful);
234
     const tracks = state['features/base/tracks'];
234
     const tracks = state['features/base/tracks'];
235
-    const isVideoMuted = isLocalVideoTrackMuted(tracks);
235
+    const isVideoMuted = isLocalCameraTrackMuted(tracks);
236
     const isAudioMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.AUDIO);
236
     const isAudioMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.AUDIO);
237
 
237
 
238
     return addHashParamsToURL(new URL(url), { // use new URL object in order to not pollute the passed parameter.
238
     return addHashParamsToURL(new URL(url), { // use new URL object in order to not pollute the passed parameter.

+ 2
- 2
react/features/base/tracks/functions.js View File

346
 }
346
 }
347
 
347
 
348
 /**
348
 /**
349
- * Checks if the local video track in the given set of tracks is muted.
349
+ * Checks if the local video camera track in the given set of tracks is muted.
350
  *
350
  *
351
  * @param {Track[]} tracks - List of all tracks.
351
  * @param {Track[]} tracks - List of all tracks.
352
  * @returns {Track[]}
352
  * @returns {Track[]}
353
  */
353
  */
354
-export function isLocalVideoTrackMuted(tracks) {
354
+export function isLocalCameraTrackMuted(tracks) {
355
     const presenterTrack = getLocalTrack(tracks, MEDIA_TYPE.PRESENTER);
355
     const presenterTrack = getLocalTrack(tracks, MEDIA_TYPE.PRESENTER);
356
     const videoTrack = getLocalTrack(tracks, MEDIA_TYPE.VIDEO);
356
     const videoTrack = getLocalTrack(tracks, MEDIA_TYPE.VIDEO);
357
 
357
 

+ 2
- 2
react/features/toolbox/components/VideoMuteButton.js View File

18
 import { connect } from '../../base/redux';
18
 import { connect } from '../../base/redux';
19
 import { AbstractVideoMuteButton } from '../../base/toolbox/components';
19
 import { AbstractVideoMuteButton } from '../../base/toolbox/components';
20
 import type { AbstractButtonProps } from '../../base/toolbox/components';
20
 import type { AbstractButtonProps } from '../../base/toolbox/components';
21
-import { getLocalVideoType, isLocalVideoTrackMuted } from '../../base/tracks';
21
+import { getLocalVideoType, isLocalCameraTrackMuted } from '../../base/tracks';
22
 
22
 
23
 declare var APP: Object;
23
 declare var APP: Object;
24
 
24
 
192
         _audioOnly: Boolean(audioOnly),
192
         _audioOnly: Boolean(audioOnly),
193
         _videoDisabled: !hasAvailableDevices(state, 'videoInput'),
193
         _videoDisabled: !hasAvailableDevices(state, 'videoInput'),
194
         _videoMediaType: getLocalVideoType(tracks),
194
         _videoMediaType: getLocalVideoType(tracks),
195
-        _videoMuted: isLocalVideoTrackMuted(tracks)
195
+        _videoMuted: isLocalCameraTrackMuted(tracks)
196
     };
196
     };
197
 }
197
 }
198
 
198
 

Loading…
Cancel
Save