Skip to content

Initially mute camera/microphone when joining conference rooms. #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Initially mute camera/microphone when joining conference rooms. #404

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b624067
Use correct variable name.
fancycode Dec 7, 2016
744b23b
Initially mute camera/microphone when joining conference rooms.
fancycode Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions static/js/controllers/uicontroller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'tex

var displayName = safeDisplayName;

var roomTypeConference = "Conference";

// Init STUN from server config.
(function() {
var stun = mediaStream.config.StunURIs || [];
Expand Down Expand Up @@ -319,8 +321,8 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'tex
mediaStream.webrtc.setVideoMute(cameraMute);
});

$scope.$watch("microphoneMute", function(cameraMute) {
mediaStream.webrtc.setAudioMute(cameraMute);
$scope.$watch("microphoneMute", function(microphoneMute) {
mediaStream.webrtc.setAudioMute(microphoneMute);
});

$scope.$watch("peer", function(c, o) {
Expand Down Expand Up @@ -667,7 +669,23 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'tex
});

$scope.$on("room.updated", function(event, room) {
var oldType = $scope.roomType;
$scope.roomType = room ? room.Type : null;
if (oldType !== roomTypeConference && $scope.roomType == roomTypeConference) {
// Switched to conference more, start calls muted by default.
$scope.resetAutoMuteState = {
"cameraMute": $scope.cameraMute,
"microphoneMute": $scope.microphoneMute
};
$scope.cameraMute = true;
$scope.microphoneMute = true;
} else if (oldType === roomTypeConference && $scope.roomType !== roomTypeConference) {
// No longer in conference room, reset mute state to previous settings.
_.each($scope.resetAutoMuteState, function(v, k) {
$scope[k] = v;
});
$scope.resetAutoMuteState = {};
}
});

// Apply all layout stuff as classes to our element.
Expand Down