Merge branch 'feat-lastn-upgrades' into develop

master
Håvar Aambø Fosstveit 2019-04-04 10:59:25 +02:00
commit be4331714b
2 changed files with 11 additions and 7 deletions

View File

@ -17,11 +17,12 @@ var config =
{
tcp : true
},
lastN : 4,
background : 'images/background.jpg',
lastN : 4,
mobileLastN : 1,
background : 'images/background.jpg',
// Add file and uncomment for adding logo to appbar
// logo : 'images/logo.svg',
theme :
theme :
{
palette :
{

View File

@ -15,7 +15,8 @@ const {
turnServers,
requestTimeout,
transportOptions,
lastN
lastN,
mobileLastN
} = window.config;
const logger = new Logger('RoomClient');
@ -24,8 +25,7 @@ let ROOM_OPTIONS =
{
requestTimeout : requestTimeout,
transportOptions : transportOptions,
turnServers : turnServers,
maxSpotlights : lastN
turnServers : turnServers
};
const VIDEO_CONSTRAINS =
@ -107,7 +107,10 @@ export default class RoomClient
});
// Max spotlights
this._maxSpotlights = ROOM_OPTIONS.maxSpotlights;
if (device.bowser.ios || device.bowser.mobile || device.bowser.android)
this._maxSpotlights = mobileLastN;
else
this._maxSpotlights = lastN;
// Manager of spotlight
this._spotlights = null;