+ error = { this.state.previewVideoTrackError }
+ track = { this.state.previewVideoTrack } />
{ this._renderAudioInputPreview() }
@@ -197,17 +231,10 @@ class DeviceSelectionDialog extends Component {
* promise can be for video cleanup and another for audio cleanup.
*/
_attemptPreviewTrackCleanup() {
- const cleanupPromises = [];
-
- if (!this._isPreviewingCurrentVideoTrack()) {
- cleanupPromises.push(this._disposeVideoPreview());
- }
-
- if (!this._isPreviewingCurrentAudioTrack()) {
- cleanupPromises.push(this._disposeAudioPreview());
- }
-
- return cleanupPromises;
+ return Promise.all([
+ this._disposeVideoPreview(),
+ this._disposeAudioPreview()
+ ]);
}
/**
@@ -243,147 +270,7 @@ class DeviceSelectionDialog extends Component {
}
/**
- * Callback invoked when a new audio output device has been selected.
- * Updates the internal state of the user's selection.
- *
- * @param {string} deviceId - The id of the chosen audio output device.
- * @private
- * @returns {void}
- */
- _getAndSetAudioOutput(deviceId) {
- this.setState({
- audioOutput: deviceId
- });
- }
-
- /**
- * Callback invoked when a new audio input device has been selected.
- * Updates the internal state of the user's selection as well as the audio
- * track that should display in the preview. Will reuse the current local
- * audio track if it has been selected.
- *
- * @param {string} deviceId - The id of the chosen audio input device.
- * @private
- * @returns {void}
- */
- _getAndSetAudioTrack(deviceId) {
- this.setState({
- audioInput: deviceId
- }, () => {
- const cleanupPromise = this._isPreviewingCurrentAudioTrack()
- ? Promise.resolve() : this._disposeAudioPreview();
-
- if (this._isCurrentAudioTrack(deviceId)) {
- cleanupPromise
- .then(() => {
- this.setState({
- previewAudioTrack: this.props.currentAudioTrack
- });
- });
- } else {
- cleanupPromise
- .then(() => createLocalTrack('audio', deviceId))
- .then(jitsiLocalTrack => {
- this.setState({
- previewAudioTrack: jitsiLocalTrack
- });
- });
- }
- });
- }
-
- /**
- * Callback invoked when a new video input device has been selected. Updates
- * the internal state of the user's selection as well as the video track
- * that should display in the preview. Will reuse the current local video
- * track if it has been selected.
- *
- * @param {string} deviceId - The id of the chosen video input device.
- * @private
- * @returns {void}
- */
- _getAndSetVideoTrack(deviceId) {
- this.setState({
- videoInput: deviceId
- }, () => {
- const cleanupPromise = this._isPreviewingCurrentVideoTrack()
- ? Promise.resolve() : this._disposeVideoPreview();
-
- if (this._isCurrentVideoTrack(deviceId)) {
- cleanupPromise
- .then(() => {
- this.setState({
- previewVideoTrack: this.props.currentVideoTrack
- });
- });
- } else {
- cleanupPromise
- .then(() => createLocalTrack('video', deviceId))
- .then(jitsiLocalTrack => {
- this.setState({
- previewVideoTrack: jitsiLocalTrack
- });
- });
- }
- });
- }
-
- /**
- * Utility function for determining if the current local audio track has the
- * passed in device id.
- *
- * @param {string} deviceId - The device id to match against.
- * @private
- * @returns {boolean} True if the device id is being used by the local audio
- * track.
- */
- _isCurrentAudioTrack(deviceId) {
- return this.props.currentAudioTrack
- && this.props.currentAudioTrack.getDeviceId() === deviceId;
- }
-
- /**
- * Utility function for determining if the current local video track has the
- * passed in device id.
- *
- * @param {string} deviceId - The device id to match against.
- * @private
- * @returns {boolean} True if the device id is being used by the local
- * video track.
- */
- _isCurrentVideoTrack(deviceId) {
- return this.props.currentVideoTrack
- && this.props.currentVideoTrack.getDeviceId() === deviceId;
- }
-
- /**
- * Utility function for detecting if the current audio preview track is not
- * the currently used audio track.
- *
- * @private
- * @returns {boolean} True if the current audio track is being used for
- * the preview.
- */
- _isPreviewingCurrentAudioTrack() {
- return !this.state.previewAudioTrack
- || this.state.previewAudioTrack === this.props.currentAudioTrack;
- }
-
- /**
- * Utility function for detecting if the current video preview track is not
- * the currently used video track.
- *
- * @private
- * @returns {boolean} True if the current video track is being used as the
- * preview.
- */
- _isPreviewingCurrentVideoTrack() {
- return !this.state.previewVideoTrack
- || this.state.previewVideoTrack === this.props.currentVideoTrack;
- }
-
- /**
- * Cleans existing preview tracks and signal to closeDeviceSelectionDialog.
+ * Disposes preview tracks and signals to close DeviceSelectionDialog.
*
* @private
* @returns {boolean} Returns false to prevent closure until cleanup is
@@ -406,7 +293,7 @@ class DeviceSelectionDialog extends Component {
}
/**
- * Identify changes to the preferred input/output devices and perform
+ * Identifies changes to the preferred input/output devices and perform
* necessary cleanup and requests to use those devices. Closes the modal
* after cleanup and device change requests complete.
*
@@ -421,32 +308,26 @@ class DeviceSelectionDialog extends Component {
this._isClosing = true;
- const deviceChangePromises = [];
+ const deviceChangePromises = this._attemptPreviewTrackCleanup()
+ .then(() => {
+ if (this.state.selectedVideoInputId
+ !== this.props.currentVideoInputId) {
+ this.props.dispatch(
+ setVideoInputDevice(this.state.selectedVideoInputId));
+ }
- if (this.state.videoInput && !this._isPreviewingCurrentVideoTrack()) {
- const changeVideoPromise = this._disposeVideoPreview()
- .then(() => {
- this.props.dispatch(setVideoInputDevice(
- this.state.videoInput));
- });
+ if (this.state.selectedAudioInputId
+ !== this.props.currentAudioInputId) {
+ this.props.dispatch(
+ setAudioInputDevice(this.state.selectedAudioInputId));
+ }
- deviceChangePromises.push(changeVideoPromise);
- }
-
- if (this.state.audioInput && !this._isPreviewingCurrentAudioTrack()) {
- const changeAudioPromise = this._disposeAudioPreview()
- .then(() => {
- this.props.dispatch(setAudioInputDevice(
- this.state.audioInput));
- });
-
- deviceChangePromises.push(changeAudioPromise);
- }
-
- if (this.state.audioOutput
- && this.state.audioOutput !== this.props.currentAudioOutputId) {
- this.props.dispatch(setAudioOutputDevice(this.state.audioOutput));
- }
+ if (this.state.selectedAudioOutputId
+ !== this.props.currentAudioOutputId) {
+ this.props.dispatch(
+ setAudioOutputDevice(this.state.selectedAudioOutputId));
+ }
+ });
Promise.all(deviceChangePromises)
.then(this._closeModal)
@@ -470,8 +351,7 @@ class DeviceSelectionDialog extends Component {
return (