removed setCanChangeWebcam becaus not needed and this fixes the bug with unable to select camara if only 1 webcam is connected
parent
d358170be9
commit
6d9ebacee3
|
|
@ -1730,8 +1730,6 @@ export default class RoomClient
|
||||||
else if (!this._webcams.has(currentWebcamId))
|
else if (!this._webcams.has(currentWebcamId))
|
||||||
this._webcam.device = array[0];
|
this._webcam.device = array[0];
|
||||||
|
|
||||||
this._dispatch(
|
|
||||||
stateActions.setCanChangeWebcam(len >= 2));
|
|
||||||
if (len >= 1)
|
if (len >= 1)
|
||||||
this._dispatch(
|
this._dispatch(
|
||||||
stateActions.setWebcamDevices(this._webcams));
|
stateActions.setWebcamDevices(this._webcams));
|
||||||
|
|
|
||||||
|
|
@ -22,12 +22,6 @@ const Settings = ({
|
||||||
}) =>
|
}) =>
|
||||||
{
|
{
|
||||||
let webcams;
|
let webcams;
|
||||||
let webcamText;
|
|
||||||
|
|
||||||
if (me.canChangeWebcam)
|
|
||||||
webcamText = 'Select camera';
|
|
||||||
else
|
|
||||||
webcamText = 'Unable to select camera';
|
|
||||||
|
|
||||||
if (me.webcamDevices)
|
if (me.webcamDevices)
|
||||||
webcams = Array.from(me.webcamDevices.values());
|
webcams = Array.from(me.webcamDevices.values());
|
||||||
|
|
@ -51,13 +45,12 @@ const Settings = ({
|
||||||
<div data-component='Settings'>
|
<div data-component='Settings'>
|
||||||
<div className='settings'>
|
<div className='settings'>
|
||||||
<Dropdown
|
<Dropdown
|
||||||
disabled={!me.canChangeWebcam}
|
|
||||||
options={webcams}
|
options={webcams}
|
||||||
value={findOption(webcams, me.selectedWebcam)}
|
value={findOption(webcams, me.selectedWebcam)}
|
||||||
onChange={(webcam) => handleChangeWebcam(webcam.value)}
|
onChange={(webcam) => handleChangeWebcam(webcam.value)}
|
||||||
placeholder={webcamText}
|
placeholder={'Select camera'}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Dropdown
|
<Dropdown
|
||||||
disabled={!me.canChangeAudioDevice}
|
disabled={!me.canChangeAudioDevice}
|
||||||
options={audioDevices}
|
options={audioDevices}
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ export const Me = PropTypes.shape(
|
||||||
device : Device.isRequired,
|
device : Device.isRequired,
|
||||||
canSendMic : PropTypes.bool.isRequired,
|
canSendMic : PropTypes.bool.isRequired,
|
||||||
canSendWebcam : PropTypes.bool.isRequired,
|
canSendWebcam : PropTypes.bool.isRequired,
|
||||||
canChangeWebcam : PropTypes.bool.isRequired,
|
|
||||||
webcamInProgress : PropTypes.bool.isRequired,
|
webcamInProgress : PropTypes.bool.isRequired,
|
||||||
audioOnly : PropTypes.bool.isRequired,
|
audioOnly : PropTypes.bool.isRequired,
|
||||||
audioOnlyInProgress : PropTypes.bool.isRequired,
|
audioOnlyInProgress : PropTypes.bool.isRequired,
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@
|
||||||
device : { flag: 'firefox', name: 'Firefox', version: '61' },
|
device : { flag: 'firefox', name: 'Firefox', version: '61' },
|
||||||
canSendMic : true,
|
canSendMic : true,
|
||||||
canSendWebcam : true,
|
canSendWebcam : true,
|
||||||
canChangeWebcam : false,
|
|
||||||
webcamInProgress : false,
|
webcamInProgress : false,
|
||||||
audioOnly : false,
|
audioOnly : false,
|
||||||
audioOnlyInProgress : false,
|
audioOnlyInProgress : false,
|
||||||
|
|
|
||||||
|
|
@ -62,14 +62,6 @@ export const setAudioDevices = (devices) =>
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const setCanChangeWebcam = (flag) =>
|
|
||||||
{
|
|
||||||
return {
|
|
||||||
type : 'SET_CAN_CHANGE_WEBCAM',
|
|
||||||
payload : flag
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export const setWebcamDevices = (devices) =>
|
export const setWebcamDevices = (devices) =>
|
||||||
{
|
{
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue