gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add remoteAudioElement

This commit is contained in:
Matthew Hodgson 2015-10-21 01:22:46 +01:00
parent 5d1ad4d259
commit c8f6d46c8b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,8 +74,10 @@ module.exports = {
); );
if (call) { if (call) {
call.setLocalVideoElement(this.getVideoView().getLocalVideoElement()); 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()); 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') { if (call && call.type === "video" && call.state !== 'ended') {
// if this call is a conf call, don't display local video as the // if this call is a conf call, don't display local video as the

5
src/skins/vector/views/molecules/voip/VideoView.js
View File

@ -34,6 +34,10 @@ module.exports = React.createClass({
return this.refs.remote.getDOMNode(); return this.refs.remote.getDOMNode();
}, },
getRemoteAudioElement: function() {
return this.refs.remoteAudio.getDOMNode();
},
getLocalVideoElement: function() { getLocalVideoElement: function() {
return this.refs.local.getDOMNode(); return this.refs.local.getDOMNode();
}, },
@ -61,6 +65,7 @@ module.exports = React.createClass({
<div className="mx_VideoView" ref={this.setContainer}> <div className="mx_VideoView" ref={this.setContainer}>
<div className="mx_VideoView_remoteVideoFeed"> <div className="mx_VideoView_remoteVideoFeed">
<VideoFeed ref="remote"/> <VideoFeed ref="remote"/>
<audio ref="remoteAudio"/>
</div> </div>
<div className="mx_VideoView_localVideoFeed"> <div className="mx_VideoView_localVideoFeed">
<VideoFeed ref="local"/> <VideoFeed ref="local"/>