summary refs log tree commit diff
path: root/webclient/index.html
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-09-17 16:26:35 +0100
committerDavid Baker <dbkr@matrix.org>2014-09-17 16:26:35 +0100
commit1fb2c831e824d89aa849fc2aee45f5f1162842b2 (patch)
tree124f735faff26a592517ce88aa99bcf1f9cd712a /webclient/index.html
parentTime out calls from both ends properly. (diff)
downloadsynapse-1fb2c831e824d89aa849fc2aee45f5f1162842b2.tar.xz
Video calling (in a tiny box at the moment)
Diffstat (limited to 'webclient/index.html')
-rw-r--r--webclient/index.html8
1 files changed, 6 insertions, 2 deletions
diff --git a/webclient/index.html b/webclient/index.html
index 7e4dcb8345..19b1a3b288 100644
--- a/webclient/index.html
+++ b/webclient/index.html
@@ -58,7 +58,8 @@
                     <br />
                     <span id="callState">
                         <span ng-show="currentCall.state == 'invite_sent'">Calling...</span>
-                        <span ng-show="currentCall.state == 'ringing'">Incoming Call</span>
+                        <span ng-show="currentCall.state == 'ringing' && currentCall.type == 'video'">Incoming Video Call</span>
+                        <span ng-show="currentCall.state == 'ringing' && currentCall.type == 'voice'">Incoming Voice Call</span>
                         <span ng-show="currentCall.state == 'connecting'">Call Connecting...</span>
                         <span ng-show="currentCall.state == 'connected'">Call Connected</span>
                         <span ng-show="currentCall.state == 'ended' && !currentCall.didConnect && currentCall.direction == 'outbound' && currentCall.hangupParty == 'remote'">Call Rejected</span>
@@ -71,7 +72,7 @@
                     </span>
                 </div>
                 <span ng-show="currentCall.state == 'ringing'">
-                    <button ng-click="answerCall()">Answer</button>
+                    <button ng-click="answerCall()">Answer {{ currentCall.type }} call</button>
                     <button ng-click="hangupCall()">Reject</button>
                 </span>
                 <button ng-click="hangupCall()" ng-show="currentCall && currentCall.state != 'ringing' && currentCall.state != 'ended' && currentCall.state != 'fledgling'">Hang up</button>
@@ -92,6 +93,9 @@
                     <source src="media/busy.mp3" type="audio/mpeg" />
                 </audio>
             </div>
+            <video id="localVideo" ng-show="currentCall && currentCall.type == 'video' && (currentCall.state == 'connected' || currentCall.state == 'connecting' || currentCall.state == 'invite_sent')"></video>
+            <video id="remoteVideo" ng-show="currentCall && currentCall.type == 'video' && currentCall.state == 'connected'"></video>
+
             <a href id="headerUserId" ng-click='goToUserPage(user_id)'>{{ user_id }}</a>
             &nbsp;
             <button ng-click='goToPage("/")'>Home</button>