From 9c229072a2842947c0628c4c522e4a0a0cb51e90 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Wed, 26 Jan 2022 00:11:33 -0800 Subject: [PATCH 1/3] added future fields --- src/i18n/en_US.jsonc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index ae3388ec..8aea456e 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -1,4 +1,11 @@ -{ // Base File +{ // Base File + + // i18n Info + "i18n.languageName": "English", // name of language in native language + "i18n.languageNameEnglish": "English", // name of language in English + "i18n.category": "main", // main = real language, fun = fun community languages + "i18n.authors": "", // Authors, if you contribute to this file feel free to add your name seperated with a space + // App info "app.name": "Cider", From a11e5483fccd212ee6ba93d7e6916e23ee8f1773 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Wed, 26 Jan 2022 15:11:55 +0700 Subject: [PATCH 2/3] fix eq earrape? --- src/main/index.ts | 6 +++ src/renderer/audio/audio.js | 57 +++++++++------------ src/renderer/views/components/equalizer.ejs | 2 +- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/src/main/index.ts b/src/main/index.ts index 6862aa18..fff2b36f 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -35,6 +35,12 @@ electron.app.on('ready', () => { App.bwCreated(win); /// please dont change this for plugins to get proper and fully initialized Win objects plug.callPlugins('onReady', win); + const reactDevToolsPath = "E:/Cider/build/audion" + + + await electron.session.defaultSession.loadExtension(reactDevToolsPath).then(() => { + console.log('reads') + }) win.on("ready-to-show", () => { win.show(); }); diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index aa2ebd16..034a7cb8 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -22,8 +22,13 @@ var CiderAudio = { }, off: function(){ try{ - CiderAudio.audioNodes.gainNode.disconnect(); - CiderAudio.audioNodes.spatialNode.disconnect(); + try{ + CiderAudio.audioNodes.gainNode.disconnect(); } catch(e){} + try{ CiderAudio.audioNodes.spatialNode.disconnect();} catch(e){} + try{ + CiderAudio.audioNodes.audioBands[0].disconnect(); + CiderAudio.audioNodes.audioBands[9].disconnect(); + } catch(e){} CiderAudio.source.connect(CiderAudio.context.destination);} catch(e){} }, connectContext: function (mediaElem){ @@ -97,41 +102,29 @@ var CiderAudio = { let BANDS = app.cfg.audio.equalizer.frequencies; let GAIN = app.cfg.audio.equalizer.gain; let Q = app.cfg.audio.equalizer.Q; - CiderAudio.audioNodes.audioBands = {}; + CiderAudio.audioNodes.audioBands = []; - BANDS.forEach((band, i) => { - const filter = CiderAudio.context.createBiquadFilter(); - CiderAudio.audioNodes.audioBands[i] = filter; - - if (i === 0) { - // The first filter, includes all lower frequencies - filter.type = "lowshelf"; - } else if (i === BANDS.length - 1) { - // The last filter, includes all higher frequencies - filter.type = "highshelf"; - } else { - filter.type = "peaking"; + for (i = 0; i < BANDS.length; i++) { + CiderAudio.audioNodes.audioBands[i] = CiderAudio.context.createBiquadFilter(); + CiderAudio.audioNodes.audioBands[i].type = 'peaking'; // 'peaking'; + CiderAudio.audioNodes.audioBands[i].frequency.value = BANDS[i]; + CiderAudio.audioNodes.audioBands[i].Q.value = Q[i]; + CiderAudio.audioNodes.audioBands[i].gain.value = GAIN[i]; } - filter.frequency.value = BANDS[i]; - filter.gain.value = GAIN[i]; - filter.Q.value = Q[i]; - if (i == 0){ - if (app.cfg.audio.spatial) { - CiderAudio.audioNodes.spatialNode.output.disconnect(CiderAudio.context.destination); - CiderAudio.audioNodes.spatialNode.output.connect(filter); - } else { - CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.context.destination); - CiderAudio.audioNodes.gainNode.connect(filter); - } - } else if (i === BANDS.length - 1) { - CiderAudio.audioNodes.audioBands[i - 1].connect(filter); + if (app.cfg.audio.spatial) { + try{ + CiderAudio.audioNodes.spatialNode.output.disconnect(CiderAudio.context.destination); } catch(e){} + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.audioBands[0]); } else { - CiderAudio.audioNodes.audioBands[i - 1].connect(filter); - filter.connect(CiderAudio.context.destination); + try{ + CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.context.destination);} catch(e){} + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]); } - - }); + for (i = 1; i < BANDS.length; i ++) { + CiderAudio.audioNodes.audioBands[i-1].connect(CiderAudio.audioNodes.audioBands[i]); + } + CiderAudio.audioNodes.audioBands[ BANDS.length-1].connect(CiderAudio.context.destination); } } diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs index 41cb9843..97211f3d 100644 --- a/src/renderer/views/components/equalizer.ejs +++ b/src/renderer/views/components/equalizer.ejs @@ -111,7 +111,7 @@ resetGain(){ this.app.cfg.audio.equalizer = {'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000], 'gain': [0,0,0,0,0,0,0,0,0,0], - 'Q' : [1,1,1,1,1,1,1,1,1,1] } + 'Q' : [1,1,1,1,1,1,1,1,1,1] } for (var i = 0; i < 10; i++){ this.changeGain(i) this.changeFreq(i) From 1f65d2ed17847257ff18eab2ad7ee7b6b5a17899 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Wed, 26 Jan 2022 15:19:24 +0700 Subject: [PATCH 3/3] fix plugins --- src/main/index.ts | 6 ------ src/main/plugins/Extras/sendSongToTitlebar.ts | 2 +- src/main/plugins/lastfm.ts | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/index.ts b/src/main/index.ts index fff2b36f..6862aa18 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -35,12 +35,6 @@ electron.app.on('ready', () => { App.bwCreated(win); /// please dont change this for plugins to get proper and fully initialized Win objects plug.callPlugins('onReady', win); - const reactDevToolsPath = "E:/Cider/build/audion" - - - await electron.session.defaultSession.loadExtension(reactDevToolsPath).then(() => { - console.log('reads') - }) win.on("ready-to-show", () => { win.show(); }); diff --git a/src/main/plugins/Extras/sendSongToTitlebar.ts b/src/main/plugins/Extras/sendSongToTitlebar.ts index 540e32f4..8b39e47d 100644 --- a/src/main/plugins/Extras/sendSongToTitlebar.ts +++ b/src/main/plugins/Extras/sendSongToTitlebar.ts @@ -27,7 +27,7 @@ export default class sendSongToTitlebar { * @param attributes Music Attributes (attributes.state = current state) */ onPlaybackStateDidChange(attributes: any): void { - this._win.win.setTitle(`${(attributes != null && attributes.name != null && attributes.name.length > 0) ? (attributes.name + " - ") : ''}Cider`) + this._win.setTitle(`${(attributes != null && attributes.name != null && attributes.name.length > 0) ? (attributes.name + " - ") : ''}Cider`) } /** * Runs on song change diff --git a/src/main/plugins/lastfm.ts b/src/main/plugins/lastfm.ts index d586b857..465ec606 100644 --- a/src/main/plugins/lastfm.ts +++ b/src/main/plugins/lastfm.ts @@ -191,7 +191,7 @@ export default class LastFMPlugin { this._store.lastfm.enabled = true; this._store.lastfm.auth_token = authKey; console.log(authKey); - this._win.win.webContents.send('LastfmAuthenticated', authKey); + this._win.webContents.send('LastfmAuthenticated', authKey); this.authenticate(); } } @@ -206,7 +206,7 @@ export default class LastFMPlugin { const authKey = authURI.split('lastfm?token=')[1]; this._store.lastfm.enabled = true; this._store.lastfm.auth_token = authKey; - this._win.win.webContents.send('LastfmAuthenticated', authKey); + this._win.webContents.send('LastfmAuthenticated', authKey); console.log(authKey); this.authenticate(); }