alex/yomichan
1
Fork 0
Code Releases Activity

Simplify createAudio function (#1728)

Browse Source
This commit is contained in:
toasted-nutbread 2021-06-04 20:17:04 -04:00 committed by GitHub
parent c7e6c37095
commit 57fb496fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ext/js/media/audio-system.js
View File

@ -42,18 +42,13 @@ class AudioSystem extends EventDispatcher {
return this._fallbackAudio; return this._fallbackAudio;
} }
createAudio(url, sourceType) { async createAudio(url, sourceType) {
return new Promise((resolve, reject) => { const audio = new Audio(url);
const audio = new Audio(url); await this._waitForData(audio);
audio.addEventListener('loadeddata', () => { if (!this._isAudioValid(audio, sourceType)) {
if (!this._isAudioValid(audio, sourceType)) { throw new Error('Could not retrieve audio');
reject(new Error('Could not retrieve audio')); }
} else { return audio;
resolve(audio);
}
});
audio.addEventListener('error', () => reject(audio.error));
});
} }
createTextToSpeechAudio(text, voiceUri) { createTextToSpeechAudio(text, voiceUri) {
@ -70,6 +65,13 @@ class AudioSystem extends EventDispatcher {
this.trigger('voiceschanged', e); this.trigger('voiceschanged', e);
} }
_waitForData(audio) {
return new Promise((resolve, reject) => {
audio.addEventListener('loadeddata', () => resolve());
audio.addEventListener('error', () => reject(audio.error));
});
}
_isAudioValid(audio, sourceType) { _isAudioValid(audio, sourceType) {
switch (sourceType) { switch (sourceType) {
case 'jpod101': case 'jpod101':