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

Merge branch 'develop' of https://github.com/Apple-Music-Electron/Cider into develop

Browse source
This commit is contained in:
cryptofyre 2022-02-20 10:43:25 -06:00
commit 04899cda77
7 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/i18n/en_US.jsonc
View file

@ -126,7 +126,7 @@
"term.equalizer": "Equalizer", "term.equalizer": "Equalizer",
"term.reset": "Reset", "term.reset": "Reset",
// Example for multiple plural forms : look up the key for your language in https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages // Example for multiple plural forms : look up the key for your language in https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages
// "term.track": { // "term.tracks": {
// "one" : "track", // "one" : "track",
// "other" : "tracks" // "other" : "tracks"
// }, // },
@ -168,6 +168,7 @@
"term.topAlbums": "Top Albums", "term.topAlbums": "Top Albums",
"term.plays": "Plays", "term.plays": "Plays",
"term.topGenres": "Top Genres", "term.topGenres": "Top Genres",
"term.confirmLogout" : "Are you sure you want to logout?",
// Home // Home
"home.title": "Home", "home.title": "Home",

13
src/main/base/browserwindow.ts
View file

@ -684,7 +684,7 @@ export class BrowserWindow {
console.log(err) console.log(err)
}); });
}); });
/*
ipcMain.on('check-for-update', async (_event) => { ipcMain.on('check-for-update', async (_event) => {
const branch = utils.getStoreValue('general.update_branch') const branch = utils.getStoreValue('general.update_branch')
let latestbranch = await fetch(`https://circleci.com/api/v1.1/project/gh/ciderapp/Cider/latest/artifacts?branch=${branch}&filter=successful`) let latestbranch = await fetch(`https://circleci.com/api/v1.1/project/gh/ciderapp/Cider/latest/artifacts?branch=${branch}&filter=successful`)
@ -695,15 +695,15 @@ export class BrowserWindow {
let latestbranchjson = await latestbranch.json() let latestbranchjson = await latestbranch.json()
let base_url = latestbranchjson[0].url let base_url = latestbranchjson[0].url
base_url = base_url.substr(0, base_url.lastIndexOf('/')) base_url = base_url.substring(0, base_url.lastIndexOf('/'))
const options: any = { const options: any = {
provider: 'generic', provider: 'generic',
url: `${base_url}` url: `${base_url}`
}*/ }
/*
* Have to handle the auto updaters seperatly until we can support macOS. electron-builder limitation -q // Have to handle the auto updaters seperatly until we can support macOS. electron-builder limitation -q
*/ /*
const win_autoUpdater = new NsisUpdater(options) //Windows const win_autoUpdater = new NsisUpdater(options) //Windows
const linux_autoUpdater = new AppImageUpdater(options) //Linux const linux_autoUpdater = new AppImageUpdater(options) //Linux
await win_autoUpdater.checkForUpdatesAndNotify() await win_autoUpdater.checkForUpdatesAndNotify()
@ -717,7 +717,6 @@ export class BrowserWindow {
event.returnValue = true event.returnValue = true
} }
}) })
*/
ipcMain.on('share-menu', async (_event, url) => { ipcMain.on('share-menu', async (_event, url) => {
if (process.platform != 'darwin') return; if (process.platform != 'darwin') return;

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

@ -462,7 +462,7 @@ var CiderAudio = {
// Analog Warmth // Analog Warmth
else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 && else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 &&
app.cfg.audio.maikiwiAudio.ciderPPE === false && app.cfg.audio.maikiwiAudio.ciderPPE === false &&
app.cfg.audio.maikiwiAudio.spatial === false && app.cfg.audio.spatial === false &&
app.cfg.audio.maikiwiAudio.analogWarmth === true) { app.cfg.audio.maikiwiAudio.analogWarmth === true) {
CiderAudio.analogWarmth_h2_3(true, 1); CiderAudio.analogWarmth_h2_3(true, 1);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
@ -476,7 +476,6 @@ var CiderAudio = {
if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) {
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.audioBands[0]); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.audioBands[0]);
console.log('[Cider][Audio] Maikiwi Spatial') console.log('[Cider][Audio] Maikiwi Spatial')

17
src/renderer/index.js
View file

@ -895,8 +895,11 @@ const app = new Vue({
less.refresh() less.refresh()
}, },
unauthorize() { unauthorize() {
this.mk.unauthorize() bootbox.confirm(app.getLz('term.confirmLogout'), function(result){
document.location.reload() if (result){
app.mk.unauthorize()
document.location.reload()}
});
}, },
getAppClasses() { getAppClasses() {
let classes = {} let classes = {}
@ -2375,9 +2378,6 @@ const app = new Vue({
}, 13000) }, 13000)
}) })
}, },
unauthorize() {
this.mk.unauthorize()
},
showSearch() { showSearch() {
this.page = "search" this.page = "search"
}, },
@ -2497,7 +2497,7 @@ const app = new Vue({
let richsync = []; let richsync = [];
const lang = app.cfg.lyrics.mxm_language // translation language const lang = app.cfg.lyrics.mxm_language // translation language
function revisedRandId() { function revisedRandId() {
return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(2, 10); return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10);
} }
/* get token */ /* get token */
@ -3816,7 +3816,10 @@ const app = new Vue({
mediaKeyFixes() { mediaKeyFixes() {
navigator.mediaSession.setActionHandler('previoustrack', function () { app.prevButton() }); navigator.mediaSession.setActionHandler('previoustrack', function () { app.prevButton() });
navigator.mediaSession.setActionHandler('nexttrack', function () { app.skipToNextItem() }); navigator.mediaSession.setActionHandler('nexttrack', function () { app.skipToNextItem() });
} },
checkForUpdate() {
ipcRenderer.send('check-for-update')
},
} }
}) })

2
src/renderer/views/components/mediaitem-square.ejs
View file

@ -145,7 +145,7 @@
} }
}, },
revisedRandId() { revisedRandId() {
return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(2, 10); return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10);
}, },
async isInLibrary() { async isInLibrary() {
if (this.item.type && !this.item.type.includes("library")) { if (this.item.type && !this.item.type.includes("library")) {

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

@ -48,7 +48,7 @@
<input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.analogWarmth" v-on:change="CiderAudio.hierarchical_loading();" switch/> <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.analogWarmth" v-on:change="CiderAudio.hierarchical_loading();" switch/>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.audio.maikiwiAudio.analogWarmth === true"> <div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true && app.cfg.audio.maikiwiAudio.analogWarmth === true">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity')}} {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity')}}
<br> <br>
@ -63,7 +63,7 @@
</button> </button>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext"> <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.audioSpatialization')}} {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization')}}
<br> <br>
@ -73,7 +73,7 @@
<input type="checkbox" v-model="app.cfg.audio.spatial" v-on:change="toggleSpatial" switch/> <input type="checkbox" v-model="app.cfg.audio.spatial" v-on:change="toggleSpatial" switch/>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext"> <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.tunedAudioSpatialization')}} {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization')}}
<br> <br>
@ -83,7 +83,7 @@
<input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.spatial" :disabled="app.cfg.audio.spatial === false" v-on:change="toggleSpatial" switch/> <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.spatial" :disabled="app.cfg.audio.spatial === false" v-on:change="toggleSpatial" switch/>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.spatial"> <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.spatial === true && app.cfg.audio.spatial === true">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile')}} {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile')}}
<br> <br>
@ -120,7 +120,8 @@
CiderAudio.hierarchical_loading(); CiderAudio.hierarchical_loading();
} }
else { else {
CiderAudio.spatialOff() app.cfg.audio.maikiwiAudio.spatial = false;
CiderAudio.spatialOff()
} }
}, },

2
src/web-remote/views/components/mediaitem-square.ejs
View file

@ -153,7 +153,7 @@
} }
}, },
revisedRandId() { revisedRandId() {
return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(2, 10); return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10);
}, },
async isInLibrary() { async isInLibrary() {
if (this.item.type && !this.item.type.includes("library")) { if (this.item.type && !this.item.type.includes("library")) {