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

Move a couple calls to update VideoLayout into the redux update flow (#3173) 

* ref(video-layout): move middleware for TRACK_ADDED

* ref(video-layout): call mucJoined when redux knowns of conference join
This commit is contained in:
virtuacoplenny 2018-06-21 21:33:33 -07:00 committed by bbaldino
parent 11c9d5f0ef
commit 2bd0f77671
4 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conference.js
View File

@ -2301,10 +2301,10 @@ export default {
APP.store.dispatch(conferenceJoined(room)); APP.store.dispatch(conferenceJoined(room));
APP.UI.mucJoined();
const displayName const displayName
= APP.store.getState()['features/base/settings'].displayName; = APP.store.getState()['features/base/settings'].displayName;
APP.UI.changeDisplayName('localVideoContainer', displayName);
APP.API.notifyConferenceJoined( APP.API.notifyConferenceJoined(
this.roomName, this.roomName,
this._room.myUserId(), this._room.myUserId(),

17
modules/UI/UI.js
View File

@ -267,16 +267,6 @@ UI.initConference = function() {
followMeHandler = new FollowMe(APP.conference, UI); followMeHandler = new FollowMe(APP.conference, UI);
}; };
UI.mucJoined = function() {
VideoLayout.mucJoined();
// Update local video now that a conference is joined a user ID should be
// set.
UI.changeDisplayName(
'localVideoContainer',
APP.conference.getLocalDisplayName());
};
/** * /** *
* Handler for toggling filmstrip * Handler for toggling filmstrip
*/ */
@ -415,13 +405,6 @@ UI.addLocalStream = track => {
} }
}; };
/**
* Show remote stream on UI.
* @param {JitsiTrack} track stream to show
*/
UI.addRemoteStream = track => VideoLayout.onRemoteStreamAdded(track);
/** /**
* Removed remote stream from UI. * Removed remote stream from UI.
* @param {JitsiTrack} track stream to remove * @param {JitsiTrack} track stream to remove

9
react/features/base/tracks/middleware.js
View File

@ -15,7 +15,6 @@ import UIEvents from '../../../../service/UI/UIEvents';
import { createLocalTracksA } from './actions'; import { createLocalTracksA } from './actions';
import { import {
TOGGLE_SCREENSHARING, TOGGLE_SCREENSHARING,
TRACK_ADDED,
TRACK_REMOVED, TRACK_REMOVED,
TRACK_UPDATED TRACK_UPDATED
} from './actionTypes'; } from './actionTypes';
@ -93,14 +92,6 @@ MiddlewareRegistry.register(store => next => action => {
} }
break; break;
case TRACK_ADDED:
// TODO Remove this middleware case once all UI interested in new tracks
// being added are converted to react and listening for store changes.
if (typeof APP !== 'undefined' && !action.track.local) {
APP.UI.addRemoteStream(action.track.jitsiTrack);
}
break;
case TRACK_REMOVED: case TRACK_REMOVED:
// TODO Remove this middleware case once all UI interested in tracks // TODO Remove this middleware case once all UI interested in tracks
// being removed are converted to react and listening for store changes. // being removed are converted to react and listening for store changes.

13
react/features/video-layout/middleware.web.js
View File

@ -3,6 +3,7 @@
import VideoLayout from '../../../modules/UI/videolayout/VideoLayout.js'; import VideoLayout from '../../../modules/UI/videolayout/VideoLayout.js';
import UIEvents from '../../../service/UI/UIEvents'; import UIEvents from '../../../service/UI/UIEvents';
import { CONFERENCE_JOINED } from '../base/conference';
import { import {
DOMINANT_SPEAKER_CHANGED, DOMINANT_SPEAKER_CHANGED,
PARTICIPANT_JOINED, PARTICIPANT_JOINED,
@ -12,6 +13,7 @@ import {
getParticipantById getParticipantById
} from '../base/participants'; } from '../base/participants';
import { MiddlewareRegistry } from '../base/redux'; import { MiddlewareRegistry } from '../base/redux';
import { TRACK_ADDED } from '../base/tracks';
declare var APP: Object; declare var APP: Object;
@ -30,6 +32,10 @@ MiddlewareRegistry.register(store => next => action => {
const result = next(action); const result = next(action);
switch (action.type) { switch (action.type) {
case CONFERENCE_JOINED:
VideoLayout.mucJoined();
break;
case PARTICIPANT_JOINED: case PARTICIPANT_JOINED:
if (!action.participant.local) { if (!action.participant.local) {
VideoLayout.addRemoteParticipantContainer( VideoLayout.addRemoteParticipantContainer(
@ -63,6 +69,13 @@ MiddlewareRegistry.register(store => next => action => {
action.participant.id, action.participant.id,
Boolean(action.participant.id)); Boolean(action.participant.id));
break; break;
case TRACK_ADDED:
if (!action.track.local) {
VideoLayout.onRemoteStreamAdded(action.track.jitsiTrack);
}
break;
} }
return result; return result;