haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/isLocalVideoTrackMuted/isLocalCameraTrackMuted/

This commit is contained in:
Hristo Terezov 2020-10-26 13:05:22 -05:00
parent ca2343c31a
commit 35b5f6df06
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conference.js
View File

@ -98,7 +98,7 @@ import {
destroyLocalTracks, destroyLocalTracks,
getLocalJitsiAudioTrack, getLocalJitsiAudioTrack,
getLocalJitsiVideoTrack, getLocalJitsiVideoTrack,
isLocalVideoTrackMuted, isLocalCameraTrackMuted,
isLocalTrackMuted, isLocalTrackMuted,
isUserInteractionRequiredForUnmute, isUserInteractionRequiredForUnmute,
replaceLocalTrack, replaceLocalTrack,
@ -811,7 +811,7 @@ export default {
isLocalVideoMuted() { isLocalVideoMuted() {
// If the tracks are not ready, read from base/media state // If the tracks are not ready, read from base/media state
return this._localTracksInitialized return this._localTracksInitialized
? isLocalVideoTrackMuted( ? isLocalCameraTrackMuted(
APP.store.getState()['features/base/tracks']) APP.store.getState()['features/base/tracks'])
: isVideoMutedByUser(APP.store); : isVideoMutedByUser(APP.store);
}, },

4
react/features/app/actions.js
View File

@ -16,7 +16,7 @@ import { connect, disconnect, setLocationURL } from '../base/connection';
import { loadConfig } from '../base/lib-jitsi-meet'; import { loadConfig } from '../base/lib-jitsi-meet';
import { MEDIA_TYPE } from '../base/media'; import { MEDIA_TYPE } from '../base/media';
import { toState } from '../base/redux'; import { toState } from '../base/redux';
import { createDesiredLocalTracks, isLocalVideoTrackMuted, isLocalTrackMuted } from '../base/tracks'; import { createDesiredLocalTracks, isLocalCameraTrackMuted, isLocalTrackMuted } from '../base/tracks';
import { import {
addHashParamsToURL, addHashParamsToURL,
getBackendSafeRoomName, getBackendSafeRoomName,
@ -232,7 +232,7 @@ export function reloadNow() {
function addTrackStateToURL(url, stateful) { function addTrackStateToURL(url, stateful) {
const state = toState(stateful); const state = toState(stateful);
const tracks = state['features/base/tracks']; const tracks = state['features/base/tracks'];
const isVideoMuted = isLocalVideoTrackMuted(tracks); const isVideoMuted = isLocalCameraTrackMuted(tracks);
const isAudioMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.AUDIO); const isAudioMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.AUDIO);
return addHashParamsToURL(new URL(url), { // use new URL object in order to not pollute the passed parameter. return addHashParamsToURL(new URL(url), { // use new URL object in order to not pollute the passed parameter.

4
react/features/base/tracks/functions.js
View File

@ -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. * @param {Track[]} tracks - List of all tracks.
* @returns {Track[]} * @returns {Track[]}
*/ */
export function isLocalVideoTrackMuted(tracks) { export function isLocalCameraTrackMuted(tracks) {
const presenterTrack = getLocalTrack(tracks, MEDIA_TYPE.PRESENTER); const presenterTrack = getLocalTrack(tracks, MEDIA_TYPE.PRESENTER);
const videoTrack = getLocalTrack(tracks, MEDIA_TYPE.VIDEO); const videoTrack = getLocalTrack(tracks, MEDIA_TYPE.VIDEO);

4
react/features/toolbox/components/VideoMuteButton.js
View File

@ -18,7 +18,7 @@ import {
import { connect } from '../../base/redux'; import { connect } from '../../base/redux';
import { AbstractVideoMuteButton } from '../../base/toolbox/components'; import { AbstractVideoMuteButton } from '../../base/toolbox/components';
import type { AbstractButtonProps } 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; declare var APP: Object;
@ -192,7 +192,7 @@ function _mapStateToProps(state): Object {
_audioOnly: Boolean(audioOnly), _audioOnly: Boolean(audioOnly),
_videoDisabled: !hasAvailableDevices(state, 'videoInput'), _videoDisabled: !hasAvailableDevices(state, 'videoInput'),
_videoMediaType: getLocalVideoType(tracks), _videoMediaType: getLocalVideoType(tracks),
_videoMuted: isLocalVideoTrackMuted(tracks) _videoMuted: isLocalCameraTrackMuted(tracks)
}; };
} }