Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-06-06 04:28:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'videocalls' into develop

Browse source 
Conflicts:
	webclient/room/room.html
This commit is contained in:
David Baker 2014-09-19 16:26:46 +01:00
commit 03ac0c91ae
6 changed files with 224 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webclient/room/room-controller.js
View file

@ -860,7 +860,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
var call = new MatrixCall($scope.room_id);
call.onError = $rootScope.onCallError;
call.onHangup = $rootScope.onCallHangup;
call.placeCall({audio: true, video: false});
// remote video element is used for playing audio in voice calls
call.remoteVideoElement = angular.element('#remoteVideo')[0];
call.placeVoiceCall();
$rootScope.currentCall = call;
};
@ -868,7 +870,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
var call = new MatrixCall($scope.room_id);
call.onError = $rootScope.onCallError;
call.onHangup = $rootScope.onCallHangup;
call.placeCall({audio: true, video: true});
call.localVideoElement = angular.element('#localVideo')[0];
call.remoteVideoElement = angular.element('#remoteVideo')[0];
call.placeVideoCall();
$rootScope.currentCall = call;
};