(${app.getLz('term.authed')}: ${lfmAuthKey})
`; + element.onclick = app.LastFMDeauthorize; + }); + }, + /** + parseSCTagToRG: function (tag) { + let soundcheck = tag.split(" ") + let numbers = [] + for (item of soundcheck) { + numbers.push(parseInt(item, 16)) + + } + numbers.shift() + //let gain = Math.log10((Math.max(numbers[0], numbers[1]) ?? 1000) / 1000.0) * -10 + let peak = Math.max(numbers[6], numbers[7]) / 32768.0 + let gain = Math.pow(10, ((-7.63 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant + return { + gain: gain, + peak: peak + } + },*/ + fullscreen(flag) { + if (flag) { + ipcRenderer.send('setFullScreen', true); + if (app.mk.nowPlayingItem.type && app.mk.nowPlayingItem.type.toLowerCase().includes("video")) { + document.querySelector('video#apple-music-video-player').requestFullscreen() + } else { + app.appMode = 'fullscreen'; + } + document.addEventListener('keydown', event => { + if (event.key === 'Escape' && app.appMode === 'fullscreen') { + this.fullscreen(false); + } + }); + } else { + ipcRenderer.send('setFullScreen', false); + app.appMode = 'player'; + } + }, + miniPlayer(flag) { + if (flag) { + this.tmpWidth = window.innerWidth; + this.tmpHeight = window.innerHeight; + ipcRenderer.send('unmaximize'); + ipcRenderer.send('windowmin', 250, 250) + ipcRenderer.send('windowresize', 300, 300, false) + app.appMode = 'mini'; + } else { + ipcRenderer.send('windowmin', 844, 410) + ipcRenderer.send('windowresize', this.tmpWidth, this.tmpHeight, false) + ipcRenderer.send('windowontop', false) + this.cfg.visual.miniplayer_top_toggle = true; + app.appMode = 'player'; + } + }, + pinMiniPlayer() { + if (this.cfg.visual.miniplayer_top_toggle) { + ipcRenderer.send('windowontop', true) + this.cfg.visual.miniplayer_top_toggle = false + } else { + ipcRenderer.send('windowontop', false) + this.cfg.visual.miniplayer_top_toggle = true; + } + }, + formatTimezoneOffset: (e = new Date) => { + let leadingZeros = (e, s = 2) => { + let n = "" + e; + for (; n.length < s;) + n = "0" + n; + return n + } + + const s = e.getTimezoneOffset(), + n = Math.floor(Math.abs(s) / 60), + d = Math.round(Math.abs(s) % 60); + let h = "+"; + return 0 !== s && (h = s > 0 ? "-" : "+"), + `${h}${leadingZeros(n, 2)}:${leadingZeros(d, 2)}` + }, + toggleHideUserInfo() { + if (this.chrome.hideUserInfo) { + this.cfg.visual.showuserinfo = true + this.chrome.hideUserInfo = false + } else { + this.cfg.visual.showuserinfo = false + this.chrome.hideUserInfo = true + } + }, + isElementOverflowing(selector) { + try { + let element = document.querySelector(selector); + var overflowX = element.offsetWidth < element.scrollWidth, + overflowY = element.offsetHeight < element.scrollHeight; + element.setAttribute('data-value', '\xa0\xa0\xa0\xa0' + element.textContent); + + return (overflowX || overflowY); + } catch (e) { + return false + } + }, + async showWebRemoteQR() { + //this.webremoteqr = await ipcRenderer.invoke('setRemoteQR','') + this.webremoteurl = await ipcRenderer.invoke('showQR', '') + //this.modals.qrcode = true; + }, + checkMarquee() { + if (isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') == true) { + document.getElementsByClassName('song-artist')[0].classList.add('marquee'); + document.getElementsByClassName('song-artist')[1].classList.add('marquee-after'); + } + if (isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') == true) { + document.getElementsByClassName('song-name')[0].classList.add('marquee'); + document.getElementsByClassName('song-name')[1].classList.add('marquee-after'); + } + }, + closeWindow() { + ipcRenderer.send('close'); + }, + darwinShare(url) { + ipcRenderer.send('share-menu', url) + }, + arrayToChunk(arr, chunkSize) { + let R = []; + for (let i = 0, len = arr.length; i < len; i += chunkSize) { + R.push(arr.slice(i, i + chunkSize)); + } + return R; + }, + SpacePause() { + const elems = document.querySelectorAll('input'); + for (let elem of elems) { + if (elem === document.activeElement) { + return; + } + } + if (!this.isDev) // disable in dev mode to keep my sanity + MusicKitInterop.playPause(); + }, + async MKJSLang() { + let u = this.cfg.general.language; + // use MusicKit.getInstance or crash + try { + let item = await MusicKit.getInstance().api.v3.music(`v1/storefronts/${app.mk.storefrontId}`) + let langcodes = item.data.data[0].attributes.supportedLanguageTags; + if (langcodes) langcodes = langcodes.map(function (u) { + return u.replace(/-Han[s|t]/i, "").toLowerCase() + }) + console.log(langcodes) + let sellang = "" + if (u && langcodes.includes(u.toLowerCase().replace('_', "-"))) { + sellang = ((u.toLowerCase()).replace('_', "-")) + } else if (u && u.includes('_') && langcodes.includes(((u.toLowerCase()).replace('_', "-")).split("-")[0])) { + sellang = ((u.toLowerCase()).replace('_', "-")).split("-")[0] + } + if (sellang == "") sellang = (item.data.data[0].attributes.defaultLanguageTag).toLowerCase() + + // Fix weird locales: + if (sellang == "iw") sellang = "iw-il" + sellang = sellang.replace(/-Han[s|t]/i, "").toLowerCase() + + console.log(sellang) + return await sellang + } catch (err) { + console.log('locale err', err) + let langcodes = ['af', 'sq', 'ar', 'eu', 'bg', 'be', 'ca', 'zh', 'zh-tw', 'zh-cn', 'zh-hk', 'zh-sg', 'hr', 'cs', 'da', 'nl', 'nl-be', 'en', 'en-us', 'en-eg', 'en-au', 'en-gb', 'en-ca', 'en-nz', 'en-ie', 'en-za', 'en-jm', 'en-bz', 'en-tt', 'en-001', 'et', 'fo', 'fa', 'fi', 'fr', 'fr-ca', 'gd', 'de', 'de-ch', 'el', 'he', 'hi', 'hu', 'is', 'id', 'it', 'ja', 'ko', 'lv', 'lt', 'mk', 'mt', 'no', 'nb', 'nn', 'pl', 'pt-br', 'pt', 'rm', 'ro', 'ru', 'sr', 'sk', 'sl', 'es', 'es-mx', 'es-419', 'sv', 'th', 'ts', 'tn', 'tr', 'uk', 'ur', 've', 'vi', 'xh', 'yi', 'zu', 'ms', 'iw', 'lo', 'tl', 'kk', 'ta', 'te', 'bn', 'ga', 'ht', 'la', 'pa', 'sa']; + let sellang = "en" + if (u && langcodes.includes(u.toLowerCase().replace('_', "-"))) { + sellang = ((u.toLowerCase()).replace('_', "-")) + } else if (u && u.includes('_') && langcodes.includes(((u.toLowerCase()).replace('_', "-")).split("-")[0])) { + sellang = ((u.toLowerCase()).replace('_', "-")).split("-")[0] + } + if (sellang.startsWith("en") && this.mk.storefrontId != "us") sellang = "en-gb" + return await sellang + } + }, + skipToNextItem() { + app.prevButtonBackIndicator = false; + // app.mk.skipToNextItem() is buggy somehow so use this + if (this.mk.queue.nextPlayableItemIndex != -1 && this.mk.queue.nextPlayableItemIndex != null) + this.mk.changeToMediaAtIndex(this.mk.queue.nextPlayableItemIndex); + }, + skipToPreviousItem() { + // app.mk.skipToPreviousItem() is buggy somehow so use this + if (this.mk.queue.previousPlayableItemIndex != -1 && this.mk.queue.previousPlayableItemIndex != null) + this.mk.changeToMediaAtIndex(this.mk.queue.previousPlayableItemIndex); + }, + mediaKeyFixes() { + navigator.mediaSession.setActionHandler('previoustrack', function () { + app.prevButton() + }); + navigator.mediaSession.setActionHandler('nexttrack', function () { + app.skipToNextItem() + }); + }, + checkForUpdate() { + ipcRenderer.send('check-for-update') + ipcRenderer.on('update-response', (event, res) => { + if (res === "update-not-available") { + notyf.error(app.getLz(`settings.notyf.updateCider.${res}`)) + } else if (res === "update-downloaded") { + notyf.success(app.getLz(`settings.notyf.updateCider.${res}`)) + } else if (res === "update-error") { + notyf.error(app.getLz(`settings.notyf.updateCider.${res}`)) + } else if (res === "update-timeout") { + notyf.error(app.getLz(`settings.notyf.updateCider.${res}`)) + } + + }) + }, + } +}) + + +export { app } \ No newline at end of file diff --git a/src/renderer/main/vuex-store.js b/src/renderer/main/vuex-store.js new file mode 100644 index 00000000..fb2b774f --- /dev/null +++ b/src/renderer/main/vuex-store.js @@ -0,0 +1,20 @@ +const store = new Vuex.Store({ + state: { + library: { + // songs: ipcRenderer.sendSync("get-library-songs"), + // albums: ipcRenderer.sendSync("get-library-albums"), + // recentlyAdded: ipcRenderer.sendSync("get-library-recentlyAdded"), + // playlists: ipcRenderer.sendSync("get-library-playlists") + }, + artwork: { + playerLCD: "" + } + }, + mutations: { + setLCDArtwork(state, artwork) { + state.artwork.playerLCD = artwork + } + } +}) + +export {store} \ No newline at end of file diff --git a/src/renderer/js/WSAPI_Interop.js b/src/renderer/main/wsapi_interop.js similarity index 92% rename from src/renderer/js/WSAPI_Interop.js rename to src/renderer/main/wsapi_interop.js index 16002fae..563b2e30 100644 --- a/src/renderer/js/WSAPI_Interop.js +++ b/src/renderer/main/wsapi_interop.js @@ -49,13 +49,13 @@ const wsapi = { }, musickitApi(method, id, params, library = false) { if (library) { - MusicKit.getInstance().api.library[method](id, params).then((results)=>{ - ipcRenderer.send('wsapi-returnMusicKitApi', JSON.stringify(results), method) - }) + MusicKit.getInstance().api.library[method](id, params).then((results)=>{ + ipcRenderer.send('wsapi-returnMusicKitApi', JSON.stringify(results), method) + }) } else { - MusicKit.getInstance().api[method](id, params).then((results)=>{ - ipcRenderer.send('wsapi-returnMusicKitApi', JSON.stringify(results), method) - }) + MusicKit.getInstance().api[method](id, params).then((results)=>{ + ipcRenderer.send('wsapi-returnMusicKitApi', JSON.stringify(results), method) + }) } }, getPlaybackState () { @@ -111,4 +111,6 @@ const wsapi = { getmaxVolume() { ipcRenderer.send('wsapi-returnvolumeMax',JSON.stringify(app.cfg.audio.maxVolume)); } -} \ No newline at end of file +} + +export {wsapi} \ No newline at end of file diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 5d18d61a..0f230cb4 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -17,24 +17,24 @@
- <%- include("../assets/cider-round.svg") %>
-
-
-
-
-
-
-
-
- <%- include('app/panels'); %>
-
-
+
- <%- include('app/chrome-top'); %>
- <%- include('app/app-navigation'); %>
- <%- include('app/chrome-bottom'); %>
-
-
-
-
-
-
+ <%- include("../assets/cider-round.svg") %>
+
+
+
+
+
+
+
+
+ <%- include('app/panels'); %>
+
+
-<% for(var i=0; i < Object.keys(env.components).length ; i++) {%>
- <%- include(env.components[i]); %>
-<% } %>
+ <% for(var i=0; i < Object.keys(env.components).length ; i++) {%>
+ <%- include(env.components[i]); %>
+ <% } %>
-
-
-
+
+
-
-
-
\ No newline at end of file
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 3d8724cb..7fcc7dfe 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -36,7 +36,7 @@
+ <%- include('app/chrome-top'); %>
+ <%- include('app/app-navigation'); %>
+ <%- include('app/chrome-bottom'); %>
+
+
+
+
+
+
+
+
-
{{ item.attributes.name }}
+ {{ item.attributes?.name ?? (item.relationships?.contents?.data[0]?.attributes?.name ?? '') }}
Date: Sat, 5 Mar 2022 21:20:39 +0700
Subject: [PATCH 35/37] fix miniplayer on top, add blur toggle on windows
---
package.json | 3 ++-
src/i18n/en_US.json | 3 +++
src/main/base/browserwindow.ts | 16 ++++++++++++++--
src/main/base/store.ts | 1 +
src/renderer/main/vueapp.js | 13 ++++++++-----
.../views/components/mediaitem-square.ejs | 2 +-
src/renderer/views/components/miniplayer.ejs | 3 +++
src/renderer/views/pages/settings.ejs | 16 ++++++++++++++++
8 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/package.json b/package.json
index be0b3b75..89aeaf73 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
"electron-notarize": "^1.1.1",
"electron-store": "^8.0.1",
"electron-updater": "^4.6.5",
+ "electron-vibrancy-updated": "git+https://github.com/ciderapp/electron-vibrancy-updated",
"electron-window-state": "^5.0.3",
"express": "^4.17.3",
"get-port": "^5.1.1",
@@ -75,7 +76,7 @@
"@types/express": "^4.17.13",
"@types/qrcode-terminal": "^0.12.0",
"@types/ws": "^8.5.1",
- "electron": "git+https://github.com/castlabs/electron-releases.git",
+ "electron": "git+https://github.com/castlabs/electron-releases.git#16-x-y",
"electron-builder": "^22.14.13",
"electron-builder-notarize-pkg": "^1.2.0",
"electron-webpack": "^2.8.2",
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 7e402929..d224beb8 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -201,6 +201,7 @@
"action.unfollow": "Unfollow",
"action.unfollow.success": "Unfollowed",
"action.unfollow.error": "Error Unfollowing",
+ "action.relaunch.confirm": "Do you want to relaunch Cider?",
"action.playNext": "Play Next",
"action.playLater": "Play Later",
"action.startRadio": "Start Radio",
@@ -315,6 +316,8 @@
"settings.option.visual.hardwareAcceleration.description": "Requires relaunch",
"settings.header.visual.hardwareAcceleration.default": "Default",
"settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
+ "settings.option.visual.transparent": "Transparent frame",
+ "settings.option.visual.transparent.description": "Transparent frame (needs Theme Support , requires relaunch)",
"settings.header.visual.theme": "Theme",
"settings.option.visual.theme.github.download": "Install from GitHub URL",
"settings.option.visual.theme.github.explore": "Explore GitHub Themes",
diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 316a0e01..82dc46dd 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -301,8 +301,9 @@ export class BrowserWindow {
break;
case "win32":
- this.options.backgroundColor = "#1E1E1E";
- this.options.transparent = false;
+ if (!(utils.getStoreValue('visual.transparent') ?? false)){
+ this.options.backgroundColor = "#1E1E1E";} else {
+ this.options.transparent = true;}
break;
case "linux":
this.options.backgroundColor = "#1E1E1E";
@@ -321,6 +322,11 @@ export class BrowserWindow {
this.startWebServer();
BrowserWindow.win = new bw(this.options);
+ if (process.platform === "win32" && (utils.getStoreValue('visual.transparent') ?? false)) {
+ var electronVibrancy = require('electron-vibrancy-updated');
+ electronVibrancy.SetVibrancy(BrowserWindow.win, 0);
+
+ }
const ws = new wsapi(BrowserWindow.win)
ws.InitWebSockets()
// and load the renderer.
@@ -797,9 +803,15 @@ export class BrowserWindow {
ipcMain.on('setFullScreen', (_event, flag) => {
BrowserWindow.win.setFullScreen(flag)
})
+
//Fullscreen
ipcMain.on('detachDT', (_event, _) => {
BrowserWindow.win.webContents.openDevTools({mode: 'detach'});
+ })
+
+ ipcMain.on('relaunchApp',(_event, _) => {
+ app.relaunch()
+ app.exit()
})
diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index 0a77de97..f1ea8dc2 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -105,6 +105,7 @@ export class Store {
"bg_artwork_rotation": false,
"hw_acceleration": "default", // default, webgpu, disabled
"showuserinfo": true,
+ "transparent": false,
"miniplayer_top_toggle": true,
"directives": {
"windowLayout": "default"
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index c2d2e163..f4ca97b2 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -3863,17 +3863,20 @@ const app = new Vue({
ipcRenderer.send('windowmin', 844, 410)
ipcRenderer.send('windowresize', this.tmpWidth, this.tmpHeight, false)
ipcRenderer.send('windowontop', false)
- this.cfg.visual.miniplayer_top_toggle = true;
+ //this.cfg.visual.miniplayer_top_toggle = true;
app.appMode = 'player';
}
},
- pinMiniPlayer() {
- if (this.cfg.visual.miniplayer_top_toggle) {
+ pinMiniPlayer(status = false) {
+ if (!status){
+ if (!this.cfg.visual.miniplayer_top_toggle) {
ipcRenderer.send('windowontop', true)
- this.cfg.visual.miniplayer_top_toggle = false
+ this.cfg.visual.miniplayer_top_toggle = true;
} else {
ipcRenderer.send('windowontop', false)
- this.cfg.visual.miniplayer_top_toggle = true;
+ this.cfg.visual.miniplayer_top_toggle = false;
+ }} else {
+ ipcRenderer.send('windowontop', this.cfg.visual.miniplayer_top_toggle ?? false)
}
},
formatTimezoneOffset: (e = new Date) => {
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 7fcc7dfe..296d1780 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -76,7 +76,7 @@
isVisible: false,
addedToLibrary: false,
guid: this.uuidv4(),
- noplay: ["apple-curators"],
+ noplay: ["apple-curators", "editorial-elements"],
nomenu: ["artists", "stations", "apple-curators", "editorial-elements"],
app: this.$root,
badges: this.$root.socialBadges.badgeMap,
diff --git a/src/renderer/views/components/miniplayer.ejs b/src/renderer/views/components/miniplayer.ejs
index 6ee98ae4..ca961cac 100644
--- a/src/renderer/views/components/miniplayer.ejs
+++ b/src/renderer/views/components/miniplayer.ejs
@@ -155,6 +155,9 @@
beforeDestroy() {
window.removeEventListener('keyup', this.onEscapeKeyUp)
},
+ mounted() {
+ app.pinMiniPlayer(true)
+ },
methods: {
onEscapeKeyUp(event) {
if (event.which === 27) {
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index f8b3d5f2..67be8cb1 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -752,6 +752,15 @@
+
+ {{$root.getLz('settings.option.visual.transparent')}}
+ ({{$root.getLz('settings.option.visual.transparent.description')}}) +
+ + ({{$root.getLz('settings.option.visual.transparent.description')}}) +
+
+
+
@@ -909,6 +918,13 @@
updateFields[i].title = "Not available on this type of build";
}
}
+ },
+ promptForRelaunch(){
+ bootbox.confirm(app.getLz('action.relaunch.confirm'), function (result) {
+ if (result) {
+ ipcRenderer.send('relaunchApp','');
+ }
+ });
}
}
})
From c5d86cd707c4d2af2850f825bd9247f52581d54f Mon Sep 17 00:00:00 2001
From: vapormusic
Date: Sat, 5 Mar 2022 22:16:59 +0700
Subject: [PATCH 36/37] disable this for now
---
src/main/base/browserwindow.ts | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 82dc46dd..c415e6bf 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -322,11 +322,12 @@ export class BrowserWindow {
this.startWebServer();
BrowserWindow.win = new bw(this.options);
- if (process.platform === "win32" && (utils.getStoreValue('visual.transparent') ?? false)) {
- var electronVibrancy = require('electron-vibrancy-updated');
- electronVibrancy.SetVibrancy(BrowserWindow.win, 0);
+ // cant be built in CI
+ // if (process.platform === "win32" && (utils.getStoreValue('visual.transparent') ?? false)) {
+ // var electronVibrancy = require('electron-vibrancy-updated');
+ // electronVibrancy.SetVibrancy(BrowserWindow.win, 0);
- }
+ // }
const ws = new wsapi(BrowserWindow.win)
ws.InitWebSockets()
// and load the renderer.
From d7261dbc86448f7cca66d000e7ebc047492062d5 Mon Sep 17 00:00:00 2001
From: vapormusic
Date: Mon, 7 Mar 2022 00:09:43 +0700
Subject: [PATCH 37/37] fixes
---
src/main/plugins/chromecast.ts | 2 +-
src/renderer/style.less | 24 +++++++++++++++----
src/renderer/views/app/app-navigation.ejs | 5 ++--
.../views/components/animatedartwork-view.ejs | 24 ++++++++++++++++++-
src/renderer/views/pages/cider-playlist.ejs | 2 +-
5 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/src/main/plugins/chromecast.ts b/src/main/plugins/chromecast.ts
index 34e48c48..4bdb6113 100644
--- a/src/main/plugins/chromecast.ts
+++ b/src/main/plugins/chromecast.ts
@@ -41,7 +41,7 @@ export default class ChromecastPlugin {
browser.on('ready', browser.discover);
browser.on('update', (service :any) => {
- if (service.addresses && service.fullname) {
+ if (service.addresses && service.fullname && service.fullname.includes('_googlecast._tcp')) {
this.ondeviceup(service.addresses[0], service.fullname.substring(0, service.fullname.indexOf("._googlecast")) + " " + (service.type[0].description ?? ""), '', 'googlecast');
}
});
diff --git a/src/renderer/style.less b/src/renderer/style.less
index 75f5279e..ba1f00f6 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -1838,6 +1838,9 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
-webkit-box-orient: vertical;
}
+.no-animation {
+ animation: unset !important;
+}
.fullscreen-view-container {
position: absolute;
@@ -1877,6 +1880,10 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
height: 50vh;
}
+ .bg-artwork-container {
+ display: block !important;
+ }
+
@media only screen and (max-width: 1121px) {
.display--large {
display: flex !important;
@@ -1979,13 +1986,10 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
filter: brightness(85%) saturate(95%) blur(180px) contrast(0.9) opacity(0.9);
}
- .no-animation {
- animation: unset;
- }
+
}
}
-
.lyrics-col {
height: 62vh;
@@ -2662,6 +2666,10 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
width: 200VH;
height: 200VH;
}
+
+ .bg-artwork-container{
+ display: block !important;
+ }
}
.lyric-body {
@@ -2964,6 +2972,10 @@ body.no-gpu {
.bg-artwork-container {
display: none;
+ animation: none !important;
+ .bg-artwork{
+ animation: none !important;
+ }
}
#navigation-bar {
@@ -3004,6 +3016,10 @@ body.no-gpu {
.drawertransition-leave-to {
right: -300px;
}
+
+ .lyric-line:hover::after {
+ display: none;
+ }
}
.qrimg {
diff --git a/src/renderer/views/app/app-navigation.ejs b/src/renderer/views/app/app-navigation.ejs
index b7d7f654..58833a1c 100644
--- a/src/renderer/views/app/app-navigation.ejs
+++ b/src/renderer/views/app/app-navigation.ejs
@@ -6,8 +6,9 @@
v-if="drawer.open && drawer.panel == 'lyrics' && lyrics && lyrics != [] && lyrics.length > 0">
{
+ let levelsnum = u.levels.map((level)=>{return level.width})
+ if (levelsnum.length > 0) {
+ let qualities = []
+ let qualities2 = []
+ for (let i = 0; i < levelsnum.length; i++) {
+ if (qualities2.indexOf(levelsnum[i]) == -1) {
+ qualities.push({level: i, quality: levelsnum[i]})
+ qualities2.push(levelsnum[i])
+ }
+ }
+ let actualnum = Math.floor(qualities[qualities.length -1 ].level * (quality / 4))
+ if (quality != 0 ){
+ quality = qualities[Math.min(actualnum,qualities.length -1 )].level
+ }
+ if (quality == 4 ){
+ quality = qualities[qualities.length - 1].level
+ }
+ }
+
+ this.hls.loadLevel = parseInt( quality || 1);},200)
}
})
}
diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index 32a919d8..c49d03f4 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -21,7 +21,7 @@
:video-priority="true"
:url="(data.attributes != null && data.attributes.artwork != null) ? data.attributes.artwork.url : ((data.relationships != null && data.relationships.tracks.data.length > 0 && data.relationships.tracks.data[0].attributes != null) ? ((data.relationships.tracks.data[0].attributes.artwork != null)? data.relationships.tracks.data[0].attributes.artwork.url : ''):'')"
:video="(data.attributes != null && data.attributes.editorialVideo != null) ? (data.attributes.editorialVideo.motionDetailSquare ? data.attributes.editorialVideo.motionDetailSquare.video : (data.attributes.editorialVideo.motionSquareVideo1x1 ? data.attributes.editorialVideo.motionSquareVideo1x1.video : '')) : '' "
- size="260"
+ size="500"
>
- ![]()
- ![]()
+ ![]()
+ ![]()
+ ![]()