okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

holy balls optimization

Browse source
This commit is contained in:
Maikiwi 2022-07-31 16:32:43 -07:00
parent 8a94bf247f
commit b4b6b0f988
8 changed files with 25 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/renderer/main/app.js
View file

@ -33,11 +33,14 @@ if (app.cfg.advanced.disableLogging === true) {
// Mount Vue to #app // Mount Vue to #app
app.$mount("#app") app.$mount("#app")
// Init CiderAudio // Init CiderAudio and force audiocontext
if (app.cfg.advanced.AudioContext === true) { if (app.cfg.advanced.AudioContext != true) {
CiderAudio.init() app.cfg.advanced.AudioContext = true;
window.location.reload();
} }
CiderAudio.init()
// Import gamepad support // Import gamepad support
app.simulateGamepad = simulateGamepad app.simulateGamepad = simulateGamepad
app.spawnMica = spawnMica app.spawnMica = spawnMica

10
src/renderer/main/vueapp.js
View file

@ -1007,8 +1007,8 @@ const app = new Vue({
try {localStorage.setItem("playingBitrate", app.mk.nowPlayingItem.flavor)} try {localStorage.setItem("playingBitrate", app.mk.nowPlayingItem.flavor)}
catch(e) {} catch(e) {}
} }
if (!app.cfg.audio.normalization && app.cfg.advanced.AudioContext === false) { CiderAudio.hierarchical_loading(); }
if (app.cfg.audio.normalization === false) { CiderAudio.hierarchical_loading(); } // Just Reload for Adaptive CAP if norm is off
else { else {
// get unencrypted audio previews to get SoundCheck's normalization tag // get unencrypted audio previews to get SoundCheck's normalization tag
try { try {
@ -4354,7 +4354,7 @@ const app = new Vue({
"id": "equalizer", "id": "equalizer",
"icon": "../views/svg/speaker.svg", "icon": "../views/svg/speaker.svg",
"name": app.getLz('term.equalizer'), "name": app.getLz('term.equalizer'),
"hidden": true, "hidden": false,
"action": function () { "action": function () {
app.modals.equalizer = true app.modals.equalizer = true
app.modals.audioSettings = false app.modals.audioSettings = false
@ -4364,7 +4364,7 @@ const app = new Vue({
"id": "audioLab", "id": "audioLab",
"icon": "../views/svg/speaker.svg", "icon": "../views/svg/speaker.svg",
"name": app.getLz('settings.option.audio.audioLab'), "name": app.getLz('settings.option.audio.audioLab'),
"hidden": true, "hidden": false,
"action": function () { "action": function () {
app.openSettingsPage('audiolabs') app.openSettingsPage('audiolabs')
} }
@ -4372,10 +4372,12 @@ const app = new Vue({
] ]
} }
} }
/*
if (this.cfg.advanced.AudioContext) { if (this.cfg.advanced.AudioContext) {
menus.normal.items.find(i => i.id === 'audioLab').hidden = false menus.normal.items.find(i => i.id === 'audioLab').hidden = false
menus.normal.items.find(i => i.id === 'equalizer').hidden = false menus.normal.items.find(i => i.id === 'equalizer').hidden = false
} }
*/
if (this.contextExt) { if (this.contextExt) {
if (this.contextExt.normal) { if (this.contextExt.normal) {
menus.normal.items = menus.normal.items.concat(this.contextExt.normal) menus.normal.items = menus.normal.items.concat(this.contextExt.normal)

4
src/renderer/views/app/app-navigation.ejs
View file

@ -65,7 +65,7 @@
</button> </button>
<button <button
class="usermenu-item" class="usermenu-item"
@click="cfg.advanced.AudioContext ? modals.castMenu = true :(cfg.advanced.AudioContext = true, modals.castMenu = true)" @click="modals.castMenu = true"
> >
<span class="usermenu-item-icon"> <span class="usermenu-item-icon">
<%- include("../svg/cast.svg") %> <%- include("../svg/cast.svg") %>
@ -76,7 +76,7 @@
</button> </button>
<button <button
class="usermenu-item" class="usermenu-item"
@click="cfg.advanced.AudioContext ? modals.audioSettings = true : (cfg.advanced.AudioContext = true, modals.audioSettings = true)" @click="modals.audioSettings = true"
> >
<span class="usermenu-item-icon"> <span class="usermenu-item-icon">
<%- include("../svg/headphones.svg") %> <%- include("../svg/headphones.svg") %>

2
src/renderer/views/app/chrome-bottom.ejs
View file

@ -152,7 +152,7 @@
<button class="playback-button--small cast" <button class="playback-button--small cast"
:title="$root.getLz('term.cast')" :title="$root.getLz('term.cast')"
v-b-tooltip.hover v-b-tooltip.hover
@click="cfg.advanced.AudioContext ? modals.castMenu = true : (cfg.advanced.AudioContext = true, modals.castMenu = true)"></button> @click="modals.castMenu = true"></button>
</div> </div>
<div class="app-chrome-item generic"> <div class="app-chrome-item generic">
<button class="playback-button--small queue" :class="{'active': drawer.panel == 'queue'}" <button class="playback-button--small queue" :class="{'active': drawer.panel == 'queue'}"

2
src/renderer/views/app/chrome-top.ejs
View file

@ -231,7 +231,7 @@
</div> </div>
<div class="app-chrome-item generic"> <div class="app-chrome-item generic">
<button class="playback-button--small cast" :title="$root.getLz('term.cast')" <button class="playback-button--small cast" :title="$root.getLz('term.cast')"
@click="cfg.advanced.AudioContext ? modals.castMenu = true : (cfg.advanced.AudioContext = true, modals.castMenu = true)" @click="modals.castMenu = true"
v-b-tooltip.hover></button> v-b-tooltip.hover></button>
</div> </div>
<div class="app-chrome-item generic"> <div class="app-chrome-item generic">

35
src/renderer/views/components/settings-window.ejs
View file

@ -348,20 +348,6 @@
</div> </div>
</div> </div>
<div class="md-option-line"> <div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality')}}
<br>
<small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.description')}}</small>
</div>
<div class="md-option-segment md-option-segment_auto">
<label>
<input type="checkbox" v-model="app.cfg.advanced.AudioContext"
v-on:change="toggleAudioContext"
switch/>
</label>
</div>
</div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('term.equalizer')}} {{$root.getLz('term.equalizer')}}
</div> </div>
@ -371,7 +357,7 @@
</button> </button>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext"> <div class="md-option-line">
<div class="md-option-segment" style="white-space: pre-line;"> <div class="md-option-segment" style="white-space: pre-line;">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioNormalization')}} {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioNormalization')}}
<small>{{app.cfg.audio.equalizer.vibrantBass != 0 || <small>{{app.cfg.audio.equalizer.vibrantBass != 0 ||
@ -391,7 +377,7 @@
</div> </div>
</div> </div>
<div class="md-option-line" <div class="md-option-line"
v-show="app.cfg.advanced.AudioContext && app.cfg.audio.normalization && app.cfg.audio.advanced"> v-show="app.cfg.audio.normalization && app.cfg.audio.advanced">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('settings.option.audio.dbspl.display')}} {{$root.getLz('settings.option.audio.dbspl.display')}}
<br> <br>
@ -419,7 +405,7 @@
</div> </div>
</div> </div>
</b-tab> </b-tab>
<b-tab v-if="app.cfg.advanced.AudioContext"> <b-tab>
<template #title> <template #title>
<div> <div>
<svg-icon url="./assets/feather/zap.svg" classes="svg-md" name="settings-audiolabs"/> <svg-icon url="./assets/feather/zap.svg" classes="svg-md" name="settings-audiolabs"/>
@ -1488,21 +1474,6 @@
removeExperiment(flag) { removeExperiment(flag) {
app.cfg.advanced.experiments.splice(app.cfg.advanced.experiments.indexOf(flag), 1); app.cfg.advanced.experiments.splice(app.cfg.advanced.experiments.indexOf(flag), 1);
}, },
toggleAudioContext: function () {
if (app.cfg.advanced.AudioContext === true) {
if (navigator.hardwareConcurrency < 6) {
app.confirm(app.getLz("settings.warn.audio.enableAdvancedFunctionality.lowcores"), function (result) {
if (result) {
window.location.reload();
}
})
} else {
window.location.reload()
}
} else {
window.location.reload()
}
},
toggleNormalization: function () { toggleNormalization: function () {
if (app.cfg.audio.normalization) { if (app.cfg.audio.normalization) {
CiderAudio.normalizerOn() CiderAudio.normalizerOn()

20
src/renderer/views/pages/audiolabs.ejs
View file

@ -6,15 +6,7 @@
<b-jumbotron :header="$root.getLz('settings.option.audio.audioLab')" <b-jumbotron :header="$root.getLz('settings.option.audio.audioLab')"
lead="Designed by Cider Acoustic Technologies in California"></b-jumbotron> lead="Designed by Cider Acoustic Technologies in California"></b-jumbotron>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === false"> <div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.warn.audioLab.withoutAF')}}
</div>
<button class="md-btn" style="margin-top: 5px;" onclick="app.appRoute('settings')">
{{$root.getLz('term.settings')}}
</button>
</div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}} {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
<br> <br>
@ -44,7 +36,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true"> <div class="md-option-line">
<div class="md-option-segment"> <div class="md-option-segment">
Cider Opportunistic Correction System Cider Opportunistic Correction System
<br> <br>
@ -59,7 +51,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true"> <div class="md-option-line">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [1] {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [1]
<br> <br>
@ -84,7 +76,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true"> <div class="md-option-line">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [2] {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [2]
<br> <br>
@ -109,7 +101,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true"> <div class="md-option-line">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization')}} {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization')}}
<br> <br>
@ -139,7 +131,7 @@
<div class="md-option-header"> <div class="md-option-header">
<span>{{$root.getLz('settings.header.unfinished')}}</span> <span>{{$root.getLz('settings.header.unfinished')}}</span>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true"> <div class="md-option-line">
<div class="md-option-segment"> <div class="md-option-segment">
Cider Origami™️ Vocal Enhancer/Remasterer Cider Origami™️ Vocal Enhancer/Remasterer
<br> <br>

13
src/renderer/views/pages/oobe.ejs
View file

@ -98,19 +98,6 @@
<div class="md-option-container"> <div class="md-option-container">
<div class="settings-option-body"> <div class="settings-option-body">
<div class="md-option-line"> <div class="md-option-line">
<div class="md-option-segment">
{{getLz('settings.option.audio.enableAdvancedFunctionality')}}
<br>
<small>{{getLz('settings.option.audio.enableAdvancedFunctionality.description')}}</small>
</div>
<div class="md-option-segment md-option-segment_auto">
<label>
<input type="checkbox" v-model="$root.cfg.advanced.AudioContext"
switch/>
</label>
</div>
</div>
<div class="md-option-line" v-show="$root.cfg.advanced.AudioContext === true">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}} {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
<br> <br>