From e4082af6ac038eb36f61c10428e1d515ec6c2dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?= <46503943+jay900604@users.noreply.github.com> Date: Sun, 3 Apr 2022 18:51:26 +0800 Subject: [PATCH 1/6] Update zh_TW.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update TW language. 最佳化語言：套件 → 模組 --- src/i18n/zh_TW.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json index eb05a7af..aa4edf77 100644 --- a/src/i18n/zh_TW.json +++ b/src/i18n/zh_TW.json @@ -128,6 +128,9 @@ "term.song.link.generate": "正在取得 song.link 的分享網址...", "term.version": "版本", "term.creditDesignedBy": "由 ${authorUsername} 設計", + "term.plugin" : "模組" , + "term.pluginMenu" : "模組選單" , + "term.pluginMenu.none" : "沒有交互式模組" , "home.title": "首頁", "home.recentlyPlayed": "最近播放", "home.recentlyAdded": "最近加入", @@ -286,15 +289,15 @@ "settings.prompt.visual.theme.github.URL": "輸入你要安裝的主題網址", "settings.notyf.visual.theme.install.success": "主題成功安裝", "settings.notyf.visual.theme.install.error": "主題安裝失敗", - "settings.header.visual.plugin": "套件", + "settings.header.visual.plugin": "模組", "settings.option.visual.plugin.github.download": "從 GitHub 網址安裝", - "settings.option.visual.plugin.github.explore": "探索 GitHub 套件", - "settings.header.visual.plugin.github.page": "來自 GitHub 的套件", + "settings.option.visual.plugin.github.explore": "探索 GitHub 模組", + "settings.header.visual.plugin.github.page": "來自 GitHub 的模組", "settings.option.visual.plugin.github.install.confirm": "你確定要安裝 {{ repo }}？", - "settings.prompt.visual.plugin.github.URL": "輸入你要安裝的套件網址", - "settings.prompt.visual.plugin.github.success": "套件成功安裝，按「確認」以重新啟動 Cider", - "settings.notyf.visual.plugin.install.success": "套件成功安裝", - "settings.notyf.visual.plugin.install.error": "套件安裝失敗", + "settings.prompt.visual.plugin.github.URL": "輸入你要安裝的模組網址", + "settings.prompt.visual.plugin.github.success": "模組已成功安裝，請重新啟動 Cider 以套用。", + "settings.notyf.visual.plugin.install.success": "模組成功安裝", + "settings.notyf.visual.plugin.install.error": "模組安裝失敗", "settings.option.visual.theme.default": "預設", "settings.option.visual.theme.dark": "午夜黑", "settings.option.visual.showPersonalInfo": "顯示個人檔案", From f8113aec2633eae0567c335d24caeee51910f9e1 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sun, 3 Apr 2022 12:10:39 -0500 Subject: [PATCH 2/6] Bump version number for MSFT Store. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c46a4ab1..1535b698 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "cider", "applicationId": "Cider", "productName": "Cider", - "version": "1.4.0", - "description": "A new look into listening and enjoying music in style and performance.", + "version": "1.4.1", + "description": "A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind.", "license": "AGPL-3.0", "main": "./build/index.js", "author": "Cider Collective (https://cider.sh)", From a81aeb4da96b04213a88d69f2d4c06ad3bd53ebb Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sun, 3 Apr 2022 14:18:36 -0700 Subject: [PATCH 3/6] [Audio] IntelliGainComp --- src/renderer/audio/audio.js | 79 +- src/renderer/main/vueapp.js | 21 +- src/renderer/views/components/equalizer.ejs | 850 ++++++++++---------- 3 files changed, 493 insertions(+), 457 deletions(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index 5473dcb4..cb1aa5ca 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -10,6 +10,7 @@ const CiderAudio = { llpw: null, analogWarmth: null, recorderNode: null, + intelliGainComp: null, }, ccON: false, mediaRecorder: null, @@ -37,7 +38,9 @@ const CiderAudio = { audioBands: null, vibrantbassNode: null, llpw: null, - analogWarmth: null + analogWarmth: null, + recorderNode: null, + intelliGainComp: null, } } catch (e) { } CiderAudio.source.connect(CiderAudio.context.destination); @@ -51,7 +54,9 @@ const CiderAudio = { CiderAudio.source = CiderAudio.context.createMediaElementSource(mediaElem); } else { try { CiderAudio.source.disconnect(CiderAudio.context.destination) } catch (e) { } } CiderAudio.audioNodes.gainNode = CiderAudio.context.createGain() - CiderAudio.source.connect(CiderAudio.audioNodes.gainNode); + CiderAudio.audioNodes.intelliGainComp = CiderAudio.context.createGain(); + CiderAudio.source.connect(CiderAudio.audioNodes.intelliGainComp); + CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.gainNode); if (app.cfg.audio.normalization) { CiderAudio.normalizerOn() } @@ -137,6 +142,48 @@ const CiderAudio = { spatialOff: function () { CiderAudio.hierarchical_loading(); }, + intelliGainComp_h0_0: function () { + let filters = []; const precisionHz = 12; + if (CiderAudio.audioNodes.audioBands !== null) {filters = filters.concat(CiderAudio.audioNodes.audioBands)} + if (CiderAudio.audioNodes.vibrantbassNode !== null) {filters = filters.concat(CiderAudio.audioNodes.vibrantbassNode)} + if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length > 1) {filters = filters.concat(CiderAudio.audioNodes.llpw);} + if (!filters || filters.length === 0) {CiderAudio.audioNodes.intelliGainComp.gain.value = 1; return} + filters.shift(); + let steps = Math.ceil(96000 / precisionHz); + // Generate input array for getFrequencyResponse method + let frequencies = new Float32Array(steps); + for (let i = 0; i < steps; i++) { + frequencies[i] = (i + 1) * precisionHz; + } + // Here we will store combined amplitude response + let totalAmplitudeResp = new Float32Array(steps); + for (let i = 0; i < steps; i++) { + totalAmplitudeResp[i] = 1; + } + // Temporary container for every filter response + let amplitudeResp = new Float32Array(steps), phaseResp = new Float32Array(steps); + for (let i = filters.length - 1; i >= 0; i--) { + let filter = filters[i]; + // Get filter response and convolve it with existing response + filter.getFrequencyResponse(frequencies, amplitudeResp, phaseResp); + for (let j = 0; j < steps; j++) { + totalAmplitudeResp[j] *= amplitudeResp[j]; + } + } + // Find max gain + let maxGain = -120; + for (let i = 0; i < steps; i++) { + let gain = totalAmplitudeResp[i]; + if (gain > maxGain) + maxGain = gain; + } + if (maxGain == -120) {maxGain = 1} + if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw[0].buffer !== null) {maxGain = maxGain * 0.9440608762859234} + if (app.cfg.audio.maikiwiAudio.spatial === true) {maxGain = maxGain * 0.5956621435290105} + maxGain = Math.pow(10, (-1 * (20 * Math.log10(maxGain))) / 20).toFixed(4); + maxGain > 1.0 ? CiderAudio.audioNodes.intelliGainComp.gain.value = 1 : CiderAudio.audioNodes.intelliGainComp.gain.value = maxGain; + console.debug(`[Cider][Audio] IntelliGainComp: ${maxGain > 1.0 ? 0 : (20 * Math.log10(maxGain)).toFixed(2)} dB (${maxGain > 1.0 ? 1 : maxGain})`); + }, sendAudio: function () { if (!CiderAudio.ccON) { CiderAudio.ccON = true @@ -146,7 +193,8 @@ const CiderAudio = { // mimeType: 'audio/webm; codecs=opus' // }; // var destnode = CiderAudio.context.createMediaStreamDestination(); - // CiderAudio.audioNodes.gainNode.connect(destnode) + // CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.gainNode); + // CiderAudio.audioNodes.gainNode.connect(destnode) // CiderAudio.mediaRecorder = new MediaRecorder(destnode.stream, options); // CiderAudio.mediaRecorder.start(1); // CiderAudio.mediaRecorder.ondataavailable = function (e) { @@ -277,7 +325,7 @@ const CiderAudio = { } } CiderAudio.audioNodes.recorderNode.parameters.get('isRecording').setValueAtTime(1, CiderAudio.context.currentTime); - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.recorderNode); + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.recorderNode); }); clearInterval(searchInt); @@ -400,7 +448,7 @@ const CiderAudio = { } - console.debug("[Cider][Audio] CAP - MaikiwiSignature Mode"); + console.debug("[Cider][Audio] CAP - Maikiwi Signature Mode"); break; case "NATURAL": @@ -517,6 +565,7 @@ const CiderAudio = { hierarchical_unloading: function () { try { CiderAudio.audioNodes.spatialNode.output.disconnect(); } catch (e) { } try { CiderAudio.audioNodes.spatialNode.disconnect(); } catch (e) { } + try {CiderAudio.audioNodes.intelliGainComp.disconnect();} catch (e) { } try { CiderAudio.audioNodes.gainNode.disconnect(); } catch (e) { } try { for (var i of CiderAudio.audioNodes.analogWarmth) { i.disconnect(); } CiderAudio.audioNodes.analogWarmth = null } catch (e) { } try { for (var i of CiderAudio.audioNodes.llpw) { i.disconnect(); } CiderAudio.audioNodes.llpw = null } catch (e) { } @@ -528,6 +577,7 @@ const CiderAudio = { }, hierarchical_loading: function () { CiderAudio.hierarchical_unloading(); + CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.gainNode); if (Math.max(...app.cfg.audio.equalizer.gain) != 0) { CiderAudio.equalizer(true, 0); @@ -542,20 +592,20 @@ const CiderAudio = { CiderAudio.analogWarmth_h2_3(true, 3); if (app.cfg.audio.spatial === true) { - if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial + if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial') } - else { // Vibrant Bass, CAP, Analog Warmth, Spatial + else { // Vibrant Bass, CAP, Analog Warmth, Spatial app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Analog Warmth, Spatial') } } - else { + else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Analog Warmth') @@ -575,7 +625,7 @@ const CiderAudio = { console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Spatial') } } - else { + else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]); console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP') @@ -599,7 +649,7 @@ const CiderAudio = { console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Analog Warmth, Spatial') } } - else { + else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Analog Warmth') @@ -607,7 +657,7 @@ const CiderAudio = { } else { if (app.cfg.audio.spatial === true) { - if (app.cfg.audio.maikiwiAudio.spatial === true) { + if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]); @@ -710,7 +760,7 @@ const CiderAudio = { } } else { - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]); + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]); console.debug('[Cider][Audio] Equalizer') } } @@ -734,7 +784,7 @@ const CiderAudio = { CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); console.debug('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial') } - else { // Vibrant Bass, CAP, Analog Warmth, Spatial + else { // Vibrant Bass, CAP, Analog Warmth, Spatial app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); @@ -743,7 +793,7 @@ const CiderAudio = { } else { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); console.debug('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth') } } @@ -903,6 +953,7 @@ const CiderAudio = { } } } + CiderAudio.intelliGainComp_h0_0(); console.debug("[Cider][Audio] Finished hierarchical loading"); }, diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 1abe4076..54840aaa 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -773,8 +773,8 @@ const app = new Vue({ } numbers.shift() let peak = Math.max(numbers[6], numbers[7]) / 32768.0 - let gain = Math.pow(10, ((-7.63 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant - console.debug(`[Cider][MaikiwiSoundCheck] Peak Gain: '${Math.log10(peak) * 20}' dB | Adjusting '${Math.log10(gain) * 20}' dB`) + let gain = Math.pow(10, ((-2 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant + console.debug(`[Cider][MaikiwiSoundCheck] Peak Gain: '${(Math.log10(peak) * 20).toFixed(2)}' dB | Adjusting '${(Math.log10(gain) * 20).toFixed(2)}' dB`) try { //CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak))) CiderAudio.audioNodes.gainNode.gain.value = gain @@ -3857,23 +3857,6 @@ const app = new Vue({ element.onclick = app.LastFMDeauthorize; }); }, - /** - parseSCTagToRG: function (tag) { - let soundcheck = tag.split(" ") - let numbers = [] - for (item of soundcheck) { - numbers.push(parseInt(item, 16)) - - } - numbers.shift() - //let gain = Math.log10((Math.max(numbers[0], numbers[1]) ?? 1000) / 1000.0) * -10 - let peak = Math.max(numbers[6], numbers[7]) / 32768.0 - let gain = Math.pow(10, ((-7.63 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant - return { - gain: gain, - peak: peak - } - },*/ fullscreen(flag) { if (flag) { ipcRenderer.send('setFullScreen', true); diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs index 17890854..73082a36 100644 --- a/src/renderer/views/components/equalizer.ejs +++ b/src/renderer/views/components/equalizer.ejs @@ -1,425 +1,427 @@ - - - + + \ No newline at end of file From 3f2cf50bd27aae8f6d08ebc1c0854274d04b613d Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sun, 3 Apr 2022 14:34:54 -0700 Subject: [PATCH 4/6] [Audio] IntelliGainComp rev.2 --- src/renderer/audio/audio.js | 4 ++-- src/renderer/main/vueapp.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index cb1aa5ca..7471de35 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -178,8 +178,8 @@ const CiderAudio = { maxGain = gain; } if (maxGain == -120) {maxGain = 1} - if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw[0].buffer !== null) {maxGain = maxGain * 0.9440608762859234} - if (app.cfg.audio.maikiwiAudio.spatial === true) {maxGain = maxGain * 0.5956621435290105} + if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw[0].buffer !== null) {maxGain = maxGain * 1.0592537251772889} + if (app.cfg.audio.maikiwiAudio.spatial === true) {maxGain = maxGain * 1.6788040181225603} maxGain = Math.pow(10, (-1 * (20 * Math.log10(maxGain))) / 20).toFixed(4); maxGain > 1.0 ? CiderAudio.audioNodes.intelliGainComp.gain.value = 1 : CiderAudio.audioNodes.intelliGainComp.gain.value = maxGain; console.debug(`[Cider][Audio] IntelliGainComp: ${maxGain > 1.0 ? 0 : (20 * Math.log10(maxGain)).toFixed(2)} dB (${maxGain > 1.0 ? 1 : maxGain})`); diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 54840aaa..572c7c29 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -773,7 +773,7 @@ const app = new Vue({ } numbers.shift() let peak = Math.max(numbers[6], numbers[7]) / 32768.0 - let gain = Math.pow(10, ((-2 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant + let gain = Math.pow(10, ((-2.5 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant console.debug(`[Cider][MaikiwiSoundCheck] Peak Gain: '${(Math.log10(peak) * 20).toFixed(2)}' dB | Adjusting '${(Math.log10(gain) * 20).toFixed(2)}' dB`) try { //CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak))) From 748351776e2684607a966d3364c514fd5b3fffce Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sun, 3 Apr 2022 14:57:53 -0700 Subject: [PATCH 5/6] [Audio] IntelliGainComp rev.Ultimate --- src/renderer/audio/audio.js | 2 +- src/renderer/main/vueapp.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index 7471de35..6dfb7e5c 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -179,7 +179,7 @@ const CiderAudio = { } if (maxGain == -120) {maxGain = 1} if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw[0].buffer !== null) {maxGain = maxGain * 1.0592537251772889} - if (app.cfg.audio.maikiwiAudio.spatial === true) {maxGain = maxGain * 1.6788040181225603} + if (app.cfg.audio.maikiwiAudio.spatial === true && app.cfg.audio.maikiwiAudio.spatialProfile !== '70_421signature') {maxGain = maxGain * 1.3756248102753075} maxGain = Math.pow(10, (-1 * (20 * Math.log10(maxGain))) / 20).toFixed(4); maxGain > 1.0 ? CiderAudio.audioNodes.intelliGainComp.gain.value = 1 : CiderAudio.audioNodes.intelliGainComp.gain.value = maxGain; console.debug(`[Cider][Audio] IntelliGainComp: ${maxGain > 1.0 ? 0 : (20 * Math.log10(maxGain)).toFixed(2)} dB (${maxGain > 1.0 ? 1 : maxGain})`); diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 572c7c29..54840aaa 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -773,7 +773,7 @@ const app = new Vue({ } numbers.shift() let peak = Math.max(numbers[6], numbers[7]) / 32768.0 - let gain = Math.pow(10, ((-2.5 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant + let gain = Math.pow(10, ((-2 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant console.debug(`[Cider][MaikiwiSoundCheck] Peak Gain: '${(Math.log10(peak) * 20).toFixed(2)}' dB | Adjusting '${(Math.log10(gain) * 20).toFixed(2)}' dB`) try { //CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak))) From c4365f3712d35ea78b4f64c561eab3037d9729f9 Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sun, 3 Apr 2022 16:12:26 -0700 Subject: [PATCH 6/6] I'm an idiot --- src/renderer/views/components/equalizer.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs index 73082a36..827f3ef7 100644 --- a/src/renderer/views/components/equalizer.ejs +++ b/src/renderer/views/components/equalizer.ejs @@ -298,7 +298,7 @@ try { for (var i = 0; i < 21; i++) { CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.maikiwiAudio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10); - CiderAudio.intelliGainComp_h0_0();}} + } CiderAudio.intelliGainComp_h0_0();} catch(e) { CiderAudio.hierarchical_loading(); }