From 82d403a9ab5ba6a44575d02908e3491aaba8f5be Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Wed, 27 Apr 2022 19:19:04 -0700 Subject: [PATCH] added ability for cideraudio to be loaded externally --- src/main/base/browserwindow.ts | 8 ++++++++ src/main/base/utils.ts | 1 + src/renderer/main/app.js | 2 +- src/renderer/main/vueapp.js | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index f08f1c98..afb38607 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -423,6 +423,14 @@ export class BrowserWindow { res.render("main", this.EnvironmentVariables); }); + app.get("/audio/cideraudio.js", (_req, res) => { + if (existsSync(join(utils.getPath("externals"), "/audio.js"))) { + res.sendFile(join(utils.getPath("externals"), "/audio.js")); + } else { + res.sendFile(join(utils.getPath('srcPath'), "./renderer/audio/audio.js")); + } + }) + app.get("/api/playback/:action", (req, res) => { const action = req.params.action; switch (action) { diff --git a/src/main/base/utils.ts b/src/main/base/utils.ts index 337e6f79..a7ce2760 100644 --- a/src/main/base/utils.ts +++ b/src/main/base/utils.ts @@ -22,6 +22,7 @@ export class utils { ciderCache: path.resolve(app.getPath("userData"), "CiderCache"), themes: path.resolve(app.getPath("userData"), "Themes"), plugins: path.resolve(app.getPath("userData"), "Plugins"), + externals: path.resolve(app.getPath("userData"), "externals"), }; /** diff --git a/src/renderer/main/app.js b/src/renderer/main/app.js index a1b66680..476dfa47 100644 --- a/src/renderer/main/app.js +++ b/src/renderer/main/app.js @@ -2,7 +2,7 @@ import { app } from "./vueapp.js" import {CiderCache} from './cidercache.js' import {CiderFrontAPI} from './ciderfrontapi.js' import {simulateGamepad} from './gamepad.js' -import {CiderAudio} from '../audio/audio.js' +import {CiderAudio} from '../audio/cideraudio.js' import {Events} from './events.js' import { wsapi } from "./wsapi_interop.js" import { MusicKitTools } from "./musickittools.js" diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index c6bfe12b..1df1092d 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -907,7 +907,7 @@ const app = new Vue({ }, 500) ipcRenderer.invoke("renderer-ready", true) document.querySelector("#LOADER").remove() - if (this.cfg.general.themeUpdateNotification) { + if (this.cfg.general.themeUpdateNotification && !this.isDev) { this.checkForThemeUpdates() } },