This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 828
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2498 from matrix-org/travis/usettings/tab/voice
Implement the "Voice & Video" tab of new user settings
- Loading branch information
Showing
7 changed files
with
234 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
/* | ||
Copyright 2019 New Vector Ltd | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
.mx_VoiceSettingsTab .mx_Field select { | ||
width: 100%; | ||
max-width: 100%; | ||
} | ||
|
||
.mx_VoiceSettingsTab .mx_Field { | ||
margin-right: 100px; // align with the rest of the fields | ||
} | ||
|
||
.mx_VoiceSettingsTab_missingMediaPermissions { | ||
margin-bottom: 15px; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,177 @@ | ||
/* | ||
Copyright 2019 New Vector Ltd | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import React from 'react'; | ||
import {_t} from "../../../../languageHandler"; | ||
import CallMediaHandler from "../../../../CallMediaHandler"; | ||
import Field from "../../elements/Field"; | ||
import AccessibleButton from "../../elements/AccessibleButton"; | ||
import {SettingLevel} from "../../../../settings/SettingsStore"; | ||
const Modal = require("../../../../Modal"); | ||
const sdk = require("../../../../index"); | ||
const MatrixClientPeg = require("../../../../MatrixClientPeg"); | ||
|
||
export default class VoiceSettingsTab extends React.Component { | ||
constructor() { | ||
super(); | ||
|
||
this.state = { | ||
mediaDevices: null, | ||
activeAudioOutput: null, | ||
activeAudioInput: null, | ||
activeVideoInput: null, | ||
}; | ||
} | ||
|
||
componentWillMount(): void { | ||
this._refreshMediaDevices(); | ||
} | ||
|
||
_refreshMediaDevices = async () => { | ||
this.setState({ | ||
mediaDevices: await CallMediaHandler.getDevices(), | ||
activeAudioOutput: CallMediaHandler.getAudioOutput(), | ||
activeAudioInput: CallMediaHandler.getAudioInput(), | ||
activeVideoInput: CallMediaHandler.getVideoInput(), | ||
}); | ||
}; | ||
|
||
_requestMediaPermissions = () => { | ||
const getUserMedia = ( | ||
window.navigator.getUserMedia || window.navigator.webkitGetUserMedia || window.navigator.mozGetUserMedia | ||
); | ||
if (getUserMedia) { | ||
return getUserMedia.apply(window.navigator, [ | ||
{ video: true, audio: true }, | ||
this._refreshMediaDevices, | ||
function() { | ||
const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog'); | ||
Modal.createTrackedDialog('No media permissions', '', ErrorDialog, { | ||
title: _t('No media permissions'), | ||
description: _t('You may need to manually permit Riot to access your microphone/webcam'), | ||
}); | ||
}, | ||
]); | ||
} | ||
}; | ||
|
||
_setAudioOutput = (e) => { | ||
CallMediaHandler.setAudioOutput(e.target.value); | ||
}; | ||
|
||
_setAudioInput = (e) => { | ||
CallMediaHandler.setAudioInput(e.target.value); | ||
}; | ||
|
||
_setVideoInput = (e) => { | ||
CallMediaHandler.setVideoInput(e.target.value); | ||
}; | ||
|
||
_setForceTurn = (forced) => { | ||
MatrixClientPeg.get().setForceTURN(forced); | ||
}; | ||
|
||
_renderDeviceOptions(devices, category) { | ||
return devices.map((d) => <option key={`${category}-${d.deviceId}`} value={d.deviceId}>{d.label}</option>); | ||
} | ||
|
||
render() { | ||
const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag"); | ||
|
||
let requestButton = null; | ||
let speakerDropdown = null; | ||
let microphoneDropdown = null; | ||
let webcamDropdown = null; | ||
if (this.state.mediaDevices === false) { | ||
requestButton = ( | ||
<div className='mx_VoiceSettingsTab_missingMediaPermissions'> | ||
<p>{_t("Missing media permissions, click the button below to request.")}</p> | ||
<AccessibleButton onClick={this._requestMediaPermissions} kind="primary"> | ||
{_t("Request media permissions")} | ||
</AccessibleButton> | ||
</div> | ||
); | ||
} else if (this.state.mediaDevices) { | ||
speakerDropdown = <p>{ _t('No Audio Outputs detected') }</p>; | ||
microphoneDropdown = <p>{ _t('No Microphones detected') }</p>; | ||
webcamDropdown = <p>{ _t('No Webcams detected') }</p>; | ||
|
||
const defaultOption = { | ||
deviceId: '', | ||
label: _t('Default Device'), | ||
}; | ||
const getDefaultDevice = (devices) => { | ||
if (!devices.some((i) => i.deviceId === 'default')) { | ||
devices.unshift(defaultOption); | ||
return ''; | ||
} else { | ||
return 'default'; | ||
} | ||
}; | ||
|
||
const audioOutputs = this.state.mediaDevices.audiooutput.slice(0); | ||
if (audioOutputs.length > 0) { | ||
const defaultDevice = getDefaultDevice(audioOutputs); | ||
speakerDropdown = ( | ||
<Field element="select" label={_t("Audio Output")} id="audioOutput" | ||
value={this.state.activeAudioOutput || defaultDevice} | ||
onChange={this._setAudioOutput}> | ||
{this._renderDeviceOptions(audioOutputs, 'audioOutput')} | ||
</Field> | ||
); | ||
} | ||
|
||
const audioInputs = this.state.mediaDevices.audioinput.slice(0); | ||
if (audioInputs.length > 0) { | ||
const defaultDevice = getDefaultDevice(audioInputs); | ||
microphoneDropdown = ( | ||
<Field element="select" label={_t("Microphone")} id="audioInput" | ||
value={this.state.activeAudioInput || defaultDevice} | ||
onChange={this._setAudioInput}> | ||
{this._renderDeviceOptions(audioInputs, 'audioInput')} | ||
</Field> | ||
); | ||
} | ||
|
||
const videoInputs = this.state.mediaDevices.videoinput.slice(0); | ||
if (videoInputs.length > 0) { | ||
const defaultDevice = getDefaultDevice(videoInputs); | ||
webcamDropdown = ( | ||
<Field element="select" label={_t("Camera")} id="videoInput" | ||
value={this.state.activeVideoInput || defaultDevice} | ||
onChange={this._setVideoInput}> | ||
{this._renderDeviceOptions(videoInputs, 'videoInput')} | ||
</Field> | ||
); | ||
} | ||
} | ||
|
||
// TODO: Make 'webRtcForceTURN' be positively worded | ||
return ( | ||
<div className="mx_SettingsTab mx_VoiceSettingsTab"> | ||
<div className="mx_SettingsTab_heading">{_t("Voice & Video")}</div> | ||
<div className="mx_SettingsTab_section"> | ||
{requestButton} | ||
{speakerDropdown} | ||
{microphoneDropdown} | ||
{webcamDropdown} | ||
<SettingsFlag name='VideoView.flipVideoHorizontally' level={SettingLevel.ACCOUNT} /> | ||
<SettingsFlag name='webRtcForceTURN' level={SettingLevel.DEVICE} onChange={this._setForceTurn} /> | ||
</div> | ||
</div> | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters