haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skips storing devices (mic and camera) if there is no user selection. 

Skips storing device ids in localstorage if the user hasn't selected a device to use, and keeps using system defaults. Removes calls to private library method for setting initial realDeviceIds, as this had been added to the library.
This commit is contained in:
damencho 2016-09-07 16:48:57 -05:00
parent fe710d8de9
commit 0683f94edb
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conference.js
View File

@ -1416,7 +1416,7 @@ export default {
.then(([stream]) => { .then(([stream]) => {
this.useVideoStream(stream); this.useVideoStream(stream);
console.log('switched local video device'); console.log('switched local video device');
APP.settings.setCameraDeviceId(cameraDeviceId); APP.settings.setCameraDeviceId(cameraDeviceId, true);
}) })
.catch((err) => { .catch((err) => {
APP.UI.showDeviceErrorDialog(null, err); APP.UI.showDeviceErrorDialog(null, err);
@ -1438,7 +1438,7 @@ export default {
.then(([stream]) => { .then(([stream]) => {
this.useAudioStream(stream); this.useAudioStream(stream);
console.log('switched local audio device'); console.log('switched local audio device');
APP.settings.setMicDeviceId(micDeviceId); APP.settings.setMicDeviceId(micDeviceId, true);
}) })
.catch((err) => { .catch((err) => {
APP.UI.showDeviceErrorDialog(err, null); APP.UI.showDeviceErrorDialog(err, null);
@ -1533,13 +1533,13 @@ export default {
// storage and settings menu. This is a workaround until // storage and settings menu. This is a workaround until
// getConstraints() method will be implemented in browsers. // getConstraints() method will be implemented in browsers.
if (localAudio) { if (localAudio) {
localAudio._setRealDeviceIdFromDeviceList(devices); APP.settings.setMicDeviceId(
APP.settings.setMicDeviceId(localAudio.getDeviceId()); localAudio.getDeviceId(), false);
} }
if (localVideo) { if (localVideo) {
localVideo._setRealDeviceIdFromDeviceList(devices); APP.settings.setCameraDeviceId(
APP.settings.setCameraDeviceId(localVideo.getDeviceId()); localVideo.getDeviceId(), false);
} }
mediaDeviceHelper.setCurrentMediaDevices(devices); mediaDeviceHelper.setCurrentMediaDevices(devices);

12
modules/settings/Settings.js
View File

@ -174,10 +174,12 @@ export default {
* Set device id of the camera which is currently in use. * Set device id of the camera which is currently in use.
* Empty string stands for default device. * Empty string stands for default device.
* @param {string} newId new camera device id * @param {string} newId new camera device id
* @param {boolean} whether we need to store the value
*/ */
setCameraDeviceId: function (newId = '') { setCameraDeviceId: function (newId, store) {
cameraDeviceId = newId; cameraDeviceId = newId;
window.localStorage.cameraDeviceId = newId; if (store)
window.localStorage.cameraDeviceId = newId;
}, },
/** /**
@ -192,10 +194,12 @@ export default {
* Set device id of the microphone which is currently in use. * Set device id of the microphone which is currently in use.
* Empty string stands for default device. * Empty string stands for default device.
* @param {string} newId new microphone device id * @param {string} newId new microphone device id
* @param {boolean} whether we need to store the value
*/ */
setMicDeviceId: function (newId = '') { setMicDeviceId: function (newId, store) {
micDeviceId = newId; micDeviceId = newId;
window.localStorage.micDeviceId = newId; if (store)
window.localStorage.micDeviceId = newId;
}, },
/** /**