summaryrefslogtreecommitdiff
path: root/ext/mixed/js/audio-system.js
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2021-01-22 22:10:27 -0500
committerGitHub <noreply@github.com>2021-01-22 22:10:27 -0500
commit7fbfef513d1336a883968f319c7001b4bb04876d (patch)
treedf3098aee59805822d2e3028afad9df8d509104d /ext/mixed/js/audio-system.js
parenta51a591c404e365bc1fca657bb26c04d165f400b (diff)
Display audio update (#1291)
* Move createExpressionAudio to DisplayAudio * Move createAudioFromInfo to DisplayAudio * Update TextToSpeechAudio
Diffstat (limited to 'ext/mixed/js/audio-system.js')
-rw-r--r--ext/mixed/js/audio-system.js45
1 files changed, 1 insertions, 44 deletions
diff --git a/ext/mixed/js/audio-system.js b/ext/mixed/js/audio-system.js
index ab6011d0..0933d90e 100644
--- a/ext/mixed/js/audio-system.js
+++ b/ext/mixed/js/audio-system.js
@@ -16,14 +16,11 @@
*/
/* global
- * CacheMap
* TextToSpeechAudio
- * api
*/
class AudioSystem {
- constructor(useCache) {
- this._cache = new CacheMap(useCache ? 32 : 0);
+ constructor() {
this._fallbackAudio = null;
}
@@ -36,35 +33,6 @@ class AudioSystem {
eventListeners.addEventListener(speechSynthesis, 'voiceschanged', onVoicesChanged, false);
}
- async createExpressionAudio(sources, expression, reading, details) {
- const key = JSON.stringify([expression, reading]);
-
- const cacheValue = this._cache.get(key);
- if (typeof cacheValue !== 'undefined') {
- return cacheValue;
- }
-
- for (let i = 0, ii = sources.length; i < ii; ++i) {
- const source = sources[i];
- const infoList = await await api.getExpressionAudioInfoList(source, expression, reading, details);
- for (let j = 0, jj = infoList.length; j < jj; ++j) {
- const info = infoList[j];
- let audio;
- try {
- audio = await this.createAudioFromInfo(info, source);
- } catch (e) {
- continue;
- }
-
- const result = {audio, source, infoList, infoListIndex: j};
- this._cache.set(key, result);
- return result;
- }
- }
-
- throw new Error('Could not create audio');
- }
-
getFallbackAudio() {
if (this._fallbackAudio === null) {
this._fallbackAudio = new Audio('/mixed/mp3/button.mp3');
@@ -94,17 +62,6 @@ class AudioSystem {
return new TextToSpeechAudio(text, voice);
}
- async createAudioFromInfo(info, source) {
- switch (info.type) {
- case 'url':
- return await this.createAudio(info.url, source);
- case 'tts':
- return this.createTextToSpeechAudio(info.text, info.voice);
- default:
- throw new Error(`Unsupported type: ${info.type}`);
- }
- }
-
// Private
_isAudioValid(audio, source) {