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

simplify Promise chaining in FlacAdapter

This commit is contained in:
Radium Zheng 2018-08-01 11:19:47 +10:00
parent 1078fa9d05
commit e2def5f88b
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
react/features/local-recording/recording/flac/FlacAdapter.js
View File

@ -145,25 +145,20 @@ export class FlacAdapter extends RecordingAdapter {
/** /**
* Replaces the current microphone MediaStream. * Replaces the current microphone MediaStream.
* *
* @param {*} micDeviceId - New microphone ID. * @param {string} micDeviceId - New microphone ID.
* @returns {Promise} * @returns {Promise}
*/ */
_replaceMic(micDeviceId) { _replaceMic(micDeviceId) {
if (this._audioContext && this._audioProcessingNode) { if (this._audioContext && this._audioProcessingNode) {
return new Promise((resolve, reject) => { return this._getAudioStream(micDeviceId).then(newStream => {
this._getAudioStream(micDeviceId).then(newStream => { const newSource = this._audioContext
const newSource = this._audioContext .createMediaStreamSource(newStream);
.createMediaStreamSource(newStream);
this._audioSource.disconnect();
newSource.connect(this._audioProcessingNode);
this._stream = newStream;
this._audioSource = newSource;
this._audioSource.disconnect();
newSource.connect(this._audioProcessingNode);
this._stream = newStream;
this._audioSource = newSource;
resolve();
})
.catch(() => {
reject();
});
}); });
} }
@ -221,7 +216,7 @@ export class FlacAdapter extends RecordingAdapter {
}); });
}); });
const callbackInitAudioContext = (resolve, reject) => { const callbackInitAudioContext = () =>
this._getAudioStream(micDeviceId) this._getAudioStream(micDeviceId)
.then(stream => { .then(stream => {
this._stream = stream; this._stream = stream;
@ -244,19 +239,18 @@ export class FlacAdapter extends RecordingAdapter {
}); });
}; };
logger.debug('AudioContext is set up.'); logger.debug('AudioContext is set up.');
resolve();
}) })
.catch(err => { .catch(err => {
logger.error(`Error calling getUserMedia(): ${err}`); logger.error(`Error calling getUserMedia(): ${err}`);
reject();
return Promise.reject(err);
}); });
};
// Because Promise constructor immediately executes the executor // Because Promise constructor immediately executes the executor
// function. This is undesirable, we want callbackInitAudioContext to be // function. This is undesirable, we want callbackInitAudioContext to be
// executed only **after** promiseInitWorker is resolved. // executed only **after** promiseInitWorker is resolved.
return promiseInitWorker return promiseInitWorker
.then(() => new Promise(callbackInitAudioContext)); .then(callbackInitAudioContext);
} }
/** /**