浏览代码

fix(conference.js): add tracks to the conference

master
Pawel Domas 4 年前
父节点
当前提交
bba1917820
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. 4
    3
      conference.js
  2. 1
    1
      react/features/base/conference/actions.js

+ 4
- 3
conference.js 查看文件

44
     lockStateChanged,
44
     lockStateChanged,
45
     onStartMutedPolicyChanged,
45
     onStartMutedPolicyChanged,
46
     p2pStatusChanged,
46
     p2pStatusChanged,
47
-    sendLocalParticipant
47
+    sendLocalParticipant,
48
+    _conferenceWillJoin
48
 } from './react/features/base/conference';
49
 } from './react/features/base/conference';
49
 import { getReplaceParticipant } from './react/features/base/config/functions';
50
 import { getReplaceParticipant } from './react/features/base/config/functions';
50
 import {
51
 import {
1315
                 APP.conference.roomName,
1316
                 APP.conference.roomName,
1316
                 this._getConferenceOptions());
1317
                 this._getConferenceOptions());
1317
 
1318
 
1318
-        APP.store.dispatch(conferenceWillJoin(room));
1319
-
1320
         // Filter out the tracks that are muted (except on mobile Safari).
1319
         // Filter out the tracks that are muted (except on mobile Safari).
1321
         const tracks = isIosMobileBrowser() ? localTracks : localTracks.filter(track => !track.isMuted());
1320
         const tracks = isIosMobileBrowser() ? localTracks : localTracks.filter(track => !track.isMuted());
1322
 
1321
 
1323
         this._setLocalAudioVideoStreams(tracks);
1322
         this._setLocalAudioVideoStreams(tracks);
1324
         this._room = room; // FIXME do not use this
1323
         this._room = room; // FIXME do not use this
1325
 
1324
 
1325
+        APP.store.dispatch(_conferenceWillJoin(room));
1326
+
1326
         sendLocalParticipant(APP.store, room);
1327
         sendLocalParticipant(APP.store, room);
1327
 
1328
 
1328
         this._setupListeners();
1329
         this._setupListeners();

+ 1
- 1
react/features/base/conference/actions.js 查看文件

357
  * the local participant will (try to) join.
357
  * the local participant will (try to) join.
358
  * @returns {Function}
358
  * @returns {Function}
359
  */
359
  */
360
-function _conferenceWillJoin(conference: Object) {
360
+export function _conferenceWillJoin(conference: Object) {
361
     return (dispatch: Dispatch<any>, getState: Function) => {
361
     return (dispatch: Dispatch<any>, getState: Function) => {
362
         const localTracks
362
         const localTracks
363
             = getLocalTracks(getState()['features/base/tracks'])
363
             = getLocalTracks(getState()['features/base/tracks'])

正在加载...
取消
保存