imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the new interface for providing conf call functionality. Doesn't shoe it in the right room yet.

Browse source
This commit is contained in:
David Baker 2015-09-30 16:52:45 +01:00
parent fd6e7663cb
commit 94a6f856d1
6 changed files with 92 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/molecules/voip/CallView.js
View file

@ -16,9 +16,11 @@ limitations under the License.
'use strict';
var dis = require("../../../dispatcher");
var CallHandler = require("../../../CallHandler");
var CallHandler = require("matrix-react-sdk/lib/CallHandler");
var MatrixClientPeg = require("../../../MatrixClientPeg");
var VectorConferenceHandler = require('./VectorConferenceHandler');
/*
* State vars:
* this.state.call = MatrixCall|null
@ -66,7 +68,10 @@ module.exports = {
},
showCall: function(roomId) {
var call = CallHandler.getCallForRoom(roomId);
var call = (
CallHandler.getCallForRoom(roomId) ||
VectorConferenceHandler.getConferenceCallForRoom(roomId)
);
if (call) {
call.setLocalVideoElement(this.getVideoView().getLocalVideoElement());
// N.B. the remote video element is used for playback for audio for voice calls