Merge branch 'develop' of https://github.com/ciderapp/Cider into develop
This commit is contained in:
commit
fa5633c501
5 changed files with 161 additions and 138 deletions
Binary file not shown.
|
@ -173,6 +173,7 @@
|
||||||
.app-chrome--right {
|
.app-chrome--right {
|
||||||
width: 30%;
|
width: 30%;
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
|
padding-right: 8px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.collection-page {
|
.collection-page {
|
||||||
|
|
|
@ -604,6 +604,11 @@ const app = new Vue({
|
||||||
try {
|
try {
|
||||||
// Set profile name
|
// Set profile name
|
||||||
this.chrome.userinfo = (await app.mk.api.v3.music(`/v1/me/social-profile`)).data.data[0]
|
this.chrome.userinfo = (await app.mk.api.v3.music(`/v1/me/social-profile`)).data.data[0]
|
||||||
|
// check if this.chrome.userinfo.attributes.artwork exists
|
||||||
|
if (this.chrome.userinfo.attributes.artwork) {
|
||||||
|
document.documentElement.style
|
||||||
|
.setProperty('--cvar-userprofileimg', `url("${this.getMediaItemArtwork(this.chrome.userinfo.attributes.artwork.url)}")`);
|
||||||
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2724,7 +2729,8 @@ const app = new Vue({
|
||||||
}
|
}
|
||||||
} else { //4xx rejected
|
} else { //4xx rejected
|
||||||
getToken(1, track, artist, '', lang, time);
|
getToken(1, track, artist, '', lang, time);
|
||||||
}}catch(e){
|
}
|
||||||
|
} catch (e) {
|
||||||
console.log(e);
|
console.log(e);
|
||||||
app.loadAMLyrics()
|
app.loadAMLyrics()
|
||||||
}
|
}
|
||||||
|
@ -2771,7 +2777,8 @@ const app = new Vue({
|
||||||
}
|
}
|
||||||
} else { //4xx rejected
|
} else { //4xx rejected
|
||||||
getToken(2, '', '', id, lang, '');
|
getToken(2, '', '', id, lang, '');
|
||||||
}}catch(e){}
|
}
|
||||||
|
} catch (e) { }
|
||||||
}
|
}
|
||||||
req2.send();
|
req2.send();
|
||||||
}
|
}
|
||||||
|
|
|
@ -929,6 +929,9 @@
|
||||||
},
|
},
|
||||||
toggleAudioContext: function () {
|
toggleAudioContext: function () {
|
||||||
if (app.cfg.advanced.AudioContext === true) {
|
if (app.cfg.advanced.AudioContext === true) {
|
||||||
|
if (navigator.hardwareConcurrency < 6) {
|
||||||
|
bootbox.confirm("Cider detects less than 6 logical processors, turning this on will most certainly lag. Are you sure you want to continue?", function (result) {
|
||||||
|
if (result) {
|
||||||
CiderAudio.init();
|
CiderAudio.init();
|
||||||
if (app.cfg.audio.normalization === true) {
|
if (app.cfg.audio.normalization === true) {
|
||||||
CiderAudio.normalizerOn()
|
CiderAudio.normalizerOn()
|
||||||
|
@ -937,6 +940,18 @@
|
||||||
CiderAudio.spatialOn()
|
CiderAudio.spatialOn()
|
||||||
CiderAudio.hierarchical_loading();
|
CiderAudio.hierarchical_loading();
|
||||||
}
|
}
|
||||||
|
}})
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
CiderAudio.init();
|
||||||
|
if (app.cfg.audio.normalization === true) {
|
||||||
|
CiderAudio.normalizerOn()
|
||||||
|
}
|
||||||
|
if (app.cfg.audio.spatial === true) {
|
||||||
|
CiderAudio.spatialOn()
|
||||||
|
CiderAudio.hierarchical_loading();
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
CiderAudio.off();
|
CiderAudio.off();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue