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] = []