You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-11-08 21:42:24 +03:00
change device data structure to array of objects
so that we can set falsey values, for unsetting device
most dolphinately needs testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
@@ -269,8 +269,8 @@ module.exports = React.createClass({
|
||||
if (this._unmounted) return;
|
||||
this.setState({
|
||||
mediaDevices,
|
||||
activeAudioInput: this._localSettings['webrtc_audioinput'] || 'default',
|
||||
activeVideoInput: this._localSettings['webrtc_videoinput'] || 'default',
|
||||
activeAudioInput: this._localSettings['webrtc_audioinput'],
|
||||
activeVideoInput: this._localSettings['webrtc_videoinput'],
|
||||
});
|
||||
});
|
||||
},
|
||||
@@ -902,7 +902,7 @@ module.exports = React.createClass({
|
||||
},
|
||||
|
||||
_mapWebRtcDevicesToSpans: function(devices) {
|
||||
return Object.keys(devices).map((deviceId) => <span key={deviceId}>{devices[deviceId]}</span>);
|
||||
return devices.map((device) => <span key={device.deviceId}>{devices[device.deviceId]}</span>);
|
||||
},
|
||||
|
||||
_setAudioInput: function(deviceId) {
|
||||
@@ -951,8 +951,14 @@ module.exports = React.createClass({
|
||||
let microphoneDropdown = <p>{_t('No Microphones detected')}</p>;
|
||||
let webcamDropdown = <p>{_t('No Webcams detected')}</p>;
|
||||
|
||||
const defaultOption = {
|
||||
deviceId: undefined,
|
||||
label: _t('Default Device'),
|
||||
};
|
||||
|
||||
const audioInputs = this.state.mediaDevices.audioinput;
|
||||
if (Object.keys(audioInputs).length > 0) {
|
||||
if (audioInputs.length > 0) {
|
||||
audioInputs.unshift(defaultOption);
|
||||
microphoneDropdown = <div>
|
||||
<h4>Microphone</h4>
|
||||
<Dropdown
|
||||
@@ -965,7 +971,8 @@ module.exports = React.createClass({
|
||||
}
|
||||
|
||||
const videoInputs = this.state.mediaDevices.videoinput;
|
||||
if (Object.keys(videoInputs).length > 0) {
|
||||
if (videoInputs.length > 0) {
|
||||
videoInputs.unshift(defaultOption);
|
||||
webcamDropdown = <div>
|
||||
<h4>Cameras</h4>
|
||||
<Dropdown
|
||||
|
||||
Reference in New Issue
Block a user