fix(shared-video) fix exception on mobile
Also use the "standardized" way of instantiating loggers.
This commit is contained in:
parent
5fbf741278
commit
8fabba1679
|
@ -0,0 +1,3 @@
|
||||||
|
import { getLogger } from '../base/logging/functions';
|
||||||
|
|
||||||
|
export default getLogger('features/share-video');
|
|
@ -1,6 +1,5 @@
|
||||||
// @flow
|
// @flow
|
||||||
|
|
||||||
import Logger from '@jitsi/logger';
|
|
||||||
import { batch } from 'react-redux';
|
import { batch } from 'react-redux';
|
||||||
|
|
||||||
import { CONFERENCE_JOIN_IN_PROGRESS, CONFERENCE_LEFT } from '../base/conference/actionTypes';
|
import { CONFERENCE_JOIN_IN_PROGRESS, CONFERENCE_LEFT } from '../base/conference/actionTypes';
|
||||||
|
@ -22,8 +21,8 @@ import {
|
||||||
} from './actions.any';
|
} from './actions.any';
|
||||||
import { SHARED_VIDEO, VIDEO_PLAYER_PARTICIPANT_NAME, PLAYBACK_STATUSES } from './constants';
|
import { SHARED_VIDEO, VIDEO_PLAYER_PARTICIPANT_NAME, PLAYBACK_STATUSES } from './constants';
|
||||||
import { isSharingStatus } from './functions';
|
import { isSharingStatus } from './functions';
|
||||||
|
import logger from './logger';
|
||||||
|
|
||||||
const logger = Logger.getLogger(__filename);
|
|
||||||
|
|
||||||
declare var APP: Object;
|
declare var APP: Object;
|
||||||
|
|
||||||
|
@ -83,7 +82,10 @@ MiddlewareRegistry.register(store => next => action => {
|
||||||
const operator = status === PLAYBACK_STATUSES.PLAYING ? 'is' : '';
|
const operator = status === PLAYBACK_STATUSES.PLAYING ? 'is' : '';
|
||||||
|
|
||||||
logger.debug(`User with id: ${ownerId} ${operator} ${status} video sharing.`);
|
logger.debug(`User with id: ${ownerId} ${operator} ${status} video sharing.`);
|
||||||
|
|
||||||
|
if (typeof APP !== 'undefined') {
|
||||||
APP.API.notifyAudioOrVideoSharingToggled(MEDIA_TYPE.VIDEO, status, ownerId);
|
APP.API.notifyAudioOrVideoSharingToggled(MEDIA_TYPE.VIDEO, status, ownerId);
|
||||||
|
}
|
||||||
|
|
||||||
if (localParticipantId === ownerId) {
|
if (localParticipantId === ownerId) {
|
||||||
sendShareVideoCommand({
|
sendShareVideoCommand({
|
||||||
|
@ -102,8 +104,16 @@ MiddlewareRegistry.register(store => next => action => {
|
||||||
const localParticipantId = getLocalParticipant(state)?.id;
|
const localParticipantId = getLocalParticipant(state)?.id;
|
||||||
const { ownerId: stateOwnerId, videoUrl: statevideoUrl } = state['features/shared-video'];
|
const { ownerId: stateOwnerId, videoUrl: statevideoUrl } = state['features/shared-video'];
|
||||||
|
|
||||||
|
if (!stateOwnerId) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
logger.debug(`User with id: ${stateOwnerId} stop video sharing.`);
|
logger.debug(`User with id: ${stateOwnerId} stop video sharing.`);
|
||||||
|
|
||||||
|
if (typeof APP !== 'undefined') {
|
||||||
APP.API.notifyAudioOrVideoSharingToggled(MEDIA_TYPE.VIDEO, 'stop', stateOwnerId);
|
APP.API.notifyAudioOrVideoSharingToggled(MEDIA_TYPE.VIDEO, 'stop', stateOwnerId);
|
||||||
|
}
|
||||||
|
|
||||||
if (localParticipantId === stateOwnerId) {
|
if (localParticipantId === stateOwnerId) {
|
||||||
const conference = getCurrentConference(state);
|
const conference = getCurrentConference(state);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue