From c8f6d46c8b39df76d4b3197f6a36132efe005244 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 21 Oct 2015 01:22:46 +0100
Subject: [PATCH] add remoteAudioElement

---
 src/controllers/molecules/voip/CallView.js         | 4 +++-
 src/skins/vector/views/molecules/voip/VideoView.js | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/controllers/molecules/voip/CallView.js b/src/controllers/molecules/voip/CallView.js
index d511b9d418..b16655679a 100644
--- a/src/controllers/molecules/voip/CallView.js
+++ b/src/controllers/molecules/voip/CallView.js
@@ -74,8 +74,10 @@ module.exports = {
         );
         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') {
             // if this call is a conf call, don't display local video as the
diff --git a/src/skins/vector/views/molecules/voip/VideoView.js b/src/skins/vector/views/molecules/voip/VideoView.js
index 196e1d6c53..2bac88699c 100644
--- a/src/skins/vector/views/molecules/voip/VideoView.js
+++ b/src/skins/vector/views/molecules/voip/VideoView.js
@@ -34,6 +34,10 @@ module.exports = React.createClass({
         return this.refs.remote.getDOMNode();
     },
 
+    getRemoteAudioElement: function() {
+        return this.refs.remoteAudio.getDOMNode();
+    },
+
     getLocalVideoElement: function() {
         return this.refs.local.getDOMNode();
     },
@@ -61,6 +65,7 @@ module.exports = React.createClass({
             <div className="mx_VideoView" ref={this.setContainer}>
                 <div className="mx_VideoView_remoteVideoFeed">
                     <VideoFeed ref="remote"/>
+                    <audio ref="remoteAudio"/>
                 </div>
                 <div className="mx_VideoView_localVideoFeed">                
                     <VideoFeed ref="local"/>