From aa5d9a4650a9107da093533e9f2122f49e0e97cb Mon Sep 17 00:00:00 2001 From: vapormusic Date: Mon, 14 Feb 2022 09:50:59 +0700 Subject: [PATCH 1/3] attempted audiocontext fix --- src/renderer/audio/audio.js | 32 ++++++++++++++++++++++---------- src/renderer/index.js | 5 ++--- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index 504d6163..0c7047d9 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -123,6 +123,11 @@ var CiderAudio = { let LLPW_Q = [5, 1, 3.536, 1.25, 8.409, 1.25, 14.14, 7.071, 5, 0.625, 16.82, 20, 20, 20, 28.28, 28.28, 28.28, 20, 33.64, 33.64, 10, 28.28, 7.071, 3.856]; let LLPW_GAIN = [0.38, -1.81, -0.23, -0.51, 0.4, 0.84, 0.36, -0.34, 0.27, -1.2, -0.42, -0.67, 0.81, 1.31, -0.71, 0.68, -1.04, 0.79, -0.73, -1.33, 1.17, 0.57, 0.35, 6.33]; let LLPW_FREQUENCIES = [16.452, 24.636, 37.134, 74.483, 159.54, 308.18, 670.21, 915.81, 1200.7, 2766.4, 2930.6, 4050.6, 4409.1, 5395.2, 5901.6, 6455.5, 7164.1, 7724.1, 8449, 10573, 12368, 14198, 17910, 18916]; + try { + for (var i of CiderAudio.audioNodes.llpw){ + i.disconnect(); + } + } catch(e){} CiderAudio.audioNodes.llpw = []; for (i = 0; i < LLPW_FREQUENCIES.length; i++) { CiderAudio.audioNodes.llpw[i] = CiderAudio.context.createBiquadFilter(); @@ -131,11 +136,6 @@ var CiderAudio = { CiderAudio.audioNodes.llpw[i].Q.value = LLPW_Q[i]; CiderAudio.audioNodes.llpw[i].gain.value = LLPW_GAIN[i] * app.cfg.audio.ciderPPE_value * CiderAudio.audioNodes.llpwEnabled; } - try { - for (var i of CiderAudio.audioNodes.llpw){ - i.disconnect(); - } - } catch(e){} for (i = 1; i < LLPW_FREQUENCIES.length; i ++) { CiderAudio.audioNodes.llpw[i-1].connect(CiderAudio.audioNodes.llpw[i]); @@ -162,6 +162,12 @@ var CiderAudio = { let VIBRANTBASSBANDS = app.cfg.audio.vibrantBass.frequencies; let VIBRANTBASSGAIN = app.cfg.audio.vibrantBass.gain; let VIBRANTBASSQ = app.cfg.audio.vibrantBass.Q; + try{ + for (var i of CiderAudio.audioNodes.vibrantbassNode){ + i.disconnect(); + } + } catch(e){} + CiderAudio.audioNodes.vibrantbassNode = []; for (i = 0; i < VIBRANTBASSBANDS.length; i++) { @@ -172,11 +178,7 @@ var CiderAudio = { CiderAudio.audioNodes.vibrantbassNode[i].gain.value = VIBRANTBASSGAIN[i] * app.cfg.audio.vibrantBass.multiplier; } - try{ - for (var i of CiderAudio.audioNodes.vibrantbassNode){ - i.disconnect(); - } - } catch(e){} + for (i = 1; i < VIBRANTBASSBANDS.length; i ++) { CiderAudio.audioNodes.vibrantbassNode[i-1].connect(CiderAudio.audioNodes.vibrantbassNode[i]); @@ -195,6 +197,16 @@ var CiderAudio = { } }, hierarchical_loading: function (){ + try { + for (var i of CiderAudio.audioNodes.llpw){ + i.disconnect(); + } + } catch(e){} + try { + for (var i of CiderAudio.audioNodes.vibrantbassNode){ + i.disconnect(); + } + } catch(e){} if (app.cfg.audio.vibrantBass.multiplier != 0) { // If vibrant bass is enabled if (CiderAudio.audioNodes.llpwEnabled == 1) { // If CAP & vibrant bass is enabled CiderAudio.vibrantbass_h2_1(true) diff --git a/src/renderer/index.js b/src/renderer/index.js index 4169deb2..fb58bd24 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -2824,7 +2824,7 @@ const app = new Vue({ [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id }).then(function () { app.mk.play().then(() => { - const data = JSON.parse(parent.split('listitem-hr')[1] ?? '[]') + let data = JSON.parse(parent.split('listitem-hr')[1] ?? '[]') let itemsToPlay = {} let u = data.map(x => x.id) try { @@ -2849,9 +2849,8 @@ const app = new Vue({ }) }) } else { - const data = JSON.parse(parent.split('listitem-hr')[1] ?? '[]') + let data = JSON.parse(parent.split('listitem-hr')[1] ?? '[]') let itemsToPlay = {} - let u = data.map(x => x.id) data.forEach(item => { if (!itemsToPlay[item.kind]) { itemsToPlay[item.kind] = [] From 8559eca7f00a46e1faadcebe08987a839e342580 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Sun, 13 Feb 2022 20:14:35 -0800 Subject: [PATCH 2/3] removed garbage and sped up audio piping --- src/renderer/audio/audio.js | 77 +++++++-------------------- src/renderer/index.js | 21 -------- src/renderer/views/app/chrome-top.ejs | 2 +- 3 files changed, 21 insertions(+), 79 deletions(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index 0c7047d9..cee8598b 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -119,7 +119,7 @@ var CiderAudio = { } }, llpw_h2_2: function (status, hierarchy){ - if (status == true) { + if (status === true) { let LLPW_Q = [5, 1, 3.536, 1.25, 8.409, 1.25, 14.14, 7.071, 5, 0.625, 16.82, 20, 20, 20, 28.28, 28.28, 28.28, 20, 33.64, 33.64, 10, 28.28, 7.071, 3.856]; let LLPW_GAIN = [0.38, -1.81, -0.23, -0.51, 0.4, 0.84, 0.36, -0.34, 0.27, -1.2, -0.42, -0.67, 0.81, 1.31, -0.71, 0.68, -1.04, 0.79, -0.73, -1.33, 1.17, 0.57, 0.35, 6.33]; let LLPW_FREQUENCIES = [16.452, 24.636, 37.134, 74.483, 159.54, 308.18, 670.21, 915.81, 1200.7, 2766.4, 2930.6, 4050.6, 4409.1, 5395.2, 5901.6, 6455.5, 7164.1, 7724.1, 8449, 10573, 12368, 14198, 17910, 18916]; @@ -158,7 +158,7 @@ var CiderAudio = { }, vibrantbass_h2_1: function (status){ - if (status == true) { + if (status === true) { let VIBRANTBASSBANDS = app.cfg.audio.vibrantBass.frequencies; let VIBRANTBASSGAIN = app.cfg.audio.vibrantBass.gain; let VIBRANTBASSQ = app.cfg.audio.vibrantBass.Q; @@ -196,7 +196,8 @@ var CiderAudio = { } catch(e){} } }, - hierarchical_loading: function (){ + hiererchical_unloading: function (){ + if (app.cfg.audio.spatial) {CiderAudio.audioNodes.spatialNode.output.disconnect();} else {CiderAudio.audioNodes.gainNode.disconnect();} try { for (var i of CiderAudio.audioNodes.llpw){ i.disconnect(); @@ -207,81 +208,43 @@ var CiderAudio = { i.disconnect(); } } catch(e){} - if (app.cfg.audio.vibrantBass.multiplier != 0) { // If vibrant bass is enabled - if (CiderAudio.audioNodes.llpwEnabled == 1) { // If CAP & vibrant bass is enabled + + + }, + hierarchical_loading: function (){ + if (app.cfg.audio.vibrantBass.multiplier !== 0) { // If vibrant bass is enabled + if (CiderAudio.audioNodes.llpwEnabled === 1) { // If CAP & vibrant bass is enabled CiderAudio.vibrantbass_h2_1(true) - CiderAudio.llpw_h2_2(true, 2) + CiderAudio.llpw_h2_2(true, 2) + if (app.cfg.audio.spatial) {CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.llpw[0]);} + else {CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);} console.log("[Cider][Audio] CAP & vibrant bass is enabled") } else { // If only vibrant bass is enabled CiderAudio.vibrantbass_h2_1(true) CiderAudio.llpw_h2_2(false, 0) + if (app.cfg.audio.spatial) {CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.vibrantbassNode[0]);} + else {CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);} console.log("[Cider][Audio] Only vibrant bass is enabled") } } else { // If vibrant bass is disabled - if (CiderAudio.audioNodes.llpwEnabled == 1) { // If CAP is enabled & vibrant bass is disabled + if (CiderAudio.audioNodes.llpwEnabled === 1) { // If CAP is enabled & vibrant bass is disabled CiderAudio.vibrantbass_h2_1(false) CiderAudio.llpw_h2_2(true, 1) + if (app.cfg.audio.spatial) {CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.llpw[0]);} + else {CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);} console.log("[Cider][Audio] CAP is enabled & vibrant bass is disabled") } else { // If CAP & vibrant bass is disabled CiderAudio.vibrantbass_h2_1(false) CiderAudio.llpw_h2_2(false, 0) + if (app.cfg.audio.spatial) {CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.audioBands[0]);} + else {CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]);} console.log("[Cider][Audio] CAP & vibrant bass is disabled") } } - if (app.cfg.audio.spatial) { - try{ - CiderAudio.audioNodes.spatialNode.output.disconnect();} catch(e){} - if (app.cfg.audio.vibrantBass.multiplier != 0) { // If vibrant bass is enabled - if (CiderAudio.audioNodes.llpwEnabled == 1) { // If CAP & vibrant bass is enabled - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.llpw[0]); - console.log("[Cider][Audio] Spatial is connecting to LLPW") - } - else { // If only vibrant bass is enabled - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.vibrantbassNode[0]); - console.log("[Cider][Audio] Spatial is connecting to Vibrant Bass") - } - } - else { // If vibrant bass is disabled - if (CiderAudio.audioNodes.llpwEnabled == 1) { // If CAP is enabled & vibrant bass is disabled - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.llpw[0]); - console.log("[Cider][Audio] Spatial is connecting to LLPW") - } - else { // If CAP & vibrant bass is disabled - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.audioBands[0]); - console.log("[Cider][Audio] Spatial is connecting to EQ") - } - } - - - } else { - try{ - CiderAudio.audioNodes.gainNode.disconnect();} catch(e){} - if (app.cfg.audio.vibrantBass.multiplier != 0) { // If vibrant bass is enabled - if (CiderAudio.audioNodes.llpwEnabled == 1) { // If CAP & vibrant bass is enabled - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]); - console.log("[Cider][Audio] Gain is connecting to LLPW") - } - else { // If only vibrant bass is enabled - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]); - console.log("[Cider][Audio] Gain is connecting to Vibrant Bass") - } - } - else { // If vibrant bass is disabled - if (CiderAudio.audioNodes.llpwEnabled == 1) { // If CAP is enabled & vibrant bass is disabled - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]); - console.log("[Cider][Audio] Gain is connecting to LLPW") - } - else { // If CAP & vibrant bass is disabled - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]); - console.log("[Cider][Audio] Gain is connecting to EQ") - } - } - - } console.log("[Cider][Audio] Finished hierarchical loading"); }, diff --git a/src/renderer/index.js b/src/renderer/index.js index fb58bd24..b7c60324 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -784,7 +784,6 @@ const app = new Vue({ // app.getNowPlayingArtwork(42); app.getNowPlayingArtworkBG(32); app.loadLyrics(); - app.losslessBadge(); // Playback Notifications if (this.cfg.general.playbackNotifications && !document.hasFocus() && a.artistName && a.artwork && a.name) { @@ -2348,26 +2347,6 @@ const app = new Vue({ }) notyf.success(app.getLz('action.removeFromLibrary.success')) }, - - async losslessBadge() { - const songID = (this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem["_songId"] ?? (this.mk.nowPlayingItem["songId"] ?? -1) : -1; - if (app.cfg.advanced.ciderPPE && songID != -1) { - /**let extendedAssets = await app.mk.api.song(songID, {extend : 'extendedAssetUrls'}) - if (extendedAssets.attributes.audioTraits.includes('lossless')) {*/ - app.mk.nowPlayingItem['attributes']['lossless'] = true - CiderAudio.audioNodes.llpwEnabled = 1 - console.log("[Cider][Audio] PPE Kicking in..."); - CiderAudio.hierarchical_loading(); - /**} - else { - CiderAudio.audioNodes.llpwEnabled = 0 - } */ - } - - else { - CiderAudio.audioNodes.llpwEnabled = 0 - } - }, async loadYTLyrics() { const track = (this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.title ?? '' : ''; const artist = (this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.artistName ?? '' : ''; diff --git a/src/renderer/views/app/chrome-top.ejs b/src/renderer/views/app/chrome-top.ejs index 4c88f6fe..a80eab05 100644 --- a/src/renderer/views/app/chrome-top.ejs +++ b/src/renderer/views/app/chrome-top.ejs @@ -57,7 +57,7 @@ v-if="mk.nowPlayingItem['attributes']['contentRating'] == 'explicit'" style="display: inline-block"> -
+
Date: Sun, 13 Feb 2022 20:49:41 -0800 Subject: [PATCH 3/3] cleaning up a separate func --- src/renderer/audio/audio.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index cee8598b..18d4b3b7 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -197,21 +197,16 @@ var CiderAudio = { } }, hiererchical_unloading: function (){ - if (app.cfg.audio.spatial) {CiderAudio.audioNodes.spatialNode.output.disconnect();} else {CiderAudio.audioNodes.gainNode.disconnect();} try { - for (var i of CiderAudio.audioNodes.llpw){ - i.disconnect(); - } + CiderAudio.audioNodes.spatialNode.output.disconnect(); CiderAudio.audioNodes.gainNode.disconnect(); + for (var i of CiderAudio.audioNodes.llpw){i.disconnect();} + for (var i of CiderAudio.audioNodes.vibrantbassNode){i.disconnect();} + } catch(e){} - try { - for (var i of CiderAudio.audioNodes.vibrantbassNode){ - i.disconnect(); - } - } catch(e){} - }, hierarchical_loading: function (){ + CiderAudio.hiererchical_unloading(); if (app.cfg.audio.vibrantBass.multiplier !== 0) { // If vibrant bass is enabled if (CiderAudio.audioNodes.llpwEnabled === 1) { // If CAP & vibrant bass is enabled CiderAudio.vibrantbass_h2_1(true)