Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better handling of default resolution.

auto_join_3.3
Håvar Aambø Fosstveit 2020-04-30 12:50:23 +02:00
parent 2ece8e9975
commit 1ffa4fdc9a
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/RoomClient.js
View File

@ -31,8 +31,7 @@ let Spotlights;
let requestTimeout, let requestTimeout,
transportOptions, transportOptions,
lastN, lastN,
mobileLastN, mobileLastN;
defaultResolution;
if (process.env.NODE_ENV !== 'test') if (process.env.NODE_ENV !== 'test')
{ {
@ -40,8 +39,7 @@ if (process.env.NODE_ENV !== 'test')
requestTimeout, requestTimeout,
transportOptions, transportOptions,
lastN, lastN,
mobileLastN, mobileLastN
defaultResolution
} = window.config); } = window.config);
} }
@ -205,9 +203,6 @@ export default class RoomClient
// Our WebTorrent client // Our WebTorrent client
this._webTorrent = null; this._webTorrent = null;
if (defaultResolution)
store.dispatch(settingsActions.setVideoResolution(defaultResolution));
// Max spotlights // Max spotlights
if (device.platform === 'desktop') if (device.platform === 'desktop')
this._maxSpotlights = lastN; this._maxSpotlights = lastN;
@ -534,11 +529,6 @@ export default class RoomClient
} }
} }
notify(text)
{
store.dispatch(requestActions.notify({ text: text }));
}
timeoutCallback(callback) timeoutCallback(callback)
{ {
let called = false; let called = false;

3
app/src/reducers/settings.js
View File

@ -4,7 +4,8 @@ const initialState =
selectedWebcam : null, selectedWebcam : null,
selectedAudioDevice : null, selectedAudioDevice : null,
advancedMode : false, advancedMode : false,
resolution : 'medium', // low, medium, high, veryhigh, ultra // low, medium, high, veryhigh, ultra
resolution : window.config.defaultResolution || 'medium',
lastN : 4, lastN : 4,
permanentTopBar : true permanentTopBar : true
}; };