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

Merge branch 'ciderapp:develop' into develop

Browse source
This commit is contained in:
Amaru8 2022-04-09 07:35:56 +00:00 • committed by GitHub
commit 9188ca8812
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 1034 additions and 497 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/base/store.ts
View file

@ -72,6 +72,8 @@ export class Store {
"ciderPPE_value": "MAIKIWI",
"analogWarmth": false,
"analogWarmth_value": "SMOOTH",
"atmosphereRealizer": false,
"atmosphereRealizer_value": "NATURAL_STANDARD",
"spatial": false,
"spatialProfile": "71_420maikiwi",
"vibrantBass": { // Hard coded into the app. Don't include any of this config into exporting presets in store.ts

890
src/renderer/audio/audio.js
View file

File diff suppressed because it is too large Load diff

BIN
src/renderer/audio/impulses/AtmosphereRealizer_Natural+.wav Normal file
View file

Binary file not shown.

BIN
src/renderer/audio/impulses/AtmosphereRealizer_NaturalHigh.wav Normal file
View file

Binary file not shown.

BIN
src/renderer/audio/impulses/AtmosphereRealizer_NaturalStandard.wav Normal file
View file

Binary file not shown.

BIN
src/renderer/audio/impulses/CiderSpatial_v70.421_Maikiwi.wav
View file

Binary file not shown.

BIN
src/renderer/audio/impulses/CiderSpatial_v72.420_Maikiwi.wav Normal file
View file

Binary file not shown.

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

@ -579,11 +579,11 @@ const app = new Vue({
this.setTheme(this.cfg.visual.theme)
}
if(this.platform == "darwin") {
if (this.platform == "darwin") {
this.chrome.windowControlPosition = "left"
}
if(this.cfg.visual.nativeTitleBar) {
if (this.cfg.visual.nativeTitleBar) {
this.chrome.nativeControls = true
}
@ -765,7 +765,8 @@ const app = new Vue({
// let replaygain = self.parseSCTagToRG(tag)
try {
if (app.mk.nowPlayingItem.type !== 'song') {
CiderAudio.audioNodes.gainNode.gain.value = 0.70794578438;}
CiderAudio.audioNodes.gainNode.gain.value = 0.70794578438;
}
else {
let soundcheck = tag.split(" ")
let numbers = []
@ -775,14 +776,14 @@ 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, ((-1 - (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
} catch (e) {}
} catch (e) { }
}
} catch (e) {ipcRenderer.send('SoundCheckTag', event, tag);} // brute force until it works
} catch (e) { ipcRenderer.send('SoundCheckTag', event, tag); } // brute force until it works
})
ipcRenderer.on('play', function (_event, mode, id) {
@ -952,7 +953,7 @@ const app = new Vue({
less.refresh()
}
},
macOSEmu () {
macOSEmu() {
this.chrome.forceDirectives["macosemu"] = {
value: true
}
@ -989,8 +990,8 @@ const app = new Vue({
classes.simplebg = true
}
if(this.platform !== "darwin") {
switch(parseInt(this.cfg.visual.windowControlPosition)) {
if (this.platform !== "darwin") {
switch (parseInt(this.cfg.visual.windowControlPosition)) {
default:
case 0:
this.chrome.windowControlPosition = "right"
@ -1010,10 +1011,10 @@ const app = new Vue({
if (this.getThemeDirective('windowLayout') == 'twopanel') {
classes.twopanel = true
}
if(this.getThemeDirective("appNavigation") == "seperate"){
if (this.getThemeDirective("appNavigation") == "seperate") {
classes.navbar = true
}
if(this.getThemeDirective("macosemu") == true){
if (this.getThemeDirective("macosemu") == true) {
classes.macosemu = true
}
return classes
@ -2531,7 +2532,7 @@ const app = new Vue({
this.loadYTLyrics();
} else {
// if (app.cfg.lyrics.enable_mxm) {
this.loadMXM();
this.loadMXM();
// } else {
// this.loadAMLyrics();
// }
@ -3342,7 +3343,7 @@ const app = new Vue({
return "https://beta.music.apple.com/assets/product/MissingArtworkMusic.svg"
}
height = parseInt(height * window.devicePixelRatio)
if(width) {
if (width) {
width = parseInt(width * window.devicePixelRatio)
}
let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900) ? "sr" : "cc"))}`;
@ -3784,10 +3785,33 @@ const app = new Vue({
app.songLinkShare((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
})
}
}
},
{
"id": "equalizer",
"icon": "../views/svg/speaker.svg",
"name": app.getLz('term.equalizer'),
"hidden": true,
"action": function () {
app.modals.equalizer = true
app.modals.audioSettings = false
}
},
{
"id": "audioLab",
"icon": "../views/svg/speaker.svg",
"name": app.getLz('settings.option.audio.audioLab'),
"hidden": true,
"action": function () {
app.appRoute('audiolabs')
}
},
]
}
}
if(this.cfg.advanced.AudioContext) {
menus.normal.items.find(i => i.id === 'audioLab').hidden = false
menus.normal.items.find(i => i.id === 'equalizer').hidden = false
}
if (this.contextExt) {
if (this.contextExt.normal) {
menus.normal.items = menus.normal.items.concat(this.contextExt.normal)

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

@ -77,6 +77,33 @@
</select>
</div>
</div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true">
<div class="md-option-segment">
Cider Atmosphere Realizer™️
<br>
<small>Realizes a different musical atmosphere modelled after the state of the art audio setups.</small>
</div>
<div class="md-option-segment md-option-segment_auto">
<input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.atmosphereRealizer"
v-on:change="CiderAudio.hierarchical_loading();" switch/>
</div>
</div>
<div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.atmosphereRealizer === true">
<div class="md-option-segment">
Cider Atmosphere Realizer™️ Mode
<br>
<small>Changes the mode of operation of the Atmosphere Realizer module.</small>
</div>
<div class="md-option-segment md-option-segment_auto">
<select class="md-select" style="width:180px;"
v-model="app.cfg.audio.maikiwiAudio.atmosphereRealizer_value"
v-on:change="CiderAudio.hierarchical_loading()">
<option value="NATURAL_STANDARD">Natural (Standard)</option>
<option value="NATURAL_HIGH">Natural (High)</option>
<option value="NATURAL_PLUS">Natural (Plus)</option>
</select>
</div>
</div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true">
<div class="md-option-segment">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization')}}
@ -133,22 +160,6 @@
<div class="md-option-header">
<span>{{$root.getLz('settings.header.unfinished')}}</span>
</div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true">
<div class="md-option-segment">
Cider Atmosphere Realizer™️
<br>
<small>Realizes an entirely different musical atmosphere only to be found on state of the
art audio setups.</small>
</div>
<div class="md-option-segment md-option-segment_auto">
<button class="md-btn">
Signature
</button>
<button class="md-btn">
Signature+
</button>
</div>
</div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true">
<div class="md-option-segment">
Cider Origami™️ Vocal Enhancer/Remasterer
@ -263,6 +274,12 @@
CiderAudio.audioNodes.analogWarmth[i].gain.value = WARMTH_GAIN[i] * 1.75;
}
break;
default:
app.cfg.audio.maikiwiAudio.analogWarmth_value = "SMOOTH";
for (let i = 0; i < 23; i++) {
CiderAudio.audioNodes.analogWarmth[i].gain.value = WARMTH_GAIN[i] * 1.25;
}
break;
}
},