diff --git a/shared/backend/audio.d.ts b/shared/backend/audio.d.ts index 88fa97b7..53a5bdc3 100644 --- a/shared/backend/audio.d.ts +++ b/shared/backend/audio.d.ts @@ -30,11 +30,6 @@ declare namespace audio { } export namespace sounds { - export interface SoundFile { - path: string; - volume?: number; - } - - export function play_sound(file: SoundFile) : Promise; + export function play_sound(file: sound.SoundFile) : Promise; } } \ No newline at end of file diff --git a/shared/js/sound/Sounds.ts b/shared/js/sound/Sounds.ts index 5f778669..cbb75329 100644 --- a/shared/js/sound/Sounds.ts +++ b/shared/js/sound/Sounds.ts @@ -67,6 +67,11 @@ namespace sound { filename: string; } + export interface SoundFile { + path: string; + volume?: number; + } + let speech_mapping: {[key: string]:SoundHandle} = {}; let volume_require_save = false; @@ -274,7 +279,7 @@ namespace sound { if(options.callback) options.callback(true); }).catch(error => { - log.warn(LogCategory.AUDIO, tr("Failed to replay sound %o: %o"), sound, error); + log.warn(LogCategory.AUDIO, tr("Failed to replay sound %s: %o"), handle.filename, error); if(options.callback) options.callback(false); }).then(() => { diff --git a/shared/loader/app.ts b/shared/loader/app.ts index f648e66c..fa497904 100644 --- a/shared/loader/app.ts +++ b/shared/loader/app.ts @@ -239,7 +239,6 @@ const loader_javascript = { "js/FileManager.js", "js/ConnectionHandler.js", "js/BrowserIPC.js", - "js/dns_impl.js", //Connection "js/connection/CommandHandler.js", @@ -271,6 +270,7 @@ const loader_javascript = { //Connection "js/connection/ServerConnection.js", + "js/dns_impl.js", //Load codec "js/codec/Codec.js",