From 35b5f6df06903063e10c38fd904926cdede1ed1c Mon Sep 17 00:00:00 2001 From: Hristo Terezov Date: Mon, 26 Oct 2020 13:05:22 -0500 Subject: [PATCH] s/isLocalVideoTrackMuted/isLocalCameraTrackMuted/ --- conference.js | 4 ++-- react/features/app/actions.js | 4 ++-- react/features/base/tracks/functions.js | 4 ++-- react/features/toolbox/components/VideoMuteButton.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conference.js b/conference.js index 5fb6bb9d7..5786b31b0 100644 --- a/conference.js +++ b/conference.js @@ -98,7 +98,7 @@ import { destroyLocalTracks, getLocalJitsiAudioTrack, getLocalJitsiVideoTrack, - isLocalVideoTrackMuted, + isLocalCameraTrackMuted, isLocalTrackMuted, isUserInteractionRequiredForUnmute, replaceLocalTrack, @@ -811,7 +811,7 @@ export default { isLocalVideoMuted() { // If the tracks are not ready, read from base/media state return this._localTracksInitialized - ? isLocalVideoTrackMuted( + ? isLocalCameraTrackMuted( APP.store.getState()['features/base/tracks']) : isVideoMutedByUser(APP.store); }, diff --git a/react/features/app/actions.js b/react/features/app/actions.js index 257e1adb6..95a028777 100644 --- a/react/features/app/actions.js +++ b/react/features/app/actions.js @@ -16,7 +16,7 @@ import { connect, disconnect, setLocationURL } from '../base/connection'; import { loadConfig } from '../base/lib-jitsi-meet'; import { MEDIA_TYPE } from '../base/media'; import { toState } from '../base/redux'; -import { createDesiredLocalTracks, isLocalVideoTrackMuted, isLocalTrackMuted } from '../base/tracks'; +import { createDesiredLocalTracks, isLocalCameraTrackMuted, isLocalTrackMuted } from '../base/tracks'; import { addHashParamsToURL, getBackendSafeRoomName, @@ -232,7 +232,7 @@ export function reloadNow() { function addTrackStateToURL(url, stateful) { const state = toState(stateful); const tracks = state['features/base/tracks']; - const isVideoMuted = isLocalVideoTrackMuted(tracks); + const isVideoMuted = isLocalCameraTrackMuted(tracks); const isAudioMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.AUDIO); return addHashParamsToURL(new URL(url), { // use new URL object in order to not pollute the passed parameter. diff --git a/react/features/base/tracks/functions.js b/react/features/base/tracks/functions.js index e3d47807c..fbcc4af66 100644 --- a/react/features/base/tracks/functions.js +++ b/react/features/base/tracks/functions.js @@ -346,12 +346,12 @@ export function getTracksByMediaType(tracks, mediaType) { } /** - * Checks if the local video track in the given set of tracks is muted. + * Checks if the local video camera track in the given set of tracks is muted. * * @param {Track[]} tracks - List of all tracks. * @returns {Track[]} */ -export function isLocalVideoTrackMuted(tracks) { +export function isLocalCameraTrackMuted(tracks) { const presenterTrack = getLocalTrack(tracks, MEDIA_TYPE.PRESENTER); const videoTrack = getLocalTrack(tracks, MEDIA_TYPE.VIDEO); diff --git a/react/features/toolbox/components/VideoMuteButton.js b/react/features/toolbox/components/VideoMuteButton.js index ae710bc3c..037687982 100644 --- a/react/features/toolbox/components/VideoMuteButton.js +++ b/react/features/toolbox/components/VideoMuteButton.js @@ -18,7 +18,7 @@ import { import { connect } from '../../base/redux'; import { AbstractVideoMuteButton } from '../../base/toolbox/components'; import type { AbstractButtonProps } from '../../base/toolbox/components'; -import { getLocalVideoType, isLocalVideoTrackMuted } from '../../base/tracks'; +import { getLocalVideoType, isLocalCameraTrackMuted } from '../../base/tracks'; declare var APP: Object; @@ -192,7 +192,7 @@ function _mapStateToProps(state): Object { _audioOnly: Boolean(audioOnly), _videoDisabled: !hasAvailableDevices(state, 'videoInput'), _videoMediaType: getLocalVideoType(tracks), - _videoMuted: isLocalVideoTrackMuted(tracks) + _videoMuted: isLocalCameraTrackMuted(tracks) }; }