OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #20 from matrix-org/screen-sharing 

Screen sharing
pull/21833/head
Matthew Hodgson 2015-10-21 01:35:16 +01:00
parent 3d8d9bac8e 3b988b0eac
commit feaf2a319b
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CallHandler.js
View File

@ -163,6 +163,12 @@ function _onAction(payload) {
payload.local_element
);
}
else if (payload.type === 'screensharing') {
newCall.placeScreenSharingCall(
payload.remote_element,
payload.local_element
);
}
else {
console.error("Unknown conf call type: %s", payload.type);
}

4
src/controllers/molecules/RoomHeader.js
View File

@ -69,10 +69,10 @@ module.exports = {
});
},
onVideoClick: function() {
onVideoClick: function(e) {
dis.dispatch({
action: 'place_call',
type: "video",
type: e.shiftKey ? "screensharing" : "video",
room_id: this.props.room.roomId
});
},

4
src/controllers/molecules/voip/CallView.js
View File

@ -54,8 +54,10 @@ module.exports = {
var call = CallHandler.getCall(roomId);
if (call) {
call.setLocalVideoElement(this.getVideoView().getLocalVideoElement());
// N.B. the remote video element is used for playback for audio for voice calls
call.setRemoteVideoElement(this.getVideoView().getRemoteVideoElement());
// give a separate element for audio stream playback - both for voice calls
// and for the voice stream of screen captures
call.setRemoteAudioElement(this.getVideoView().getRemoteAudioElement());
}
if (call && call.type === "video" && call.state !== 'ended') {
this.getVideoView().getLocalVideoElement().style.display = "initial";