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

fix(filmstrip-only): DeviceSelectionPopup

This commit is contained in:
Hristo Terezov 2019-03-28 13:08:00 +00:00
parent a7aaf31c79
commit f2e0704b93
4 changed files with 67 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
doc/api.md
View File

@ -114,9 +114,24 @@ api.getAvailableDevices().then(function(devices) {
```javascript ```javascript
api.getCurrentDevices().then(function(devices) { api.getCurrentDevices().then(function(devices) {
// devices = { // devices = {
// 'audioInput': 'deviceLabel', // 'audioInput': {
// 'audioOutput': 'deviceLabel', // deviceId: "ID"
// 'videoInput': 'deviceLabel' // groupId: "grpID"
// kind: "videoInput"
// label: "Label"
// },
// 'audioOutput': {
// deviceId: "ID"
// groupId: "grpID"
// kind: "videoInput"
// label: "Label"
// },
// 'videoInput': {
// deviceId: "ID"
// groupId: "grpID"
// kind: "videoInput"
// label: "Label"
// }
// } // }
... ...
}); });
@ -143,20 +158,20 @@ api.isMultipleAudioInputSupported().then(function(isMultipleAudioInputSupported)
... ...
}); });
``` ```
* **setAudioInputDevice** - Sets the audio input device to the one with the label that is passed. * **setAudioInputDevice** - Sets the audio input device to the one with the label or id that is passed.
```javascript ```javascript
api.setAudioInputDevice(deviceLabel); api.setAudioInputDevice(deviceLabel, deviceId);
``` ```
* **setAudioOutputDevice** - Sets the audio output device to the one with the label that is passed. * **setAudioOutputDevice** - Sets the audio output device to the one with the label or id that is passed.
```javascript ```javascript
api.setAudioOutputDevice(deviceLabel); api.setAudioOutputDevice(deviceLabel, deviceId);
``` ```
* **setVideoInputDevice** - Sets the video input device to the one with the label that is passed. * **setVideoInputDevice** - Sets the video input device to the one with the label or id that is passed.
```javascript ```javascript
api.setVideoInputDevice(deviceLabel); api.setVideoInputDevice(deviceLabel, deviceId);
``` ```
You can control the embedded Jitsi Meet conference using the `JitsiMeetExternalAPI` object by using `executeCommand`: You can control the embedded Jitsi Meet conference using the `JitsiMeetExternalAPI` object by using `executeCommand`:

30
modules/API/external/functions.js vendored
View File

@ -101,32 +101,36 @@ export function isMultipleAudioInputSupported(transport: Object) {
} }
/** /**
* Sets the audio input device to the one with the id that is passed. * Sets the audio input device to the one with the label or id that is passed.
* *
* @param {Transport} transport - The @code{Transport} instance responsible for * @param {Transport} transport - The @code{Transport} instance responsible for
* the external communication. * the external communication.
* @param {string} label - The label of the new device. * @param {string} label - The label of the new device.
* @param {string} id - The id of the new device.
* @returns {Promise} * @returns {Promise}
*/ */
export function setAudioInputDevice(transport: Object, label: string) { export function setAudioInputDevice(transport: Object, label: string, id: string) {
return _setDevice(transport, { return _setDevice(transport, {
label, id,
kind: 'audioinput' kind: 'audioinput',
label
}); });
} }
/** /**
* Sets the audio output device to the one with the id that is passed. * Sets the audio output device to the one with the label or id that is passed.
* *
* @param {Transport} transport - The @code{Transport} instance responsible for * @param {Transport} transport - The @code{Transport} instance responsible for
* the external communication. * the external communication.
* @param {string} label - The label of the new device. * @param {string} label - The label of the new device.
* @param {string} id - The id of the new device.
* @returns {Promise} * @returns {Promise}
*/ */
export function setAudioOutputDevice(transport: Object, label: string) { export function setAudioOutputDevice(transport: Object, label: string, id: string) {
return _setDevice(transport, { return _setDevice(transport, {
label, id,
kind: 'audiooutput' kind: 'audiooutput',
label
}); });
} }
@ -147,16 +151,18 @@ function _setDevice(transport: Object, device) {
} }
/** /**
* Sets the video input device to the one with the id that is passed. * Sets the video input device to the one with the label or id that is passed.
* *
* @param {Transport} transport - The @code{Transport} instance responsible for * @param {Transport} transport - The @code{Transport} instance responsible for
* the external communication. * the external communication.
* @param {string} label - The label of the new device. * @param {string} label - The label of the new device.
* @param {string} id - The id of the new device.
* @returns {Promise} * @returns {Promise}
*/ */
export function setVideoInputDevice(transport: Object, label: string) { export function setVideoInputDevice(transport: Object, label: string, id: string) {
return _setDevice(transport, { return _setDevice(transport, {
label, id,
kind: 'videoinput' kind: 'videoinput',
label
}); });
} }

13
react/features/device-selection/functions.js
View File

@ -84,16 +84,18 @@ export function processRequest( // eslint-disable-line max-params
const audioOutputDeviceId = getAudioOutputDeviceId(); const audioOutputDeviceId = getAudioOutputDeviceId();
const { cameraDeviceId, micDeviceId } = settings; const { cameraDeviceId, micDeviceId } = settings;
devices.forEach(({ deviceId, label }) => { devices.forEach(device => {
const { deviceId } = device;
switch (deviceId) { switch (deviceId) {
case micDeviceId: case micDeviceId:
audioInput = label; audioInput = device;
break; break;
case audioOutputDeviceId: case audioOutputDeviceId:
audioOutput = label; audioOutput = device;
break; break;
case cameraDeviceId: case cameraDeviceId:
videoInput = label; videoInput = device;
break; break;
} }
}); });
@ -145,7 +147,8 @@ export function processRequest( // eslint-disable-line max-params
return true; return true;
} }
const deviceId = getDeviceIdByLabel(state, device.label); const { label, id } = device;
const deviceId = label ? getDeviceIdByLabel(state, device.label) : id;
if (deviceId) { if (deviceId) {
switch (device.kind) { switch (device.kind) {

22
react/features/settings/components/web/DeviceSelectionPopup.js
View File

@ -18,7 +18,7 @@ import {
setAudioInputDevice, setAudioInputDevice,
setAudioOutputDevice, setAudioOutputDevice,
setVideoInputDevice setVideoInputDevice
} from '../../../../../modules/API/external'; } from '../../../../../modules/API/external/functions';
import { parseURLParams } from '../../../base/config'; import { parseURLParams } from '../../../base/config';
import { DialogWithTabs } from '../../../base/dialog'; import { DialogWithTabs } from '../../../base/dialog';
@ -118,7 +118,19 @@ export default class DeviceSelectionPopup {
* @returns {Promise} * @returns {Promise}
*/ */
_getCurrentDevices() { _getCurrentDevices() {
return getCurrentDevices(this._transport); return getCurrentDevices(this._transport).then(currentDevices => {
const {
audioInput = {},
audioOutput = {},
videoInput = {}
} = currentDevices;
return {
audioInput: audioInput.deviceId,
audioOutput: audioOutput.deviceId,
videoInput: videoInput.deviceId
};
});
} }
/** /**
@ -252,7 +264,7 @@ export default class DeviceSelectionPopup {
* @returns {Promise} * @returns {Promise}
*/ */
_setAudioInputDevice(id) { _setAudioInputDevice(id) {
return setAudioInputDevice(this._transport, id); return setAudioInputDevice(this._transport, undefined, id);
} }
/** /**
@ -262,7 +274,7 @@ export default class DeviceSelectionPopup {
* @returns {Promise} * @returns {Promise}
*/ */
_setAudioOutputDevice(id) { _setAudioOutputDevice(id) {
return setAudioOutputDevice(this._transport, id); return setAudioOutputDevice(this._transport, undefined, id);
} }
/** /**
@ -272,7 +284,7 @@ export default class DeviceSelectionPopup {
* @returns {Promise} * @returns {Promise}
*/ */
_setVideoInputDevice(id) { _setVideoInputDevice(id) {
return setVideoInputDevice(this._transport, id); return setVideoInputDevice(this._transport, undefined, id);
} }
/** /**