From 76a6b14565827ca6b541750f6ebfd6aacccfc55e Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Mon, 2 May 2022 12:40:54 +0200 Subject: [PATCH 001/109] add hide timestamp to rpc code --- src/main/plugins/discordrpc.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts index 92f613e3..460b57bc 100644 --- a/src/main/plugins/discordrpc.ts +++ b/src/main/plugins/discordrpc.ts @@ -223,10 +223,12 @@ export default class DiscordRPC { ] //To change attributes.url => preload/cider-preload.js } - // Add the timestamp if its playing - if (attributes.status) { - this._activity.startTimestamp = Date.now() - (attributes?.durationInMillis - attributes?.remainingTime) - this._activity.endTimestamp = attributes.endTime + // Add the timestamp if its playing and people want them + if (!this._utils.getStoreValue("general.discordrpc.hide_timestamp")) { + if (attributes.status) { + this._activity.startTimestamp = Date.now() - (attributes?.durationInMillis - attributes?.remainingTime) + this._activity.endTimestamp = attributes.endTime + } } // If the user wants to keep the activity when paused From b021f8d43a4c16e66c5849a591895cd01ccf780a Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Mon, 2 May 2022 12:42:16 +0200 Subject: [PATCH 002/109] add to store --- src/main/base/store.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 6741395c..5de4dc33 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -17,6 +17,7 @@ export class Store { "client": "Cider", "clear_on_pause": true, "hide_buttons": false, + "hide_timestamp": false, "state_format": "by {artist}", "details_format": "{title}", }, From f7f0db98bc12bbded5872e01195df1e2ed21709a Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Mon, 2 May 2022 12:47:12 +0200 Subject: [PATCH 003/109] add to en_us and source --- src/i18n/en_US.json | 1 + src/i18n/source/en_US.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 78413968..6236b726 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -427,6 +427,7 @@ "settings.option.connectivity.discordRPC.clientName": "Client Name", "settings.option.connectivity.discordRPC.clearOnPause": "Clear Discord Rich Presence on Pause", "settings.option.connectivity.discordRPC.hideButtons": "Hide buttons on Discord Rich Presence", + "settings.option.connectivity.discordRPC.hideTimestamp": "Hide timestamp on Discord Rich Presence", "settings.option.connectivity.discordRPC.detailsFormat": "Details Format", "settings.option.connectivity.discordRPC.stateFormat": "State Format", "settings.option.connectivity.lastfmScrobble": "Last.fm Scrobbling", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 71d7a3d8..6f0ce8f2 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -428,6 +428,7 @@ "settings.option.connectivity.discordRPC.clientName": "Client Name", "settings.option.connectivity.discordRPC.clearOnPause": "Clear Discord Rich Presence on Pause", "settings.option.connectivity.discordRPC.hideButtons": "Hide buttons on Discord Rich Presence", + "settings.option.connectivity.discordRPC.hideTimestamp": "Hide timestamp on Discord Rich Presence", "settings.option.connectivity.discordRPC.detailsFormat": "Details Format", "settings.option.connectivity.discordRPC.stateFormat": "State Format", "settings.option.connectivity.lastfmScrobble": "Last.fm Scrobbling", From c4acb794e64c735c08de136a85f9f74b11dd3883 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Mon, 2 May 2022 12:48:54 +0200 Subject: [PATCH 004/109] add to hu_hu --- src/i18n/hu_HU.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json index 55706b2c..ec5a97de 100644 --- a/src/i18n/hu_HU.json +++ b/src/i18n/hu_HU.json @@ -414,6 +414,7 @@ "settings.option.connectivity.discordRPC.clientName": "Kliensnév", "settings.option.connectivity.discordRPC.clearOnPause": "Rich Presence törlése megállításnál", "settings.option.connectivity.discordRPC.hideButtons": "Rich Presence gombok elrejtése", + "settings.option.connectivity.discordRPC.hideTimestamp": "Rich Presence visszaszámláló elrejtése", "settings.option.connectivity.discordRPC.detailsFormat": "Részletek formátuma", "settings.option.connectivity.discordRPC.stateFormat": "Állapot formátuma", "settings.option.connectivity.lastfmScrobble": "Last.fm Scrobbling", From 7566fe6743cbbc4f9843970274b746a0ac43f28b Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sat, 7 May 2022 06:35:33 +0100 Subject: [PATCH 005/109] Fixed app version --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d7b5b75..44c7279f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,9 +15,6 @@ jobs: executor: cider-ci steps: - checkout - - run: - name: Set App Version - command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV # - run: # name: Rename Repository # command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json @@ -155,6 +152,9 @@ jobs: mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts - store_artifacts: path: ~/Cider/dist/artifacts + - run: + name: Set App Version + command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV - run: name: Publish Release command: | From 9e66fd3d681cde38a367bda658a076bd3e0a7f13 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sat, 7 May 2022 10:39:10 -0500 Subject: [PATCH 006/109] Restore window position. --- src/main/base/browserwindow.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 680f176d..2374e25b 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -342,6 +342,8 @@ export class BrowserWindow { }); this.options.width = windowState.width; this.options.height = windowState.height; + this.options.x = windowState.x; + this.options.y = windowState.y; switch (process.platform) { default: From c2e768837fb91a4046e8bbe55bf1bee15852c2d9 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Sat, 7 May 2022 20:39:39 +0200 Subject: [PATCH 007/109] Update discordrpc.ts --- src/main/plugins/discordrpc.ts | 316 ++++++++++++++------------------- 1 file changed, 132 insertions(+), 184 deletions(-) diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts index 460b57bc..c943eb68 100644 --- a/src/main/plugins/discordrpc.ts +++ b/src/main/plugins/discordrpc.ts @@ -1,30 +1,29 @@ -import * as RPC from 'discord-rpc' +import {AutoClient} from 'discord-auto-rpc' import {ipcMain} from "electron"; import fetch from 'electron-fetch' export default class DiscordRPC { - /** - * Private variables for interaction in plugins - */ - private _utils: any; - private _app: any; - private _attributes: any; - private _connection: boolean = false; - /** * Base Plugin Details (Eventually implemented into a GUI in settings) */ public name: string = 'Discord Rich Presence'; public description: string = 'Discord RPC plugin for Cider'; - public version: string = '1.0.0'; + public version: string = '1.1.0'; public author: string = 'vapormusic/Core (Cider Collective)'; + /** + * Private variables for interaction in plugins + */ + private _utils: any; + private _attributes: any; + private ready: boolean = false; + /** * Plugin Initialization */ private _client: any = null; - private _activity: RPC.Presence = { + private _activityCache: any = { details: '', state: '', largeImageKey: '', @@ -34,15 +33,72 @@ export default class DiscordRPC { instance: false }; - private _activityCache: RPC.Presence = { - details: '', - state: '', - largeImageKey: '', - largeImageText: '', - smallImageKey: '', - smallImageText: '', - instance: false - }; + /******************************************************************************************* + * Public Methods + * ****************************************************************************************/ + + /** + * Runs on plugin load (Currently run on application start) + */ + constructor(utils: any) { + this._utils = utils; + console.debug(`[Plugin][${this.name}] Loading Complete.`); + } + + /** + * Runs on app ready + */ + onReady(_win: any): void { + const self = this + this.connect(); + console.debug(`[Plugin][${this.name}] Ready.`); + ipcMain.on('updateRPCImage', (_event, imageurl) => { + if (!this._utils.getStoreValue("general.privateEnabled")) { + fetch('https://api.cider.sh/v1/images', { + + method: 'POST', + body: JSON.stringify({url: imageurl}), + headers: { + 'Content-Type': 'application/json', + 'User-Agent': _win.webContents.getUserAgent() + }, + }) + .then(res => res.json()) + .then(function (json) { + self._attributes["artwork"]["url"] = json.url + self.setActivity(self._attributes) + }) + } + }) + } + + /** + * Runs on app stop + */ + onBeforeQuit(): void { + console.debug(`[Plugin][${this.name}] Stopped.`); + } + + /** + * Runs on playback State Change + * @param attributes Music Attributes (attributes.status = current state) + */ + onPlaybackStateDidChange(attributes: object): void { + this._attributes = attributes + this.setActivity(attributes) + + } + + /** + * Runs on song change + * @param attributes Music Attributes + */ + onNowPlayingItemDidChange(attributes: object): void { + this._attributes = attributes + this.setActivity(attributes) + + } + /******************************************************************************************* * Private Methods @@ -58,58 +114,86 @@ export default class DiscordRPC { } const clientId = this._utils.getStoreValue("general.discordrpc.client") === "Cider" ? '911790844204437504' : '886578863147192350'; - // Apparently needed for ask to join, join, spectate etc. - RPC.register(clientId) - // Create the client - this._client = new RPC.Client({transport: "ipc"}); + this._client = new AutoClient({transport: "ipc"}); // Runs on Ready - this._client.on('ready', () => { + this._client.once('ready', () => { console.info(`[DiscordRPC][connect] Successfully Connected to Discord. Authed for user: ${this._client.user.id}.`); + + if (this._activityCache && this._activityCache.details && this._activityCache.state) { + console.info(`[DiscordRPC][connect] Restoring activity cache.`); + this._client.setActivity(this._activityCache) + } }) - // Handles Errors - this._client.on('error', (err: any) => { - console.error(`[DiscordRPC] ${err}`); - this.disconnect() - }); - - // If Discord is closed, allow reconnecting - this._client.transport.once('close', () => { - console.info(`[DiscordRPC] Connection closed`); - this.disconnect() - }); - // Login to Discord - this._client.login({clientId}) + this._client.endlessLogin({clientId: clientId}) .then(() => { - this._connection = true; + this.ready = true }) .catch((e: any) => console.error(`[DiscordRPC][connect] ${e}`)); } /** - * Disconnects from Discord RPC + * Sets the activity + * @param attributes Music Attributes */ - private disconnect() { + private setActivity(attributes: any) { if (!this._client) { return } - this._client.destroy().then(() => { - this._connection = false; - console.log('[DiscordRPC][disconnect] Disconnected from discord.') - }).catch((e: any) => console.error(`[DiscordRPC][disconnect] ${e}`)); + // Check if show buttons is (true) or (false) + let activity: Object = { + details: this._utils.getStoreValue("general.discordrpc.details_format"), + state: this._utils.getStoreValue("general.discordrpc.state_format"), + largeImageKey: attributes?.artwork?.url?.replace('{w}', '1024').replace('{h}', '1024'), + largeImageText: attributes.albumName, + instance: false // Whether the activity is in a game session + } - // Clean up, allow creating a new connection - this._client = null; + // Filter the activity + activity = this.filterActivity(activity, attributes) + + if (!this.ready) { + this._activityCache = activity + return + } + + // Set the activity + if (!attributes.status && this._utils.getStoreValue("general.discordrpc.clear_on_pause")) { + this._client.clearActivity() + } else if (activity && this._activityCache !== activity) { + this._client.setActivity(activity) + } + this._activityCache = activity; } /** * Filter the Discord activity object */ - private static filterActivity(activity: any, attributes: any): Object { + private filterActivity(activity: any, attributes: any): Object { + + // Add the buttons if people want them + if (!this._utils.getStoreValue("general.discordrpc.hide_buttons")) { + activity.buttons = [ + {label: 'Listen on Cider', url: attributes.url.cider}, + {label: 'View on Apple Music', url: attributes.url.appleMusic} + ] //To change attributes.url => preload/cider-preload.js + } + + // Add the timestamp if its playing + if (attributes.status) { + activity.startTimestamp = Date.now() - (attributes?.durationInMillis - attributes?.remainingTime) + activity.endTimestamp = attributes.endTime + } + + // If the user wants to keep the activity when paused + if (!this._utils.getStoreValue("general.discordrpc.clear_on_pause")) { + activity.smallImageKey = attributes.status ? 'play' : 'pause'; + activity.smallImageText = attributes.status ? 'Playing' : 'Paused'; + } /** * Works with: @@ -173,140 +257,4 @@ export default class DiscordRPC { } return activity } - - /** - * Sets the activity - * @param {activity} activity - */ - private setActivity(activity: any) { - if (!this._connection || !this._client || !activity) { - return - } - - // Filter the activity - activity = DiscordRPC.filterActivity(activity, this._attributes) - - // Set the activity - if (!this._attributes.status && this._utils.getStoreValue("general.discordrpc.clear_on_pause")) { - this._client.clearActivity() - } else if (this._activity && this._activityCache !== this._activity && this._activity.details) { - this._client.setActivity(activity) - this._activityCache = this._activity; - } - } - - /** - * Sets the activity of the client - * @param {object} attributes - */ - private updateActivity(attributes: any) { - if (!this._utils.getStoreValue("general.discordrpc.enabled") || this._utils.getStoreValue("general.privateEnabled")) { - return - } else if (!this._client || !this._connection) { - this.connect() - } - - // Check if show buttons is (true) or (false) - this._activity = { - details: this._utils.getStoreValue("general.discordrpc.details_format"), - state: this._utils.getStoreValue("general.discordrpc.state_format"), - largeImageKey: attributes?.artwork?.url?.replace('{w}', '1024').replace('{h}', '1024'), - largeImageText: attributes.albumName, - instance: false // Whether the activity is in a game session - } - - // Add the buttons if people want them - if (!this._utils.getStoreValue("general.discordrpc.hide_buttons")) { - this._activity.buttons = [ - {label: 'Listen on Cider', url: attributes.url.cider}, - {label: 'View on Apple Music', url: attributes.url.appleMusic} - ] //To change attributes.url => preload/cider-preload.js - } - - // Add the timestamp if its playing and people want them - if (!this._utils.getStoreValue("general.discordrpc.hide_timestamp")) { - if (attributes.status) { - this._activity.startTimestamp = Date.now() - (attributes?.durationInMillis - attributes?.remainingTime) - this._activity.endTimestamp = attributes.endTime - } - } - - // If the user wants to keep the activity when paused - if (!this._utils.getStoreValue("general.discordrpc.clear_on_pause")) { - this._activity.smallImageKey = attributes.status ? 'play' : 'pause'; - this._activity.smallImageText = attributes.status ? 'Playing' : 'Paused'; - } - - this.setActivity(this._activity) - } - - /******************************************************************************************* - * Public Methods - * ****************************************************************************************/ - - /** - * Runs on plugin load (Currently run on application start) - */ - constructor(utils: { getStore: () => any; getApp: () => any; }) { - this._utils = utils; - console.debug(`[Plugin][${this.name}] Loading Complete.`); - this._app = utils.getApp(); - } - - /** - * Runs on app ready - */ - onReady(_win: any): void { - let self = this - this.connect(); - console.debug(`[Plugin][${this.name}] Ready.`); - ipcMain.on('updateRPCImage', (_event, imageurl) => { - if (!this._utils.getStoreValue("general.privateEnabled")) { - fetch('https://api.cider.sh/v1/images', { - - method: 'POST', - body: JSON.stringify({url: imageurl}), - headers: { - 'Content-Type': 'application/json', - 'User-Agent': _win.webContents.getUserAgent() - }, - }) - .then(res => res.json()) - .then(function (json) { - self._attributes["artwork"]["url"] = json.url - self.updateActivity(self._attributes) - }) - } - }) - } - - /** - * Runs on app stop - */ - onBeforeQuit(): void { - if (this._client) { - this.disconnect() - } - console.debug(`[Plugin][${this.name}] Stopped.`); - } - - /** - * Runs on playback State Change - * @param attributes Music Attributes (attributes.status = current state) - */ - onPlaybackStateDidChange(attributes: object): void { - this._attributes = attributes - this.updateActivity(attributes) - - } - - /** - * Runs on song change - * @param attributes Music Attributes - */ - onNowPlayingItemDidChange(attributes: object): void { - this._attributes = attributes - this.updateActivity(attributes) - - } } From ab9d209eba14a4a3d3039d0f73df9a153218060d Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Sat, 7 May 2022 20:45:03 +0200 Subject: [PATCH 008/109] Add check to discordrpc.ts --- src/main/plugins/discordrpc.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts index c943eb68..fe933903 100644 --- a/src/main/plugins/discordrpc.ts +++ b/src/main/plugins/discordrpc.ts @@ -183,8 +183,8 @@ export default class DiscordRPC { ] //To change attributes.url => preload/cider-preload.js } - // Add the timestamp if its playing - if (attributes.status) { + // Add the timestamp if its playing and people want them + if (!this._utils.getStoreValue("general.discordrpc.hide_timestamp") && attributes.status) { activity.startTimestamp = Date.now() - (attributes?.durationInMillis - attributes?.remainingTime) activity.endTimestamp = attributes.endTime } From 050cd3e0b649bf1a9ad76f0d052d6d4973f5b9eb Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Sat, 7 May 2022 20:51:48 +0200 Subject: [PATCH 009/109] Add new setting --- src/renderer/views/pages/settings.ejs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 8e9bc841..71ea0a58 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -1067,6 +1067,17 @@ +
+
+ {{$root.getLz('settings.option.connectivity.discordRPC.hideTimestamp')}} +
+
+ +
+
+
{{$root.getLz('settings.option.connectivity.discordRPC.detailsFormat')}}
@@ -1639,4 +1650,4 @@ }, } }) - \ No newline at end of file + From 130816a1f08b36f83adcef9afa549bd41a8f49ad Mon Sep 17 00:00:00 2001 From: yazninja Date: Sun, 8 May 2022 10:33:17 +0800 Subject: [PATCH 010/109] fix instrumental qq lyrics --- src/renderer/views/components/lyrics-view.ejs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/renderer/views/components/lyrics-view.ejs b/src/renderer/views/components/lyrics-view.ejs index 26001890..c4e795b6 100644 --- a/src/renderer/views/components/lyrics-view.ejs +++ b/src/renderer/views/components/lyrics-view.ejs @@ -1,6 +1,6 @@ + + \ No newline at end of file diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 8e9bc841..df0c031a 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -185,146 +185,17 @@
- +
{{$root.getLz('settings.option.general.keybindings')}}
-
- -
-
-
- {{$root.getLz('settings.description.search')}} -
-
- -
-
-
-
- {{$root.getLz('settings.description.albums')}} -
-
- -
-
-
-
- {{$root.getLz('settings.description.artists')}} -
-
- -
-
-
-
- {{$root.getLz('settings.description.browse')}} -
-
- -
-
-
-
- {{$root.getLz('settings.description.private')}} -
-
- -
-
-
-
- {{$root.getLz('settings.description.remote')}} -
-
- -
-
-
-
- {{$root.getLz('settings.description.audio')}} -
-
- -
-
-
-
- {{$root.getLz('settings.description.plugins')}} -
-
- -
-
-
-
- {{$root.getLz('settings.description.cast')}} -
-
- -
-
-
-
- {{$root.getLz('settings.description.settings')}} -
-
- -
-
-
-
- {{$root.getLz('settings.description.developer')}} -
-
- -
-
- -
- -
+ @@ -1517,9 +1388,11 @@ }, keyBindReset: function () { app.cfg.general.keybindings.search = [app.platform == "darwin" ? "Command" : "Control", "S"]; + app.cfg.general.keybindings.listennow = [app.platform == "darwin" ? "Command" : "Control", "L"]; + app.cfg.general.keybindings.browse = [app.platform == "darwin" ? "Command" : "Control", "B"]; + app.cfg.general.keybindings.recentAdded = [app.platform == "darwin" ? "Command" : "Control", "G"]; app.cfg.general.keybindings.albums = [app.platform == "darwin" ? "Command" : "Control", "F"]; app.cfg.general.keybindings.artists = [app.platform == "darwin" ? "Command" : "Control", "D"]; - app.cfg.general.keybindings.browse = [app.platform == "darwin" ? "Command" : "Control", "B"]; app.cfg.general.keybindings.togglePrivateSession = [app.platform == "darwin" ? "Command" : "Control", "P"]; app.cfg.general.keybindings.webRemote = [app.platform == "darwin" ? "Command" : "Control", "W"]; app.cfg.general.keybindings.audioSettings = [app.platform == "darwin" ? "Option" : "Alt", "A"]; From 51c99c87aecf23a82910be99bf89ae5ff83e2167 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Mon, 9 May 2022 01:42:45 -0300 Subject: [PATCH 025/109] CleanUp --- src/renderer/views/pages/settings.ejs | 72 --------------------------- 1 file changed, 72 deletions(-) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index df0c031a..cd61c92d 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -1333,78 +1333,6 @@ } }) }, - keyBindUpdate: function (action) { - const blur = document.createElement('div'); - blur.className = 'blur'; - blur.style.backgroundColor = 'rgba(0,0,0,0.25)'; - blur.style.position = 'fixed'; - blur.style.top = '0'; - blur.style.left = '0'; - blur.style.width = '100%'; - blur.style.height = '100%'; - blur.style.zIndex = '9999'; - blur.style.display = 'flex'; - blur.style.alignItems = 'center'; - blur.style.justifyContent = 'center'; - blur.style.fontSize = '2em'; - blur.style.color = 'white'; - blur.innerHTML = 'Press a combination of two keys to update keybinding. Press Escape key to go back.' - document.body.appendChild(blur); - - let keyBind = []; - const keyBindTimeout = setTimeout(function () { - keyBind = []; - document.body.removeChild(blur); - }, 30000); - const keyBindUpdate = function (e) { - if (document.body.contains(blur)) { - if (e.key == 'Escape') { - document.body.removeChild(blur); - clearTimeout(keyBindTimeout); - return; - } else { - if (e.keyCode >= 65 && e.keyCode <= 90 && e.keyCode <= 97 && e.keyCode <= 122) { - keyBind.push(e.key.toUpperCase()); - } else { - keyBind.push(e.key); - } - if (keyBind.length === 2) { - if (keyBind[0] !== keyBind[1]) { - app.cfg.general.keybindings[action] = keyBind - document.body.removeChild(blur); - clearTimeout(keyBindTimeout); - notyf.success(app.getLz('settings.notyf.general.keybindings.update.success')); - bootbox.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => { - if (ok) ipcRenderer.invoke("relaunchApp") - }) - } else { - keyBind = []; - } - } - } - } - }; - document.addEventListener('keydown', keyBindUpdate); - }, - keyBindReset: function () { - app.cfg.general.keybindings.search = [app.platform == "darwin" ? "Command" : "Control", "S"]; - app.cfg.general.keybindings.listennow = [app.platform == "darwin" ? "Command" : "Control", "L"]; - app.cfg.general.keybindings.browse = [app.platform == "darwin" ? "Command" : "Control", "B"]; - app.cfg.general.keybindings.recentAdded = [app.platform == "darwin" ? "Command" : "Control", "G"]; - app.cfg.general.keybindings.albums = [app.platform == "darwin" ? "Command" : "Control", "F"]; - app.cfg.general.keybindings.artists = [app.platform == "darwin" ? "Command" : "Control", "D"]; - app.cfg.general.keybindings.togglePrivateSession = [app.platform == "darwin" ? "Command" : "Control", "P"]; - app.cfg.general.keybindings.webRemote = [app.platform == "darwin" ? "Command" : "Control", "W"]; - app.cfg.general.keybindings.audioSettings = [app.platform == "darwin" ? "Option" : "Alt", "A"]; - app.cfg.general.keybindings.pluginMenu = [app.platform == "darwin" ? "Option" : "Alt", "P"]; - app.cfg.general.keybindings.castToDevices = [app.platform == "darwin" ? "Option" : "Alt", "C"]; - app.cfg.general.keybindings.settings = [app.platform == "darwin" ? "Option" : "Alt", "S"]; - app.cfg.general.keybindings.openDeveloperTools = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : "Shift", "I"]; - notyf.success(app.getLz('settings.notyf.general.keybindings.update.success')); - bootbox.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => { - if (ok) ipcRenderer.invoke("relaunchApp") - }) - }, gitHubExplore() { app.appRoute("themes-github") }, From b25335ed757bd54b59e7eb71cdd746c35d404ea4 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Mon, 9 May 2022 01:47:49 -0300 Subject: [PATCH 026/109] Some Strings Update made By "Monochromish" --- src/i18n/en_US.json | 2 ++ src/i18n/source/en_US.json | 2 ++ src/renderer/views/pages/keybinds.ejs | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 3919dfea..24164d21 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -327,6 +327,8 @@ "settings.option.general.customizeSidebar": "Customize Sidebar Items", "settings.option.general.customizeSidebar.customize": "Customize", "settings.option.general.keybindings": "Keybindings", + "settings.option.general.keybindings.pressCombination": "Press a combination of two keys to update keybind.", + "settings.option.general.keybindings.pressEscape": "Press Escape key to go back.", "settings.notyf.general.keybindings.update.success": "Keybind updated successfully", "settings.prompt.general.keybindings.update.success": "Keybind updated successfully. Press OK to relaunch Cider", "settings.option.general.keybindings.open": "Open", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 2b1e581b..f1238d76 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -324,6 +324,8 @@ "settings.option.general.customizeSidebar": "Customize Sidebar Items", "settings.option.general.customizeSidebar.customize": "Customize", "settings.option.general.keybindings": "Keybindings", + "settings.option.general.keybindings.pressCombination": "Press a combination of two keys to update keybind.", + "settings.option.general.keybindings.pressEscape": "Press Escape key to go back.", "settings.notyf.general.keybindings.update.success": "Keybind updated successfully", "settings.prompt.general.keybindings.update.success": "Keybind updated successfully. Press OK to relaunch Cider", "settings.option.general.keybindings.open": "Open", diff --git a/src/renderer/views/pages/keybinds.ejs b/src/renderer/views/pages/keybinds.ejs index 3fc314a2..fb03f52b 100644 --- a/src/renderer/views/pages/keybinds.ejs +++ b/src/renderer/views/pages/keybinds.ejs @@ -186,7 +186,7 @@ blur.style.justifyContent = 'center'; blur.style.fontSize = '2em'; blur.style.color = 'white'; - blur.innerHTML = 'Press a combination of two keys to update keybinding. Press Escape key to go back.' + blur.innerHTML = `
${app.getLz('settings.option.general.keybindings.pressCombination')}
${app.getLz('settings.option.general.keybindings.pressEscape')}
` document.body.appendChild(blur); let keyBind = []; From d20956b1c4a6341b9899ecd755fdaf72a3a789e3 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Mon, 9 May 2022 01:53:29 -0300 Subject: [PATCH 027/109] Documentation --- src/i18n/README.md | 11 +++++++++++ src/i18n/source/en_US.json | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/src/i18n/README.md b/src/i18n/README.md index b81a8498..9e47f522 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -342,3 +342,14 @@ Update 08/05/2022 00:29 UTC * `settings.option.visual.theme.github.available`: Added for `en_US`, * `settings.option.visual.theme.github.applied`: Added for `en_US`, + +Update 09/05/2022 01:50 UTC + +* `menubar.options.listennow`: Added for `en_US`, +* `menubar.options.recentlyAdded`: Added for `en_US`, +* `menubar.options.songs`: Added for `en_US`, +* `settings.description.listnow`: Added for `en_US`, +* `settings.description.recentAdd`: Added for `en_US`, +* `settings.description.songs`: Added for `en_US`, +* `settings.option.general.keybindings.pressCombination`: Added for `en_US`, +* `settings.option.general.keybindings.pressEscape`: Added for `en_US`, \ No newline at end of file diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index f1238d76..24164d21 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -300,6 +300,9 @@ "menubar.options.trans": "Translation Report/Request", "menubar.options.license": "View License", "menubar.options.conf": "Open Configuration File in Editor", + "menubar.options.listennow": "Listen Now", + "menubar.options.recentlyAdded": "Recently Added", + "menubar.options.songs": "Songs", "settings.header.general": "General", "settings.header.general.description": "Adjust the general settings for Cider.", "settings.option.general.language": "Language", @@ -340,6 +343,9 @@ "settings.description.cast": "Cast to Devices", "settings.description.settings": "Settings", "settings.description.developer": "Developer Tools", + "settings.description.listnow": "Listen Now", + "settings.description.recentAdd": "Recently Added", + "settings.description.songs": "Songs", "settings.notyf.updateCider.update-not-available": "No update available", "settings.notyf.updateCider.update-downloaded": "Update has been downloaded, restart to apply", "settings.notyf.updateCider.update-error": "Error updating Cider", From c1071b5f9818c1e64896d94b2821b5eaea76353c Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sun, 8 May 2022 22:39:14 -0700 Subject: [PATCH 028/109] Goodbye Analog Warmth --- src/main/base/store.ts | 8 +- src/renderer/audio/audio.js | 550 ++++++++++++------------- src/renderer/views/pages/audiolabs.ejs | 100 ++--- src/renderer/views/pages/settings.ejs | 2 +- 4 files changed, 292 insertions(+), 368 deletions(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index de8590a5..f059a1fe 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -128,10 +128,10 @@ export class Store { "maikiwiAudio": { "ciderPPE": false, "ciderPPE_value": "MAIKIWI", - "analogWarmth": false, - "analogWarmth_value": "SMOOTH", - "atmosphereRealizer": false, - "atmosphereRealizer_value": "NATURAL_STANDARD", + "atmosphereRealizer1": false, + "atmosphereRealizer1_value": "NATURAL_STANDARD", + "atmosphereRealizer2": false, + "atmosphereRealizer2_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 diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index c8c9c799..fc69953e 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -8,10 +8,10 @@ const CiderAudio = { audioBands: null, vibrantbassNode: null, llpw: null, - analogWarmth: null, recorderNode: null, intelliGainComp: null, - atmosphereRealizer: null, + atmosphereRealizer1: null, + atmosphereRealizer2: null, }, ccON: false, mediaRecorder: null, @@ -39,10 +39,10 @@ const CiderAudio = { audioBands: null, vibrantbassNode: null, llpw: null, - analogWarmth: null, recorderNode: null, intelliGainComp: null, - atmosphereRealizer: null, + atmosphereRealizer1: null, + atmosphereRealizer2: null, } } catch (e) { } CiderAudio.source.connect(CiderAudio.context.destination); @@ -125,6 +125,32 @@ const CiderAudio = { "img": "./assets/audiolabs/minimal.png", } ], + atmosphereRealizerProfiles: [ + { + "id": "NATURAL_STANDARD", + "file": './audio/impulses/AtmosphereRealizer_NaturalStandard.wav', + "name": "Natural (Standard)", + "description": "", + }, + { + "id": "NATURAL_HIGH", + "file": './audio/impulses/AtmosphereRealizer_NaturalHigh.wav', + "name": "Natural (High)", + "description": "", + }, + { + "id": "NATURAL_PLUS", + "file": './audio/impulses/AtmosphereRealizer_Natural+.wav', + "name": "Natural (Plus)", + "description": "", + }, + { + "id": "CRYPTO", + "file": './audio/impulses/AtmosphereRealizer_Cryptofyre.wav', + "name": "Cryptofyre", + "description": "", + } + ], spatialOn: function () { CiderAudio.audioNodes.spatialNode = null; CiderAudio.audioNodes.spatialNode = CiderAudio.context.createConvolver(); @@ -150,12 +176,12 @@ const CiderAudio = { if (CiderAudio.audioNodes.audioBands !== null) { filters = filters.concat(CiderAudio.audioNodes.audioBands) } if (CiderAudio.audioNodes.vibrantbassNode !== null) { filters = filters.concat(CiderAudio.audioNodes.vibrantbassNode) } if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length > 1) { filters = filters.concat(CiderAudio.audioNodes.llpw); } - if (CiderAudio.audioNodes.analogWarmth !== null) { filters = filters.concat(CiderAudio.audioNodes.analogWarmth) } if (!filters || filters.length === 0) { let filterlessGain = 1; if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length == 1) { filterlessGain = filterlessGain * 1.109174815262401 } - if (app.cfg.audio.maikiwiAudio.atmosphereRealizer == true) { filterlessGain = filterlessGain * 1.096478196143185 } + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 == true) { filterlessGain = filterlessGain * 1.096478196143185 } + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer2 == true) { filterlessGain = filterlessGain * 1.096478196143185 } if (app.cfg.audio.maikiwiAudio.spatial == true) { let spatialProfile = CiderAudio.spatialProfiles.find(function (profile) { return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile; @@ -378,153 +404,85 @@ const CiderAudio = { // CiderAudio.ccON = false; } }, - atmosphereRealizer_h2_4: function (status, hierarchy) { + atmosphereRealizer2_h2_4: function (status, hierarchy) { if (status === true) { - switch (app.cfg.audio.maikiwiAudio.atmosphereRealizer_value) { - case "NATURAL_STANDARD": - CiderAudio.audioNodes.atmosphereRealizer = CiderAudio.context.createConvolver(); - CiderAudio.audioNodes.atmosphereRealizer.normalize = false; - - fetch('./audio/impulses/AtmosphereRealizer_NaturalStandard.wav').then(async (impulseData) => { - let bufferedImpulse = await impulseData.arrayBuffer(); - CiderAudio.audioNodes.atmosphereRealizer.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse); - }); - break; - - - case "NATURAL_HIGH": - CiderAudio.audioNodes.atmosphereRealizer = CiderAudio.context.createConvolver(); - CiderAudio.audioNodes.atmosphereRealizer.normalize = false; - - fetch('./audio/impulses/AtmosphereRealizer_NaturalHigh.wav').then(async (impulseData) => { - let bufferedImpulse = await impulseData.arrayBuffer(); - CiderAudio.audioNodes.atmosphereRealizer.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse); - }); - break; - - case "NATURAL_PLUS": - CiderAudio.audioNodes.atmosphereRealizer = CiderAudio.context.createConvolver(); - CiderAudio.audioNodes.atmosphereRealizer.normalize = false; - - fetch('./audio/impulses/AtmosphereRealizer_Natural+.wav').then(async (impulseData) => { - let bufferedImpulse = await impulseData.arrayBuffer(); - CiderAudio.audioNodes.atmosphereRealizer.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse); - }); - break; - case "CRYPTO": - CiderAudio.audioNodes.atmosphereRealizer = CiderAudio.context.createConvolver(); - CiderAudio.audioNodes.atmosphereRealizer.normalize = false; - - fetch('./audio/impulses/AtmosphereRealizer_Cryptofyre.wav').then(async (impulseData) => { - let bufferedImpulse = await impulseData.arrayBuffer(); - CiderAudio.audioNodes.atmosphereRealizer.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse); - }); - break; - - default: - CiderAudio.audioNodes.atmosphereRealizer = CiderAudio.context.createConvolver(); - CiderAudio.audioNodes.atmosphereRealizer.normalize = false; - - fetch('./audio/impulses/AtmosphereRealizer_Standard.wav').then(async (impulseData) => { - let bufferedImpulse = await impulseData.arrayBuffer(); - CiderAudio.audioNodes.atmosphereRealizer.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse); - }); - app.cfg.audio.maikiwiAudio.atmosphereRealizer_value = "STANDARD"; - break; + CiderAudio.audioNodes.atmosphereRealizer2 = CiderAudio.context.createConvolver(); + CiderAudio.audioNodes.atmosphereRealizer2.normalize = false; + let atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles.find(function (profile) { + return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile; + }); + + if (atmosphereRealizerProfile === undefined) { + atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles[0]; } + fetch(atmosphereRealizerProfile.file).then(async (impulseData) => { + let bufferedImpulse = await impulseData.arrayBuffer(); + CiderAudio.audioNodes.atmosphereRealizer2.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse); + }); switch (hierarchy) { case 4: try { - CiderAudio.audioNodes.atmosphereRealizer.connect(CiderAudio.audioNodes.analogWarmth[0]); + CiderAudio.audioNodes.atmosphererealizer2.connect(CiderAudio.audioNodes.atmosphereRealizer1); } catch (e) { } break; case 3: try { - CiderAudio.audioNodes.atmosphereRealizer.connect(CiderAudio.audioNodes.llpw[0]); + CiderAudio.audioNodes.atmosphererealizer2.connect(CiderAudio.audioNodes.llpw[0]); } catch (e) { } break; case 2: try { - CiderAudio.audioNodes.atmosphereRealizer.connect(CiderAudio.audioNodes.vibrantbassNode[0]); + CiderAudio.audioNodes.atmosphererealizer2.connect(CiderAudio.audioNodes.vibrantbassNode[0]); } catch (e) { } break; case 1: try { - CiderAudio.audioNodes.atmosphereRealizer.connect(CiderAudio.audioNodes.audioBands[0]); + CiderAudio.audioNodes.atmosphererealizer2.connect(CiderAudio.audioNodes.audioBands[0]); } catch (e) { } break; case 0: - try { CiderAudio.audioNodes.atmosphereRealizer.connect(CiderAudio.context.destination); } catch (e) { } + try { CiderAudio.audioNodes.atmosphererealizer2.connect(CiderAudio.context.destination); } catch (e) { } break; } } }, - analogWarmth_h2_3: function (status, hierarchy) { - if (status === true) { // 23 Band Adjustment - let WARMTH_FREQUENCIES = [10.513, 15.756, 224.01, 677.77, 1245.4, 2326.8, 2847.3, 4215.3, 11057, 12793, 16235, 16235, 17838, 18112, 18112, 19326, 19372, 19372, 20061, 20280, 20280, 20853, 22276]; - let WARMTH_GAIN = [-4.81, 0.74, 0.55, -0.84, -1.52, 0.84, 0.66, -0.29, 0.29, 0.94, 1.67, 1.62, -0.53, -0.81, -4.98, 1.43, 0.86, 1.13, -1.06, -0.95, -1.13, 1.78, -3.86]; - let WARMTH_Q = [0.442, 3.536, 2.102, 8.409, 0.625, 16.82, 5, 2.973, 3.536, 2.5, 2.5, 11.89, 0.625, 1.487, 1.153, 5, 5.453, 5, 2.973, 3.386, 3.386, 14.14, 8.409]; - CiderAudio.audioNodes.analogWarmth = [] - - switch (app.cfg.audio.maikiwiAudio.analogWarmth_value) { - case "SMOOTH": - for (let i = 0; i < WARMTH_FREQUENCIES.length; i++) { - CiderAudio.audioNodes.analogWarmth[i] = CiderAudio.context.createBiquadFilter(); - CiderAudio.audioNodes.analogWarmth[i].type = 'peaking'; // 'peaking'; - CiderAudio.audioNodes.analogWarmth[i].frequency.value = WARMTH_FREQUENCIES[i]; - CiderAudio.audioNodes.analogWarmth[i].Q.value = WARMTH_Q[i]; - CiderAudio.audioNodes.analogWarmth[i].gain.value = WARMTH_GAIN[i] * 1.25; - } - break; - - case "WARM": - for (let i = 0; i < WARMTH_FREQUENCIES.length; i++) { - CiderAudio.audioNodes.analogWarmth[i] = CiderAudio.context.createBiquadFilter(); - CiderAudio.audioNodes.analogWarmth[i].type = 'peaking'; // 'peaking'; - CiderAudio.audioNodes.analogWarmth[i].frequency.value = WARMTH_FREQUENCIES[i]; - CiderAudio.audioNodes.analogWarmth[i].Q.value = WARMTH_Q[i]; - CiderAudio.audioNodes.analogWarmth[i].gain.value = WARMTH_GAIN[i] * 1.75; - } - break; - - default: - for (let i = 0; i < WARMTH_FREQUENCIES.length; i++) { - CiderAudio.audioNodes.analogWarmth[i] = CiderAudio.context.createBiquadFilter(); - CiderAudio.audioNodes.analogWarmth[i].type = 'peaking'; // 'peaking'; - CiderAudio.audioNodes.analogWarmth[i].frequency.value = WARMTH_FREQUENCIES[i]; - CiderAudio.audioNodes.analogWarmth[i].Q.value = WARMTH_Q[i]; - CiderAudio.audioNodes.analogWarmth[i].gain.value = WARMTH_GAIN[i] * 1.25; - } - app.cfg.audio.maikiwiAudio.analogWarmth_value = "SMOOTH"; - break; - } - - - for (let i = 1; i < WARMTH_FREQUENCIES.length; i++) { - CiderAudio.audioNodes.analogWarmth[i - 1].connect(CiderAudio.audioNodes.analogWarmth[i]); + atmosphereRealizer1_h2_3: function (status, hierarchy) { + if (status === true) { + CiderAudio.audioNodes.atmosphereRealizer1 = CiderAudio.context.createConvolver(); + CiderAudio.audioNodes.atmosphereRealizer1.normalize = false; + let atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles.find(function (profile) { + return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile; + }); + + if (atmosphereRealizerProfile === undefined) { + atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles[0]; } + fetch(atmosphereRealizerProfile.file).then(async (impulseData) => { + let bufferedImpulse = await impulseData.arrayBuffer(); + CiderAudio.audioNodes.atmosphereRealizer1.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse); + }); switch (hierarchy) { case 3: try { - CiderAudio.audioNodes.analogWarmth[WARMTH_FREQUENCIES.length - 1].connect(CiderAudio.audioNodes.llpw[0]); + CiderAudio.audioNodes.atmosphererealizer1.connect(CiderAudio.audioNodes.llpw[0]); } catch (e) { } break; case 2: try { - CiderAudio.audioNodes.analogWarmth[WARMTH_FREQUENCIES.length - 1].connect(CiderAudio.audioNodes.vibrantbassNode[0]); + CiderAudio.audioNodes.atmosphererealizer1.connect(CiderAudio.audioNodes.vibrantbassNode[0]); } catch (e) { } break; case 1: try { - CiderAudio.audioNodes.analogWarmth[WARMTH_FREQUENCIES.length - 1].connect(CiderAudio.audioNodes.audioBands[0]); + CiderAudio.audioNodes.atmosphererealizer1.connect(CiderAudio.audioNodes.audioBands[0]); } catch (e) { } break; case 0: - try { CiderAudio.audioNodes.analogWarmth[WARMTH_FREQUENCIES.length - 1].connect(CiderAudio.context.destination); } catch (e) { } + try { CiderAudio.audioNodes.atmosphererealizer1.connect(CiderAudio.context.destination); } catch (e) { } break; } @@ -681,8 +639,8 @@ const CiderAudio = { try { CiderAudio.audioNodes.spatialNode.output.disconnect(); } catch (e) { } try { CiderAudio.audioNodes.spatialNode.disconnect(); } catch (e) { } try { CiderAudio.audioNodes.gainNode.disconnect(); } catch (e) { } - try { CiderAudio.audioNodes.atmosphereRealizer.disconnect(); CiderAudio.audioNodes.atmosphereRealizer = null } catch (e) { } - try { for (var i of CiderAudio.audioNodes.analogWarmth) { i.disconnect(); } CiderAudio.audioNodes.analogWarmth = null } catch (e) { } + try { CiderAudio.audioNodes.atmosphereRealizer1.disconnect(); CiderAudio.audioNodes.atmosphereRealizer1 = null } catch (e) { } + try { CiderAudio.audioNodes.atmosphereRealizer2.disconnect(); CiderAudio.audioNodes.atmosphereRealizer2 = null } catch (e) { } try { for (var i of CiderAudio.audioNodes.llpw) { i.disconnect(); } CiderAudio.audioNodes.llpw = null } catch (e) { } try { for (var i of CiderAudio.audioNodes.vibrantbassNode) { i.disconnect(); } CiderAudio.audioNodes.vibrantbassNode = null } catch (e) { } try { for (var i of CiderAudio.audioNodes.audioBands) { i.disconnect(); } CiderAudio.audioNodes.audioBands = null } catch (e) { } @@ -702,77 +660,77 @@ const CiderAudio = { if (app.cfg.audio.maikiwiAudio.ciderPPE === true) { // Vibrant Bass, CAP CiderAudio.llpw_h2_2(true, 2); - if (app.cfg.audio.maikiwiAudio.analogWarmth === true) { // Vibrant Bass, CAP, Analog Warmth - CiderAudio.analogWarmth_h2_3(true, 3); + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { // Vibrant Bass, CAP, Atmosphere Realizer 1 + CiderAudio.atmosphereRealizer1_h2_3(true, 3); if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 4); + CiderAudio.atmosphereRealizer2_h2_4(true, 4); if (app.cfg.audio.maikiwiAudio.spatial === true) { - if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial + if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Atmosphere Realizer 1, Maikiwi Spatial app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Atmosphere Realizer 1, Maikiwi Spatial, Atmosphere Realizer 2') } - else { // Vibrant Bass, CAP, Analog Warmth, Spatial + else { // Vibrant Bass, CAP, Atmosphere Realizer 1, Spatial app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Analog Warmth, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Atmosphere Realizer 1, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Analog Warmth, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Atmosphere Realizer 1, Atmosphere Realizer 2') } } else { if (app.cfg.audio.maikiwiAudio.spatial === true) { - if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial + if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Atmosphere Realizer 1, Maikiwi Spatial app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Atmosphere Realizer 1, Maikiwi Spatial') } - else { // Vibrant Bass, CAP, Analog Warmth, Spatial + else { // Vibrant Bass, CAP, Atmosphere Realizer 1, Spatial app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Analog Warmth, Spatial') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Atmosphere Realizer 1, Spatial') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Analog Warmth') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Atmosphere Realizer 1') } } } else { if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 3) + CiderAudio.atmosphereRealizer2_h2_4(true, 3) if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, CAP, Atmosphere Realizer 2') } } else { @@ -799,30 +757,30 @@ const CiderAudio = { } } else { - if (app.cfg.audio.maikiwiAudio.analogWarmth === true) { - CiderAudio.analogWarmth_h2_3(true, 2); + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { + CiderAudio.atmosphereRealizer1_h2_3(true, 2); if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 4) + CiderAudio.atmosphereRealizer2_h2_4(true, 4) if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Analog Warmth, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Atmosphere Realizer 1, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Analog Warmth, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Atmosphere Realizer 1, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Analog Warmth, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Atmosphere Realizer 1, Atmosphere Realizer 2') } } @@ -831,44 +789,44 @@ const CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Analog Warmth, Maikiwi Spatial') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Atmosphere Realizer 1, Maikiwi Spatial') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Analog Warmth, Spatial') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Atmosphere Realizer 1, Spatial') } } else { - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Analog Warmth') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Atmosphere Realizer 1') } } } else { if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 2) + CiderAudio.atmosphereRealizer2_h2_4(true, 2) if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Vibrant Bass, Atmosphere Realizer 2') } } @@ -901,30 +859,30 @@ const CiderAudio = { if (app.cfg.audio.maikiwiAudio.ciderPPE === true) { CiderAudio.llpw_h2_2(true, 1); - if (app.cfg.audio.maikiwiAudio.analogWarmth === true) { - CiderAudio.analogWarmth_h2_3(true, 3); + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { + CiderAudio.atmosphereRealizer1_h2_3(true, 3); if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 4); + CiderAudio.atmosphereRealizer2_h2_4(true, 4); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, CAP, Analog Warmth, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, CAP, Atmosphere Realizer 1, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, CAP, Analog Warmth, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, CAP, Atmosphere Realizer 1, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, CAP and Analog Warmth, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, CAP and Atmosphere Realizer 1, Atmosphere Realizer 2') } } @@ -934,45 +892,45 @@ const CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, CAP, Analog Warmth, Maikiwi Spatial') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, CAP, Atmosphere Realizer 1, Maikiwi Spatial') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, CAP, Analog Warmth, Spatial') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, CAP, Atmosphere Realizer 1, Spatial') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, CAP and Analog Warmth') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, CAP and Atmosphere Realizer 1') } } } else { if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 3); + CiderAudio.atmosphereRealizer2_h2_4(true, 3); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, CAP, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, CAP, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, CAP, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, CAP, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, CAP, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, CAP, Atmosphere Realizer 2') } } @@ -1000,30 +958,30 @@ const CiderAudio = { } } // CAP ends here else { - if (app.cfg.audio.maikiwiAudio.analogWarmth === true) { - CiderAudio.analogWarmth_h2_3(true, 1); + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { + CiderAudio.atmosphereRealizer1_h2_3(true, 1); if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 4); + CiderAudio.atmosphereRealizer2_h2_4(true, 4); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Analog Warmth, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Atmosphere Realizer 1, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Analog Warmth, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Atmosphere Realizer 1, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Analog Warmth, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Atmosphere Realizer 1, Atmosphere Realizer 2') } } @@ -1032,44 +990,44 @@ const CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, Analog Warmth, Maikiwi Spatial') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Atmosphere Realizer 1, Maikiwi Spatial') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, Analog Warmth, Spatial') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Atmosphere Realizer 1, Spatial') } } else { - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Equalizer, Analog Warmth') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Atmosphere Realizer 1') } } } else { if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 1); + CiderAudio.atmosphereRealizer2_h2_4(true, 1); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Equalizer, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Equalizer, Atmosphere Realizer 2') } } @@ -1104,77 +1062,77 @@ const CiderAudio = { if (app.cfg.audio.maikiwiAudio.ciderPPE === true) { // Vibrant Bass, CAP CiderAudio.llpw_h2_2(true, 2); - if (app.cfg.audio.maikiwiAudio.analogWarmth === true) { // Vibrant Bass, CAP, Analog Warmth - CiderAudio.analogWarmth_h2_3(true, 3); + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { // Vibrant Bass, CAP, Atmosphere Realizer 1 + CiderAudio.atmosphereRealizer1_h2_3(true, 3); if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 4); + CiderAudio.atmosphereRealizer2_h2_4(true, 4); if (app.cfg.audio.maikiwiAudio.spatial === true) { - if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial + if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Atmosphere Realizer 1, Maikiwi Spatial app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, CAP, Atmosphere Realizer 1, Maikiwi Spatial, Atmosphere Realizer 2') } - else { // Vibrant Bass, CAP, Analog Warmth, Spatial + else { // Vibrant Bass, CAP, Atmosphere Realizer 1, Spatial app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, CAP, Atmosphere Realizer 1, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, CAP, Atmosphere Realizer 1, Atmosphere Realizer 2') } } else { if (app.cfg.audio.maikiwiAudio.spatial === true) { - if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial + if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Atmosphere Realizer 1, Maikiwi Spatial app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, CAP, Atmosphere Realizer 1, Maikiwi Spatial') } - else { // Vibrant Bass, CAP, Analog Warmth, Spatial + else { // Vibrant Bass, CAP, Atmosphere Realizer 1, Spatial app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Spatial') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, CAP, Atmosphere Realizer 1, Spatial') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, CAP, Atmosphere Realizer 1') } } } - else { // if (app.cfg.audio.maikiwiAudio.analogWarmth) !== true + else { // if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1) !== true if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 3); + CiderAudio.atmosphereRealizer2_h2_4(true, 3); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, CAP, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, CAP, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, CAP, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, CAP, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, CAP, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, CAP, Atmosphere Realizer 2') } } @@ -1202,30 +1160,30 @@ const CiderAudio = { } } else { - if (app.cfg.audio.maikiwiAudio.analogWarmth === true) { - CiderAudio.analogWarmth_h2_3(true, 2); + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { + CiderAudio.atmosphereRealizer1_h2_3(true, 2); if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 4); + CiderAudio.atmosphereRealizer2_h2_4(true, 4); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, Analog Warmth, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, Atmosphere Realizer 1, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, Analog Warmth, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, Atmosphere Realizer 1, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, Analog Warmth, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, Atmosphere Realizer 1, Atmosphere Realizer 2') } } @@ -1234,46 +1192,46 @@ const CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Vibrant Bass, Analog Warmth, Maikiwi Spatial') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, Atmosphere Realizer 1, Maikiwi Spatial') } else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Vibrant Bass, Analog Warmth, Spatial') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, Atmosphere Realizer 1, Spatial') } } else { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Vibrant Bass, Analog Warmth') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, Atmosphere Realizer 1') } } } else { if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 2); + CiderAudio.atmosphereRealizer2_h2_4(true, 2); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Vibrant Bass, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Vibrant Bass, Atmosphere Realizer 2') } } @@ -1305,30 +1263,30 @@ const CiderAudio = { if (app.cfg.audio.maikiwiAudio.ciderPPE === true) { CiderAudio.llpw_h2_2(true, 0); - if (app.cfg.audio.maikiwiAudio.analogWarmth === true) { - CiderAudio.analogWarmth_h2_3(true, 3); + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { + CiderAudio.atmosphereRealizer1_h2_3(true, 3); if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 4); + CiderAudio.atmosphereRealizer2_h2_4(true, 4); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] CAP, Analog Warmth, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] CAP, Atmosphere Realizer 1, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] CAP, Analog Warmth, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] CAP, Atmosphere Realizer 1, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] CAP and Analog Warmth, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] CAP and Atmosphere Realizer 1, Atmosphere Realizer 2') } } @@ -1337,45 +1295,45 @@ const CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] CAP, Analog Warmth, Maikiwi Spatial') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] CAP, Atmosphere Realizer 1, Maikiwi Spatial') } else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] CAP, Analog Warmth, Spatial') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] CAP, Atmosphere Realizer 1, Spatial') } } else { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] CAP and Analog Warmth') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] CAP and Atmosphere Realizer 1') } } } else { if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 3); + CiderAudio.atmosphereRealizer2_h2_4(true, 3); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] CAP, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] CAP, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] CAP, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] CAP, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] CAP, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] CAP, Atmosphere Realizer 2') } } @@ -1403,30 +1361,30 @@ const CiderAudio = { } } // CAP ends here else { - if (app.cfg.audio.maikiwiAudio.analogWarmth === true) { - CiderAudio.analogWarmth_h2_3(true, 0); + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { + CiderAudio.atmosphereRealizer1_h2_3(true, 0); if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 4); + CiderAudio.atmosphereRealizer2_h2_4(true, 4); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Analog Warmth, Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Atmosphere Realizer 1, Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Analog Warmth, Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Atmosphere Realizer 1, Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Analog Warmth, Atmosphere Realizer') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Atmosphere Realizer 1, Atmosphere Realizer 2') } } @@ -1435,44 +1393,44 @@ const CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Analog Warmth, Maikiwi Spatial') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Atmosphere Realizer 1, Maikiwi Spatial') } else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Analog Warmth, Spatial') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Atmosphere Realizer 1, Spatial') } } else { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - console.debug('[Cider][Audio] Analog Warmth') + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Atmosphere Realizer 1') } } } else { if (app.cfg.audio.maikiwiAudio.atmosphereRealizer === true) { - CiderAudio.atmosphereRealizer_h2_4(true, 0); + CiderAudio.atmosphereRealizer2_h2_4(true, 0); if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); - CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Maikiwi Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Maikiwi Spatial, Atmosphere Realizer 2') } else { app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); - CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer); - console.debug('[Cider][Audio] Spatial, Atmosphere Realizer') + CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.atmosphereRealizer2); + console.debug('[Cider][Audio] Spatial, Atmosphere Realizer 2') } } else { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer); + CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2); console.debug('[Cider][Audio] Atmosphere Realizer') } } diff --git a/src/renderer/views/pages/audiolabs.ejs b/src/renderer/views/pages/audiolabs.ejs index 626bd508..430940ec 100644 --- a/src/renderer/views/pages/audiolabs.ejs +++ b/src/renderer/views/pages/audiolabs.ejs @@ -45,62 +45,53 @@ -
-
- {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.analogWarmth')}} -
- {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.analogWarmth.description')}} -
-
- -
-
-
-
- {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity')}} -
- {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description')}} -
-
- -
-
- {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} + {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [1]
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description')}}
-
-
+
- {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode')}} + {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode')}} [1]
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description')}}
+
+
+
+
+ {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [2] +
+ {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description')}} +
+
+ +
+
+
+
+ {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode')}} [2] +
+ {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description')}} +
+
+
@@ -187,6 +178,7 @@ data: function () { return { app: this.$root, + arprofiles: CiderAudio.atmosphereRealizerProfiles, spprofiles: CiderAudio.spatialProfiles } }, @@ -249,32 +241,6 @@ CiderAudio.hierarchical_loading(); } }, - ChangeanalogWarmth: function () { - let WARMTH_GAIN = [-4.81, 0.74, 0.55, -0.84, -1.52, 0.84, 0.66, -0.29, 0.29, 0.94, 1.67, 1.62, -0.53, -0.81, -4.98, 1.43, 0.86, 1.13, -1.06, -0.95, -1.13, 1.78, -3.86]; - - switch (app.cfg.audio.maikiwiAudio.analogWarmth_value) { - case "SMOOTH": - for (let i = 0; i < 23; i++) { - CiderAudio.audioNodes.analogWarmth[i].gain.value = WARMTH_GAIN[i] * 1.25; - } - CiderAudio.intelliGainComp_h0_0(); - break; - case "WARM": - for (let i = 0; i < 23; i++) { - CiderAudio.audioNodes.analogWarmth[i].gain.value = WARMTH_GAIN[i] * 1.75; - } - CiderAudio.intelliGainComp_h0_0(); - 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; - } - CiderAudio.intelliGainComp_h0_0(); - break; - } - - }, } }) \ No newline at end of file diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 8e9bc841..875f08bf 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -436,7 +436,7 @@
From 6fabe4c14168f2d6f0cc6bff6141ab1b35e9f493 Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sun, 8 May 2022 22:41:40 -0700 Subject: [PATCH 029/109] typo --- src/renderer/audio/audio.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index fc69953e..5e29fcfa 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -423,26 +423,26 @@ const CiderAudio = { switch (hierarchy) { case 4: try { - CiderAudio.audioNodes.atmosphererealizer2.connect(CiderAudio.audioNodes.atmosphereRealizer1); + CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.atmosphereRealizer1); } catch (e) { } break; case 3: try { - CiderAudio.audioNodes.atmosphererealizer2.connect(CiderAudio.audioNodes.llpw[0]); + CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.llpw[0]); } catch (e) { } break; case 2: try { - CiderAudio.audioNodes.atmosphererealizer2.connect(CiderAudio.audioNodes.vibrantbassNode[0]); + CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.vibrantbassNode[0]); } catch (e) { } break; case 1: try { - CiderAudio.audioNodes.atmosphererealizer2.connect(CiderAudio.audioNodes.audioBands[0]); + CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.audioBands[0]); } catch (e) { } break; case 0: - try { CiderAudio.audioNodes.atmosphererealizer2.connect(CiderAudio.context.destination); } catch (e) { } + try { CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.context.destination); } catch (e) { } break; } @@ -468,21 +468,21 @@ const CiderAudio = { switch (hierarchy) { case 3: try { - CiderAudio.audioNodes.atmosphererealizer1.connect(CiderAudio.audioNodes.llpw[0]); + CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.llpw[0]); } catch (e) { } break; case 2: try { - CiderAudio.audioNodes.atmosphererealizer1.connect(CiderAudio.audioNodes.vibrantbassNode[0]); + CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.vibrantbassNode[0]); } catch (e) { } break; case 1: try { - CiderAudio.audioNodes.atmosphererealizer1.connect(CiderAudio.audioNodes.audioBands[0]); + CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.audioBands[0]); } catch (e) { } break; case 0: - try { CiderAudio.audioNodes.atmosphererealizer1.connect(CiderAudio.context.destination); } catch (e) { } + try { CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.context.destination); } catch (e) { } break; } From d556abef624072eb628e1033019ae4c105d3fb0b Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sun, 8 May 2022 22:47:01 -0700 Subject: [PATCH 030/109] I can't fuckin read --- src/renderer/audio/audio.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index 5e29fcfa..acc1957b 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -180,8 +180,8 @@ const CiderAudio = { if (!filters || filters.length === 0) { let filterlessGain = 1; if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length == 1) { filterlessGain = filterlessGain * 1.109174815262401 } - if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 == true) { filterlessGain = filterlessGain * 1.096478196143185 } - if (app.cfg.audio.maikiwiAudio.atmosphereRealizer2 == true) { filterlessGain = filterlessGain * 1.096478196143185 } + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { filterlessGain = filterlessGain * 1.096478196143185 } + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true) { filterlessGain = filterlessGain * 1.096478196143185 } if (app.cfg.audio.maikiwiAudio.spatial == true) { let spatialProfile = CiderAudio.spatialProfiles.find(function (profile) { return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile; @@ -227,7 +227,8 @@ const CiderAudio = { maxGain = gain; } if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length == 1) { maxGain = maxGain * 1.109174815262401 } - if (app.cfg.audio.maikiwiAudio.atmosphereRealizer == true) { maxGain = maxGain * 1.096478196143185 } + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { maxGain = maxGain * 1.096478196143185 } + if (app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true) { maxGain = maxGain * 1.096478196143185 } if (app.cfg.audio.maikiwiAudio.spatial == true) { let spatialProfile = CiderAudio.spatialProfiles.find(function (profile) { return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile; From b25a098efc35e50ea4ab8ad4a6a4da1efc5a84d3 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 9 May 2022 00:53:02 -0500 Subject: [PATCH 031/109] Updated config.yml --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d7b5b75..515c4a3d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -167,25 +167,25 @@ workflows: - prepare-build: filters: branches: - only: main + only: develop - build-windows: requires: - prepare-build filters: branches: - only: main + only: develop - build-linux: requires: - prepare-build filters: branches: - only: main + only: develop - build-winget: requires: - prepare-build filters: branches: - only: main + only: develop - release: requires: - build-windows @@ -193,4 +193,4 @@ workflows: - build-winget filters: branches: - only: main + only: develop From 26e84c61480bd45901ed1538dd127bae638d73fc Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 9 May 2022 08:49:05 +0100 Subject: [PATCH 032/109] Auto Triage --- .github/workflows/auto-project.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/auto-project.yml diff --git a/.github/workflows/auto-project.yml b/.github/workflows/auto-project.yml new file mode 100644 index 00000000..92cfb8b8 --- /dev/null +++ b/.github/workflows/auto-project.yml @@ -0,0 +1,18 @@ +name: Add bugs to bugs project + +on: + issues: + types: + - opened + +jobs: + add-to-project: + name: Add issue to project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@main + with: + project-url: https://github.com/orgs//projects/ + github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} + labeled: bug, needs-triage + label-operator: OR \ No newline at end of file From bd0412b19b8b8387df63082b3b08729eae0c5a2f Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 9 May 2022 08:49:05 +0100 Subject: [PATCH 033/109] Auto Triage --- .github/workflows/auto-project.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/auto-project.yml diff --git a/.github/workflows/auto-project.yml b/.github/workflows/auto-project.yml new file mode 100644 index 00000000..92cfb8b8 --- /dev/null +++ b/.github/workflows/auto-project.yml @@ -0,0 +1,18 @@ +name: Add bugs to bugs project + +on: + issues: + types: + - opened + +jobs: + add-to-project: + name: Add issue to project + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@main + with: + project-url: https://github.com/orgs//projects/ + github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} + labeled: bug, needs-triage + label-operator: OR \ No newline at end of file From 52c7b052738278680a41ffd6a649f27e28f42a95 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 9 May 2022 08:52:31 +0100 Subject: [PATCH 034/109] Update bug_report.yaml --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index c5d6402b..d18e0e23 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -1,7 +1,7 @@ name: Bug Report description: If you encounter an issue whilst using our app, please use this template to help improve the app. title: "[Bug]: " -labels: ["bug", "triage"] +labels: ["bug", "needs-triage"] assignees: [] body: - type: markdown From 14ff743dff42fb8f4ed5c9b45301b9d2b39eb2ac Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 9 May 2022 08:53:53 +0100 Subject: [PATCH 035/109] Update auto-project.yml --- .github/workflows/auto-project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-project.yml b/.github/workflows/auto-project.yml index 92cfb8b8..742d82e1 100644 --- a/.github/workflows/auto-project.yml +++ b/.github/workflows/auto-project.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs//projects/ + project-url: https://github.com/orgs/ciderapp/projects/5 github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} labeled: bug, needs-triage - label-operator: OR \ No newline at end of file + label-operator: OR From d6db99208a514a2d7f6a773232836c5ea8899037 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 9 May 2022 09:06:58 +0100 Subject: [PATCH 036/109] Stale issues --- .github/workflows/stale-issues.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/stale-issues.yml diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml new file mode 100644 index 00000000..b566f1d6 --- /dev/null +++ b/.github/workflows/stale-issues.yml @@ -0,0 +1,18 @@ +name: 'Close stale issues and PRs' +on: + schedule: + - cron: '30 1 * * *' + +permissions: + issues: write + pull-requests: write + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v4 + with: + stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.' + days-before-stale: 30 + days-before-close: 7 \ No newline at end of file From 7bacd819a02ba101a13a2d5a9935ef263c75c644 Mon Sep 17 00:00:00 2001 From: Quacksire <19170969+quacksire@users.noreply.github.com> Date: Mon, 9 May 2022 10:07:06 -0700 Subject: [PATCH 037/109] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b8fface..430a36f2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ GitHub Forks
- Buy Me A Coffee + Buy Me A Coffee Open Collective GitHub Sponsor
From 30bf34aa22a0793bc86cafc878a0c97927309f74 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Mon, 9 May 2022 20:14:06 +0200 Subject: [PATCH 038/109] update settings.ejs --- src/renderer/views/pages/settings.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 71ea0a58..963cd6f0 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -1650,4 +1650,4 @@ }, } }) - + \ No newline at end of file From 6cca7c4e1d455cd7981a626911c4bd72ebbd26d5 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Mon, 9 May 2022 18:49:33 +0000 Subject: [PATCH 039/109] Revert "Add option to hide timestamp in RPC" --- src/i18n/en_US.json | 1 - src/i18n/hu_HU.json | 1 - src/i18n/source/en_US.json | 1 - src/main/base/store.ts | 1 - src/main/plugins/discordrpc.ts | 4 ++-- src/renderer/views/pages/settings.ejs | 11 ----------- 6 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 10aa9e00..2b1e581b 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -472,7 +472,6 @@ "settings.option.connectivity.discordRPC.clientName": "Client Name", "settings.option.connectivity.discordRPC.clearOnPause": "Clear Discord Rich Presence on Pause", "settings.option.connectivity.discordRPC.hideButtons": "Hide buttons on Discord Rich Presence", - "settings.option.connectivity.discordRPC.hideTimestamp": "Hide timestamp on Discord Rich Presence", "settings.option.connectivity.discordRPC.detailsFormat": "Details Format", "settings.option.connectivity.discordRPC.stateFormat": "State Format", "settings.option.connectivity.lastfmScrobble": "Last.fm Scrobbling", diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json index ca93b58e..8108143d 100644 --- a/src/i18n/hu_HU.json +++ b/src/i18n/hu_HU.json @@ -416,7 +416,6 @@ "settings.option.connectivity.discordRPC.clientName": "Kliensnév", "settings.option.connectivity.discordRPC.clearOnPause": "Rich Presence törlése megállításnál", "settings.option.connectivity.discordRPC.hideButtons": "Rich Presence gombok elrejtése", - "settings.option.connectivity.discordRPC.hideTimestamp": "Rich Presence visszaszámláló elrejtése", "settings.option.connectivity.discordRPC.detailsFormat": "Részletek formátuma", "settings.option.connectivity.discordRPC.stateFormat": "Állapot formátuma", "settings.option.connectivity.lastfmScrobble": "Last.fm Scrobbling", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 10aa9e00..2b1e581b 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -472,7 +472,6 @@ "settings.option.connectivity.discordRPC.clientName": "Client Name", "settings.option.connectivity.discordRPC.clearOnPause": "Clear Discord Rich Presence on Pause", "settings.option.connectivity.discordRPC.hideButtons": "Hide buttons on Discord Rich Presence", - "settings.option.connectivity.discordRPC.hideTimestamp": "Hide timestamp on Discord Rich Presence", "settings.option.connectivity.discordRPC.detailsFormat": "Details Format", "settings.option.connectivity.discordRPC.stateFormat": "State Format", "settings.option.connectivity.lastfmScrobble": "Last.fm Scrobbling", diff --git a/src/main/base/store.ts b/src/main/base/store.ts index c3bc6373..de8590a5 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -17,7 +17,6 @@ export class Store { "client": "Cider", "clear_on_pause": true, "hide_buttons": false, - "hide_timestamp": false, "state_format": "by {artist}", "details_format": "{title}", }, diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts index fe933903..c943eb68 100644 --- a/src/main/plugins/discordrpc.ts +++ b/src/main/plugins/discordrpc.ts @@ -183,8 +183,8 @@ export default class DiscordRPC { ] //To change attributes.url => preload/cider-preload.js } - // Add the timestamp if its playing and people want them - if (!this._utils.getStoreValue("general.discordrpc.hide_timestamp") && attributes.status) { + // Add the timestamp if its playing + if (attributes.status) { activity.startTimestamp = Date.now() - (attributes?.durationInMillis - attributes?.remainingTime) activity.endTimestamp = attributes.endTime } diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 963cd6f0..8e9bc841 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -1067,17 +1067,6 @@ -
-
- {{$root.getLz('settings.option.connectivity.discordRPC.hideTimestamp')}} -
-
- -
-
-
{{$root.getLz('settings.option.connectivity.discordRPC.detailsFormat')}}
From 68e147ab1dffb4c908cfdd289a983b1cbf54808f Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Mon, 9 May 2022 21:10:30 +0200 Subject: [PATCH 040/109] Remove Spatialization from Audio Settings modal --- src/renderer/views/components/audio-settings.ejs | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/renderer/views/components/audio-settings.ejs b/src/renderer/views/components/audio-settings.ejs index 249d49ca..d16c2734 100644 --- a/src/renderer/views/components/audio-settings.ejs +++ b/src/renderer/views/components/audio-settings.ejs @@ -12,11 +12,6 @@
<%- include("../svg/speaker.svg") %>
{{app.getLz('term.equalizer')}}
-
+
+
+ {{$root.getLz('settings.option.connectivity.discordRPC.hideTimestamp')}} +
+
+ +
+
+
{{$root.getLz('settings.option.connectivity.discordRPC.detailsFormat')}}
From 44160dc1040ec1eb63183dc3c86fc27539a7425e Mon Sep 17 00:00:00 2001 From: Pedro Galhardo Date: Tue, 10 May 2022 05:20:13 +0100 Subject: [PATCH 052/109] Add missing button labels (fix for screen readers) (#1016) --- src/i18n/en_US.json | 11 +++++ src/i18n/source/en_US.json | 11 +++++ src/renderer/views/app/chrome-bottom.ejs | 34 ++++++++++----- src/renderer/views/app/chrome-top.ejs | 43 +++++++++++++------ src/renderer/views/app/sidebar.ejs | 38 ++++++++++------ .../views/components/add-to-playlist.ejs | 4 +- .../views/components/airplay-modal.ejs | 2 +- .../views/components/audio-controls.ejs | 2 +- .../views/components/audio-playbackrate.ejs | 2 +- .../views/components/audio-settings.ejs | 2 +- src/renderer/views/components/castmenu.ejs | 6 +-- src/renderer/views/components/cider-modal.ejs | 6 +-- src/renderer/views/components/equalizer.ejs | 8 ++-- src/renderer/views/components/fullscreen.ejs | 42 +++++++++++------- .../components/inline-collection-list.ejs | 2 +- .../views/components/mediaitem-list-item.ejs | 8 ++-- .../views/components/mediaitem-square.ejs | 20 +++++---- .../views/components/moreinfo-modal.ejs | 6 +-- src/renderer/views/components/plugin-menu.ejs | 2 +- .../views/components/qrcode-modal.ejs | 10 ++--- src/renderer/views/components/queue.ejs | 6 ++- src/renderer/views/components/share-sheet.ejs | 4 +- .../views/components/spatial-properties.ejs | 10 ++--- src/renderer/views/pages/artist.ejs | 16 +++---- src/renderer/views/pages/cider-playlist.ejs | 4 +- src/renderer/views/pages/collection-list.ejs | 2 +- src/renderer/views/pages/library-albums.ejs | 15 ++++--- .../views/pages/library-recentlyadded.ejs | 4 +- src/renderer/views/pages/library-songs.ejs | 9 ++-- src/renderer/views/pages/playlist-inline.ejs | 22 +++++----- src/renderer/views/pages/podcasts.ejs | 2 +- .../views/components/mediaitem-square.ejs | 10 +++-- 32 files changed, 225 insertions(+), 138 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index bd87cf25..dbb254fb 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -21,11 +21,13 @@ "term.accountSettings": "Account Settings", "term.logout": "Logout", "term.login": "Log In", + "term.quickNav": "Quick Nav", "term.cast": "Cast", "term.about": "About", "term.privateSession": "Private Session", "term.disablePrivateSession": "Disable Private Session", "term.queue": "Queue", + "term.autoplay": "Autoplay", "term.lyrics": "Lyrics", "term.miniplayer": "MiniPlayer", "term.history": "History", @@ -46,12 +48,19 @@ "term.createNewPlaylist": "Create New Playlist", "term.createNewPlaylistFolder": "Create New Playlist Folder", "term.deletePlaylist": "Are you sure you want to delete this playlist?", + "term.navigateBack": "Navigate back", + "term.navigateForward": "Navigate forward", "term.play": "Play", "term.pause": "Pause", "term.previous": "Previous", "term.next": "Next", "term.shuffle": "Shuffle", + "term.enableShuffle": "Enable shuffle", + "term.disableShuffle": "Disable shuffle", "term.repeat": "Repeat", + "term.enableRepeatOne": "Enable repeat one", + "term.disableRepeatOne": "Disable repeat one", + "term.disableRepeat": "Disable repeat", "term.volume": "Volume", "term.mute": "Mute", "term.unmute": "Unmute", @@ -254,6 +263,7 @@ "action.newpreset": "New Preset...", "action.deletepreset": "Delete Preset", "action.open": "Open", + "action.close": "Close", "action.relaunch.confirm": "Do you want to relaunch Cider?", "action.cast.chromecast": "Chromecast", "action.cast.todevices": "Cast to Devices", @@ -264,6 +274,7 @@ "action.cast.scanning": "Scanning...", "action.createNew": "Create New...", "action.openArtworkInBrowser": "Open artwork in browser", + "action.scrollToTop": "Scroll to top", "menubar.options.about": "About", "menubar.options.settings": "Settings", "menubar.options.quit": "Quit Cider", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index bd87cf25..dbb254fb 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -21,11 +21,13 @@ "term.accountSettings": "Account Settings", "term.logout": "Logout", "term.login": "Log In", + "term.quickNav": "Quick Nav", "term.cast": "Cast", "term.about": "About", "term.privateSession": "Private Session", "term.disablePrivateSession": "Disable Private Session", "term.queue": "Queue", + "term.autoplay": "Autoplay", "term.lyrics": "Lyrics", "term.miniplayer": "MiniPlayer", "term.history": "History", @@ -46,12 +48,19 @@ "term.createNewPlaylist": "Create New Playlist", "term.createNewPlaylistFolder": "Create New Playlist Folder", "term.deletePlaylist": "Are you sure you want to delete this playlist?", + "term.navigateBack": "Navigate back", + "term.navigateForward": "Navigate forward", "term.play": "Play", "term.pause": "Pause", "term.previous": "Previous", "term.next": "Next", "term.shuffle": "Shuffle", + "term.enableShuffle": "Enable shuffle", + "term.disableShuffle": "Disable shuffle", "term.repeat": "Repeat", + "term.enableRepeatOne": "Enable repeat one", + "term.disableRepeatOne": "Disable repeat one", + "term.disableRepeat": "Disable repeat", "term.volume": "Volume", "term.mute": "Mute", "term.unmute": "Unmute", @@ -254,6 +263,7 @@ "action.newpreset": "New Preset...", "action.deletepreset": "Delete Preset", "action.open": "Open", + "action.close": "Close", "action.relaunch.confirm": "Do you want to relaunch Cider?", "action.cast.chromecast": "Chromecast", "action.cast.todevices": "Cast to Devices", @@ -264,6 +274,7 @@ "action.cast.scanning": "Scanning...", "action.createNew": "Create New...", "action.openArtworkInBrowser": "Open artwork in browser", + "action.scrollToTop": "Scroll to top", "menubar.options.about": "About", "menubar.options.settings": "Settings", "menubar.options.quit": "Quit Cider", diff --git a/src/renderer/views/app/chrome-bottom.ejs b/src/renderer/views/app/chrome-bottom.ejs index e27a6e13..733b73e7 100644 --- a/src/renderer/views/app/chrome-bottom.ejs +++ b/src/renderer/views/app/chrome-bottom.ejs @@ -39,7 +39,8 @@
@@ -99,17 +109,17 @@
-
- +
+
-
+ - + diff --git a/src/renderer/views/components/inline-collection-list.ejs b/src/renderer/views/components/inline-collection-list.ejs index 964f7847..bc7333c1 100644 --- a/src/renderer/views/components/inline-collection-list.ejs +++ b/src/renderer/views/components/inline-collection-list.ejs @@ -18,7 +18,7 @@ - diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs index abd2909d..6ea0d3bc 100644 --- a/src/renderer/views/components/mediaitem-list-item.ejs +++ b/src/renderer/views/components/mediaitem-list-item.ejs @@ -20,10 +20,10 @@
- -
@@ -42,7 +42,9 @@ :size="48" :bgcolor="getBgColor()" :type="item.type"> - +
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs index 5f4a9aa0..901a34af 100644 --- a/src/renderer/views/components/mediaitem-square.ejs +++ b/src/renderer/views/components/mediaitem-square.ejs @@ -8,7 +8,7 @@
{{item?.meta?.reason?.stringForDisplay ?? ''}}
- @@ -361,7 +361,7 @@ if (this.data.type.includes('albums')) { let date = this.data.attributes.releaseDate; if (date == null || date === "") return ""; - return `${this.data.relationships.tracks.data[0].attributes.genreNames[0]} · ${new Date(date).getFullYear()}` + return `${this.data.relationships.tracks.data[0].attributes.genreNames[0]} · ${new Date(date).getFullYear()}` } }, async isInLibrary() { diff --git a/src/renderer/views/pages/podcasts.ejs b/src/renderer/views/pages/podcasts.ejs index 7430c01d..169a8b76 100644 --- a/src/renderer/views/pages/podcasts.ejs +++ b/src/renderer/views/pages/podcasts.ejs @@ -68,7 +68,7 @@
- +
diff --git a/src/web-remote/views/components/mediaitem-square.ejs b/src/web-remote/views/components/mediaitem-square.ejs index b58a5271..546eb2b2 100644 --- a/src/web-remote/views/components/mediaitem-square.ejs +++ b/src/web-remote/views/components/mediaitem-square.ejs @@ -14,9 +14,13 @@ :type="item.type">
+ @click="contextMenu" :aria-label="$root.getLz('term.more')"> + <%- include("../svg/more.svg") %> + + @click="app.playMediaItem(item)" :aria-label="$root.getLz('term.play')"> + <%- include("../svg/play.svg") %> +
{{ item.attributes.name }}
-
+
{{ getSubtitle() }} From b432fa4d6bf8a08a99a0ca9465b11472668d9f47 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 10 May 2022 02:17:44 -0700 Subject: [PATCH 053/109] added some attributes for themes https://docs.cider.sh/themes/available-attributes --- src/renderer/main/vueapp.js | 7 ++++++- src/renderer/views/main.ejs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 9ddb2f88..6764e0de 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -828,8 +828,9 @@ const app = new Vue({ } }); - this.mk.addEventListener(MusicKit.Events.playbackStateDidChange, () => { + this.mk.addEventListener(MusicKit.Events.playbackStateDidChange, (event) => { ipcRenderer.send('wsapi-updatePlaybackState', wsapi.getAttributes()); + document.body.setAttribute("playback-state", event.state == 2 ? "playing" : "paused") }) this.mk.addEventListener(MusicKit.Events.playbackTimeDidChange, (a) => { @@ -887,8 +888,10 @@ const app = new Vue({ if (type.includes("musicVideo") || type.includes("uploadedVideo") || type.includes("music-movie")) { document.getElementById("apple-music-video-container").style.display = "block"; + document.body.setAttribute("video-playing", "true") // app.chrome.topChromeVisible = false } else { + document.body.removeAttribute("video-playing") document.getElementById("apple-music-video-container").style.display = "none"; // app.chrome.topChromeVisible = true } @@ -3869,12 +3872,14 @@ const app = new Vue({ el.play() }) document.querySelector("body").classList.remove("stopanimation") + document.body.setAttribute("focus-state", "focused") this.animateBackground = true } else { document.querySelectorAll(".animated-artwork-video").forEach(el => { el.pause() }) document.querySelector("body").classList.add("stopanimation") + document.body.setAttribute("focus-state", "blurred") this.animateBackground = false } }, diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 15f02bf9..8d2a0b98 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -65,7 +65,7 @@
<%- include("../assets/cider-round.svg") %>
-
+
<%- include('app/chrome-top'); %> From 8754001f0d71fc0467c68624b86d29d1ba851d84 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Tue, 10 May 2022 11:24:21 +0200 Subject: [PATCH 054/109] Fix unlove --- src/renderer/main/vueapp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 6764e0de..1623546d 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -3770,7 +3770,7 @@ const app = new Vue({ unlove(item) { let type = item.type.slice(-1) === "s" ? item.type : item.type + "s" let id = item.attributes.playParams.catalogId ? item.attributes.playParams.catalogId : item.id - if (item.id.startsWith("i.")) { + if (item.id != null && (item.id.toString()).startsWith("i.")) { if (!type.startsWith("library-")) { type = "library-" + type } From 3c8c3d484c587a0c4008215ad2ed0ecc894ad7b2 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Tue, 10 May 2022 12:54:09 +0200 Subject: [PATCH 055/109] Revert "Fix unlove" --- src/renderer/main/vueapp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 1623546d..6764e0de 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -3770,7 +3770,7 @@ const app = new Vue({ unlove(item) { let type = item.type.slice(-1) === "s" ? item.type : item.type + "s" let id = item.attributes.playParams.catalogId ? item.attributes.playParams.catalogId : item.id - if (item.id != null && (item.id.toString()).startsWith("i.")) { + if (item.id.startsWith("i.")) { if (!type.startsWith("library-")) { type = "library-" + type } From b008949347dc5e5d7ac97455f15356959429d52b Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Tue, 10 May 2022 09:45:27 -0700 Subject: [PATCH 056/109] Update ja_JP.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drafted by あづき#8046 Finalized by Maikiwi --- src/i18n/ja_JP.json | 238 ++++++++++++++++++++++---------------------- 1 file changed, 120 insertions(+), 118 deletions(-) diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json index 7e7d7e79..8dba8e4e 100644 --- a/src/i18n/ja_JP.json +++ b/src/i18n/ja_JP.json @@ -23,12 +23,12 @@ "term.login": "サインイン", "term.cast": "Cast", "term.about": "Ciderについて", - "term.privateSession": "プライベートセッション", + "term.privateSession": "プライベートセッション", "term.disablePrivateSession": "プライベートセッションを無効にする", "term.queue": "次はこちら", "term.lyrics": "歌詞", - "term.miniplayer": "MiniPlayer", - "term.history": "History", + "term.miniplayer": "ミニプレイヤー", + "term.history": "履歴", "term.search": "検索", "term.library": "ライブラリ", "term.listenNow": "今すぐ聴く", @@ -38,14 +38,14 @@ "term.songs": "曲", "term.albums": "アルバム", "term.artists": "アーティスト", - "term.podcasts": "Podcasts", + "term.podcasts": "ポッドキャスト", "term.playlists": "プレイリスト", "term.playlist": "プレイリスト", "term.newPlaylist": "New Playlist", - "term.newPlaylistFolder": "New Playlist Folder", - "term.createNewPlaylist": "Create New Playlist", - "term.createNewPlaylistFolder": "Create New Playlist Folder", - "term.deletePlaylist": "Are you sure you want to delete this playlist?", + "term.newPlaylistFolder": "新しいプレイリストフォルダ", + "term.createNewPlaylist": "新しいプレイリストを作る", + "term.createNewPlaylistFolder": "新しいプレイリストフォルダを作る", + "term.deletePlaylist": "本当にこのプレイリストを削除しますか？", "term.play": "再生", "term.pause": "停止", "term.previous": "戻る", @@ -116,19 +116,19 @@ "term.fullscreenView": "全画面表示", "term.defaultView": "ウィンドウ表示", "term.audioSettings": "オーディオ設定", - "term.audioControls": "Volume Controls", + "term.audioControls": "ボリューム設定", "term.clearAll": "消去", "term.recentStations": "最近の再生", "term.language": "言語", "term.funLanguages": "Fun", - "term.noLyrics": "ローディング。。 / 歌詞が見つからない / 器楽曲.", + "term.noLyrics": "ローディング。。 / 歌詞が見つからない / 器楽曲.", "term.copyright": "Copyright", "term.rightsReserved": "All Rights Reserved.", "term.sponsor": "スポンサーになりましょう", "term.ciderTeam": "Cider チーム", "term.developer": "開発者", "term.socialTeam": "ソーシャル チーム", - "term.socials": "Socials", + "term.socials": "ソーシャル", "term.contributors": "貢献者", "term.equalizer": "イコライザー", "term.reset": "リセット", @@ -141,43 +141,43 @@ "term.menu": "メニュー", "term.check": "確認", "term.aboutArtist": "{{artistName}}について", - "term.topResult": "Top Result", + "term.topResult": "検索結果", "term.sharedPlaylists": "プレイリストを共有", - "term.people": "ユーサ", + "term.people": "ユーザー", "term.newpreset.name": "名前を入力", - "term.addedpreset": "Added Preset", - "term.deletepreset.warn": "Are you sure you want to delete this preset?", - "term.deletedpreset": "Removed preset", - "term.defaultPresets": "Default Presets", - "term.userPresets": "User Presets", - "term.requestError": "There was a problem with the request.", - "term.song.link.generate": "Getting song.link share URL...", + "term.addedpreset": "プリセットを追加", + "term.deletepreset.warn": "本当にこのプリセットを削除しますか？", + "term.deletedpreset": "プリセットを削除", + "term.defaultPresets": "プリセットを初期化", + "term.userPresets": "ユーザープリセット", + "term.requestError": "リクエストに問題がありました", + "term.song.link.generate": "song.link を取得する", "term.musicVideos": "ミュージックビデオ", "term.stations": "ステーション", - "term.curators": "Curators", - "term.appleCurators": "Apple Curators", - "term.radioShows": "Radio Shows", - "term.recordLabels": "Record Labels", - "term.videoExtras": "Video Extras", - "term.top": "Top", + "term.curators": "キュレーター", + "term.appleCurators": "Apple キュレーター", + "term.radioShows": "ラジオ", + "term.recordLabels": "レーベル", + "term.videoExtras": "出演者", + "term.top": "トップ", "term.version": "バージョン", - "term.noVideos": "No videos found.", - "term.plugin": "Plug-in", - "term.pluginMenu": "Plug-in Menu", + "term.noVideos": "ビデオが見つかりませんでした", + "term.plugin": "プラグイン", + "term.pluginMenu": "プラグインメニュー", "term.pluginMenu.none": "プラグインが見つかりませんでした", "term.replay": "リプレイ", - "term.uniqueAlbums": "Unique Albums", - "term.uniqueArtists": "Unique Artists", - "term.uniqueSongs": "Unique Songs", - "term.topArtists": "Top Artists", - "term.listenedTo": "Listened to:", - "term.times": "times", - "term.topAlbums": "Top Albums", - "term.plays": "Plays", - "term.topGenres": "Top Genres", + "term.uniqueAlbums": "ユニークアルバム", + "term.uniqueArtists": "ユニークアーティスト", + "term.uniqueSongs": "ユニークソング", + "term.topArtists": "トップアーティスト", + "term.listenedTo": "Now Playing:", + "term.times": "時間", + "term.topAlbums": "トップアルバム", + "term.plays": "再生", + "term.topGenres": "トップジャンル", "term.confirmLogout": "本当にログアウトしますか？", "term.creditDesignedBy": "${authorUsername}によってデザインされました", - "term.discNumber": "Disc ${discNumber}", + "term.discNumber": "ディスク ${discNumber}", "home.title": "ホーム", "home.recentlyPlayed": "最近の再生", "home.recentlyAdded": "最近追加した項目", @@ -193,14 +193,14 @@ "podcast.followOnCider": "Ciderでフォロー", "podcast.followedOnCider": "フォロー中", "podcast.subscribeOnItunes": "iTunesで購読", - "podcast.subscribedOnItunes": "Subscribed On iTunes", + "podcast.subscribedOnItunes": "iTunesで購読中", "podcast.itunesStore": "iTunes Store", "podcast.episodes": "番組", "podcast.playEpisode": "再生", "podcast.website": "Podcastウェブ", - "action.edit": "Edit", - "action.done": "Done", - "action.editTracklist": "Edit Tracklist", + "action.edit": "編集", + "action.done": "完了", + "action.editTracklist": "トラックリストを編集", "action.addToLibrary": "ライブラリに追加", "action.addToLibrary.success": "ライブラリに追加されました", "action.addToLibrary.error": "ライブラリへの追加に失敗しました", @@ -212,9 +212,9 @@ "action.removeFromQueue": "「次はこちら」から項目を削除", "action.removeFromQueue.success": "「次はこちら」から項目を削除されました", "action.removeFromQueue.error": "操作を完了できませんでした", - "action.createPlaylist": "Create a New Playlist", - "action.addToPlaylist": "Add to Playlist", - "action.removeFromPlaylist": "Remove from Playlist", + "action.createPlaylist": "新しいプレイリストを作成する", + "action.addToPlaylist": "プレイリストに追加する", + "action.removeFromPlaylist": "プレイリストから削除する", "action.addToFavorites": "ラブに追加", "action.follow": "フォロー", "action.follow.success": "フォロー中", @@ -243,7 +243,7 @@ "action.showAlbum": "アルバムを表示", "action.tray.minimize": "最小化", "action.tray.quit": "終了", - "action.tray.show": "Show Cider", + "action.tray.show": "表示", "action.update": "アップデート", "action.install": "インストール", "action.copy": "コピー", @@ -252,52 +252,52 @@ "action.open": "開く", "action.relaunch.confirm": "Ciderを再開しますか？", "action.cast.chromecast": "Chromecast", - "action.cast.todevices": "Cast to Devices", - "action.cast.stop": "Stop casting to all devices", + "action.cast.todevices": "デバイスにキャストする", + "action.cast.stop": "すべてのデバイスでキャストを中止する", "action.cast.airplay": "AirPlay", - "action.cast.airplay.underdevelopment": "AirPlay is still under development", - "action.cast.scan": "Scan", - "action.cast.scanning": "Scanning...", - "action.createNew": "Create New...", - "action.openArtworkInBrowser": "Open artwork in browser", + "action.cast.airplay.underdevelopment": "AirPlayはまだ開発中です", + "action.cast.scan": "スキャン", + "action.cast.scanning": "スキャン中...", + "action.createNew": "新規作成...", + "action.openArtworkInBrowser": "アートワークをブラウザで表示する", "settings.header.general": "一般", "settings.header.general.description": "Ciderの一般設定", "settings.option.general.language": "言語", - "settings.option.general.resumebehavior": "Resume behavior", - "settings.option.general.resumebehavior.description": "Resume behavior affects how Cider will resume your session when you return to the app.", - "settings.option.general.resumebehavior.locally": "Locally", + "settings.option.general.resumebehavior": "再開の動作", + "settings.option.general.resumebehavior.description": "この設定はciderを再起動した際に影響します", + "settings.option.general.resumebehavior.locally": "ローカル", "settings.option.general.resumebehavior.locally.description": "このコンピューターでの最終セッションを復元", - "settings.option.general.resumebehavior.history": "History", + "settings.option.general.resumebehavior.history": "履歴", "settings.option.general.resumebehavior.history.description": "Apple Musicの履歴から曲を復元", - "settings.option.general.resumetabs" : "Open Tab on Launch", - "settings.option.general.resumetabs.description" : "You can choose what tab you want to open when you launch Cider.", - "settings.option.general.resumetabs.dynamic" : "Dynamic", - "settings.option.general.resumetabs.dynamic.description" : "Cider will open the tab that you last used.", + "settings.option.general.resumetabs" : "起動時にタブを開く", + "settings.option.general.resumetabs.description" : "Ciderを起動したときに開くタブを選択することができます", + "settings.option.general.resumetabs.dynamic" : "ダイナミック", + "settings.option.general.resumetabs.dynamic.description" : "最後のセッションで開いていたタブを開きます", "settings.option.general.language.main": "メイン", "settings.option.general.language.fun": "荒らし", "settings.option.general.language.unsorted": "未分類", "settings.option.general.updateCider": "アップデート", - "settings.option.general.updateCider.branch": "Cider Update Branch", - "settings.option.general.updateCider.branch.description": "Select the branch to update Cider to", - "settings.option.general.updateCider.branch.main": "Stable", - "settings.option.general.updateCider.branch.develop": "Development", - "settings.option.general.customizeSidebar": "Customize Sidebar Items", - "settings.option.general.customizeSidebar.customize": "Customize", - "settings.option.general.keybindings": "Keybindings", - "settings.notyf.general.keybindings.update.success": "Keybind updated successfully", - "settings.prompt.general.keybindings.update.success": "Keybind updated successfully. Press OK to relaunch Cider", - "settings.option.general.keybindings.open": "Open", - "settings.description.search": "Search", - "settings.description.albums": "Library Albums", - "settings.description.artists": "Library Artists", - "settings.description.browse": "Browse", - "settings.description.private": "Toggle Private Session", - "settings.description.remote": "Web Remote", - "settings.description.audio": "Audio Settings", - "settings.description.plugins": "Plugins Menu", - "settings.description.cast": "Cast to Devices", - "settings.description.settings": "Settings", - "settings.description.developer": "Developer Tools", + "settings.option.general.updateCider.branch": "ciderのバージョン詳細", + "settings.option.general.updateCider.branch.description": "ciderのバージョンを設定できます", + "settings.option.general.updateCider.branch.main": "安定版", + "settings.option.general.updateCider.branch.develop": "ベータ版", + "settings.option.general.customizeSidebar": "サイドバーをカスタマイズ", + "settings.option.general.customizeSidebar.customize": "カスタマイズ", + "settings.option.general.keybindings": "キーバインド", + "settings.notyf.general.keybindings.update.success": "キーバインドのアップデートに成功しました", + "settings.prompt.general.keybindings.update.success": "キーバインドのアップデートに成功しました。OKを押すとciderが再起動します", + "settings.option.general.keybindings.open": "開く", + "settings.description.search": "検索", + "settings.description.albums": "ライブラリのアルバム", + "settings.description.artists": "ライブラリのアーティスト", + "settings.description.browse": "検索", + "settings.description.private": "プライベートセッションに切り替える", + "settings.description.remote": "WEBで遠隔操作", + "settings.description.audio": "オーディオの設定", + "settings.description.plugins": "プラグインのメニュー", + "settings.description.cast": "デバイスでキャストする", + "settings.description.settings": "設定", + "settings.description.developer": "デベロッパーツール", "settings.notyf.updateCider.update-not-available": "現在最新版です", "settings.notyf.updateCider.update-downloaded": "アップデートは再起動後に適用されます", "settings.notyf.updateCider.update-error": "アップデートに失敗しました", @@ -306,9 +306,9 @@ "settings.header.audio.description": "Ciderのオーディオ設定", "settings.option.audio.volumeStep": "音量調整のステップ", "settings.option.audio.maxVolume": "最大音量", - "settings.option.audio.changePlaybackRate": "Change Playback Rate", - "settings.option.audio.playbackRate": "Playback Rate", - "settings.option.audio.playbackRate.change": "Change", + "settings.option.audio.changePlaybackRate": "再生速度の変更", + "settings.option.audio.playbackRate": "再生速度の変更", + "settings.option.audio.playbackRate.change": "変更", "settings.option.audio.quality": "音質", "settings.header.audio.quality.hireslossless": "ハイレゾロスレス", "settings.header.audio.quality.hireslossless.description": "(最大解像度 24 ビット／192 kHz)", @@ -320,23 +320,23 @@ "settings.option.audio.seamlessTransition": "曲間なしで再生", "settings.option.audio.enableAdvancedFunctionality": "先進的な機能", "settings.option.audio.enableAdvancedFunctionality.description": "AudioContextを有効にすると、オーディオノーマライズ、空間オーディオ、イコライザーなどの機能を使用できますが、音が途切れるかもしれません。", - "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Cider thinks your PC can't handle these features. Are you sure you want to continue?", + "settings.warn.audio.enableAdvancedFunctionality.lowcores": "あなたのPCがこの処理に耐えられないかもしれません。", "settings.option.audio.audioLab": "Cider Audio Lab", "settings.option.audio.audioLab.description": "An assortment of in-house developed audio effects for Cider.", - "settings.warn.audioLab.withoutAF": "AudioContext (Advanced Functionality) is required to enable Cider Audio Laboratory.", + "settings.warn.audioLab.withoutAF": "Cider Audio Labを有効にするにはAudioContextを有効にする必要があります", "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analog Warmth", "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Korg Nutube 6P1をモデルにしたオーディオをシミュレートします", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Analog Warmth intensity", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Changes the intensity of the Analog Warmth Module processing.", - "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "Smooth", - "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "Warm", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "なめらか", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "暖かい", "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer": "Cider Atmosphere Realizer™️", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "Realizes a different musical atmosphere modelled after the state of the art audio setups.", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Cider Atmosphere Realizer™️ Mode", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "Changes the mode of operation of the Atmosphere Realizer module.", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural1": "Natural (Standard)", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural2": "Natural (High)", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural3": "Natural (Plus)", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "最先端のオーディオセットアップを模した、異なる音楽の雰囲気を実現します。", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Cider Atmosphere Realizer™️ モード", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "Atmosphere Realizer™️のモードを変更します", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural1": "自然 (普通)", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural2": "自然 (高い)", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural3": "自然 (プラス)", "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️", "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "音楽をより豊かに、生き生きとさせます", "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAPはSpatializationと互換性がありません", @@ -345,13 +345,15 @@ "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "標準", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "高", "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "オーディオノーマライズ", - "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。", - "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Managed by Audio Lab", +"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。", + "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Audio Labの設定", + "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "オーディオ空間化", + "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "音声を空間化しすることで、より立体的にできます(Dolby Atmosではありません)", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider Tuned Spatialization", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "開発チームがチューニングした設定を使用することができます。(オーディオ空間化を有効にする必要があります)", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider Spatialization Profile", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "Changes the Tuning Profile of the Spatialization.", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "Standard", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "プロファイルをSpatializationに変更します", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "スタンダード", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiophile", "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "オーディオ空間化はCAPと互換性がありません", "settings.header.visual": "ビジュアル", @@ -379,7 +381,7 @@ "settings.option.visual.uiscale": "UI Scale", "settings.header.visual.theme": "テーマ", "settings.option.visual.theme.github.download": "GitHub URLからインストール", - "settings.option.visual.theme.github.openfolder": "Open Themes Folder", + "settings.option.visual.theme.github.openfolder": "テーマフォルダを開く", "settings.option.visual.theme.github.explore": "GitHubで探す", "settings.header.visual.theme.github.page": "GitHub", "settings.option.visual.theme.github.install.confirm": "本当に {{ repo }} をインストールしますか？", @@ -402,38 +404,38 @@ "settings.header.window.description": "ウィンドウの設定", "settings.option.window.openOnStartup": "Ciderをスタートアップに設定する", "settings.option.window.openOnStartup.hidden": "パソコン起動時にCiderをトレイに最小化", - "settings.option.window.useNativeTitleBar": "Use Native Title Bar", - "settings.option.window.windowControlStyle": "Window Control Style", + "settings.option.window.useNativeTitleBar": "タイトルバーを使用する", + "settings.option.window.windowControlStyle": "ウィンドウの設定", "settings.option.window.windowControlStyle.right": "右側", "settings.option.window.windowControlStyle.left": "左側", "settings.header.lyrics": "歌詞", - "settings.header.lyrics.description": "Adjust the lyrics settings for Cider.", + "settings.header.lyrics.description": "歌詞の設定", "settings.option.lyrics.enableMusixmatch": "Musixmatchが提供する歌詞を表示する", "settings.option.lyrics.enableMusixmatchKaraoke": "カラオケモードを有効にする (Musixmatchのみで利用できます)", "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatchで表示する歌詞の言語", "settings.option.lyrics.enableYoutubeLyrics": "YouTubeの歌詞をミュージックビデオで使用する", - "settings.option.lyrics.enableQQLyrics": "Enable QQ Lyrics", + "settings.option.lyrics.enableQQLyrics": "QQの歌詞を表示する", "settings.header.connectivity": "接続", "settings.header.connectivity.description": "Ciderの接続設定", "settings.option.connectivity.playbackNotifications": "再生している曲を通知する", "settings.option.connectivity.discordRPC": "Discord Rich Presence", - "settings.option.connectivity.discordRPC.clientName": "Client Name", - "settings.option.connectivity.discordRPC.clearOnPause": "Clear Discord Rich Presence on Pause", - "settings.option.connectivity.discordRPC.hideButtons": "Hide buttons on Discord Rich Presence", - "settings.option.connectivity.discordRPC.detailsFormat": "Details Format", - "settings.option.connectivity.discordRPC.stateFormat": "State Format", + "settings.option.connectivity.discordRPC.clientName": "クライアントの名前", + "settings.option.connectivity.discordRPC.clearOnPause": "一時停止した時にDiscord Rich Presenceを非表示にする", + "settings.option.connectivity.discordRPC.hideButtons": "Discord Rich Presenceのボタンを非表示にする", + "settings.option.connectivity.discordRPC.detailsFormat": "ディティールのフォーマット", + "settings.option.connectivity.discordRPC.stateFormat": "状態のフォーマット", "settings.option.connectivity.lastfmScrobble": "Last.fm に接続する", "settings.option.connectivity.lastfmScrobble.delay": "遅延 (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "Last.fm Now Playingを有効化する", "settings.option.connectivity.lastfmScrobble.removeFeatured": "曲名からフューチャリングいているアーティストの名前を削除する (Last.fm)", "settings.option.connectivity.lastfmScrobble.filterLoop": "ループトラックのフィルター(Last.fm)", "settings.header.debug": "デバッグ", - "settings.option.debug.copy_log": "Copy logs to clipboard", - "settings.option.debug.openAppData": "Open Cider Folder", + "settings.option.debug.copy_log": "ログをクリップボードにコピーする", + "settings.option.debug.openAppData": "Ciderのフォルダを開く", "settings.header.experimental": "試験的な機能", "settings.header.experimental.description": "試験的な設定", - "settings.option.experimental.reinstallwidevine": "Reinstall WidevineCDM", - "settings.option.experimental.reinstallwidevine.confirm": "Are you sure you want to reinstall Widevine?", + "settings.option.experimental.reinstallwidevine": "WidevineCDMを再インストールする", + "settings.option.experimental.reinstallwidevine.confirm": "本当にWidevineを再インストールしますか？", "settings.option.experimental.unknownPlugin": "未知のダウンロード元", "settings.option.experimental.unknownPlugin.description": "外部からプラグインをインストールできるようにする", "settings.option.experimental.compactUI": "コンパクトUI", @@ -443,10 +445,10 @@ "settings.option.advanced.playlistTrackMapping.description": "プレイリストをスキャンすることで含まれる曲をより識別しやすくなります", "settings.option.visual.transparent": "背景の透過", "settings.option.visual.transparent.description": "(テーマがこの機能をサポートしている必要があります)", - "settings.header.advanced": "Advanced", - "settings.header.connect": "Sync", - "settings.option.connect.link_account": "Enable Sync with Cider Connect", - "settings.option.connect.link_account.description": "Linking your Discord account with Cider Connect allows you to store userdata including Settings, EQ's, and eventually more once finished. (Work In Progress)", + "settings.header.advanced": "アドバンス", + "settings.header.connect": "リンク", + "settings.option.connect.link_account": "Ciderと他のアプリをリンクさせることができます", + "settings.option.connect.link_account.description": "DiscordとCiderを接続することで、Ciderの設定を保存することができます(開発中)", "spatial.notTurnedOn": "オーディオ空間化が無効になっています。この機能を使用するには有効にしてください！", "spatial.spatialProperties": "空間化のプロパティ", "spatial.width": "幅", From 623602e676f3a0219302f23a641d9c67fcbd10b8 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Tue, 10 May 2022 09:51:19 -0700 Subject: [PATCH 057/109] ja_JP credit change --- src/i18n/ja_JP.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json index 8dba8e4e..dc6cd4c5 100644 --- a/src/i18n/ja_JP.json +++ b/src/i18n/ja_JP.json @@ -2,7 +2,7 @@ "i18n.languageName": "日本語", "i18n.languageNameEnglish": "Japanese", "i18n.category": "main", - "i18n.authors": "@maikirakiwi @aduki_0628", + "i18n.authors": "@maikirakiwi @tanaka_kakuel", "app.name": "Cider", "date.format": "${y}年${m}月${d}日", "dialog.cancel": "キャンセル", From 868984511a1e0ce6247f4bf056bc8eb4b07568bd Mon Sep 17 00:00:00 2001 From: GamingLiamStudios <58615717+GamingLiamStudios@users.noreply.github.com> Date: Wed, 11 May 2022 03:59:06 +1000 Subject: [PATCH 058/109] Update en_OWO.json --- src/i18n/en_OWO.json | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/src/i18n/en_OWO.json b/src/i18n/en_OWO.json index bdf3365f..37e9b687 100644 --- a/src/i18n/en_OWO.json +++ b/src/i18n/en_OWO.json @@ -21,11 +21,13 @@ "term.accountSettings": "Account Settings", "term.logout": "Wogout", "term.login": "Wog In", + "term.quickNav": "Quick Nyav", "term.cast": "Cast", "term.about": "About", "term.privateSession": "Pwivate Session", "term.disablePrivateSession": "Disabwe Pwivate Session", "term.queue": "Queue", + "term.autoplay": "Autopway", "term.lyrics": "Wywics", "term.miniplayer": "MinyiPwayew", "term.history": "Histowy", @@ -46,12 +48,19 @@ "term.createNewPlaylist": "Cweate Nyew Pwaywist", "term.createNewPlaylistFolder": "Cweate Nyew Pwaywist Fowdew", "term.deletePlaylist": "Awe you suwe you want to dewete this pwaywist?", + "term.navigateBack": "Nyavigate back", + "term.navigateForward": "Nyavigate fowwawd", "term.play": "Pway", "term.pause": "Pause", "term.previous": "Pwevious", "term.next": "Nyext", "term.shuffle": "Shuffwe", + "term.enableShuffle": "Enyabwe shuffwe", + "term.disableShuffle": "Disabwe shuffwe", "term.repeat": "Wepeat", + "term.enableRepeatOne": "Enyabwe wepeat onye", + "term.disableRepeatOne": "Disabwe wepeat onye", + "term.disableRepeat": "Disabwe wepeat", "term.volume": "Vowume", "term.mute": "Mute", "term.unmute": "Unmute", @@ -254,6 +263,7 @@ "action.newpreset": "Nyew Pweset...", "action.deletepreset": "Dewete Pweset", "action.open": "Open", + "action.close": "Cwose", "action.relaunch.confirm": "Do you want to wewaunch Cidew?", "action.cast.chromecast": "Chwomecast", "action.cast.todevices": "Cast to Devices", @@ -264,6 +274,43 @@ "action.cast.scanning": "Scannying...", "action.createNew": "Cweate Nyew...", "action.openArtworkInBrowser": "Open awtwowk in bwowsew", + "action.scrollToTop": "Scwoww to top", + "menubar.options.about": "About", + "menubar.options.settings": "Settings", + "menubar.options.quit": "Quit Cidew", + "menubar.options.view": "View ", + "menubar.options.reload": "Wewoad", + "menubar.options.forcereload": "Fowce Wewoad", + "menubar.options.toggledevtools": "Toggwe Devewopew Toows", + "menubar.options.window": "Window", + "menubar.options.minimize": "Minyimize", + "menubar.options.toggleprivate": "Toggwe Pwivate Session", + "menubar.options.webremote": "Web Wemote", + "menubar.options.audio": "Audio Settings", + "menubar.options.plugins": "Pwu-gins Menyu", + "menubar.options.controls": "Contwows", + "menubar.options.next": "Nyext", + "menubar.options.playpause": "Pway/Pause", + "menubar.options.previous": "Pwevious", + "menubar.options.volumeup": "Vowume Up", + "menubar.options.volumedown": "Vowume Down", + "menubar.options.browse": "Bwowse", + "menubar.options.artists": "Awtists", + "menubar.options.search": "Seawch", + "menubar.options.albums": "Awbums", + "menubar.options.cast": "Cast To Devices", + "menubar.options.account": "Account", + "menubar.options.accountsettings": "Account Settings", + "menubar.options.signout": "Sign Out", + "menubar.options.support": "Suppowt", + "menubar.options.discord": "Discowd", + "menubar.options.github": "GitHub Wiki", + "menubar.options.report": "Wepowt a...", + "menubar.options.bug": "Bug", + "menubar.options.feature": "Featuwe Wequest", + "menubar.options.trans": "Twanswation Wepowt/Wequest", + "menubar.options.license": "View Wicense", + "menubar.options.conf": "Open Configuwation Fiwe in Editow", "settings.header.general": "Genyewaw", "settings.header.general.description": "Adjust the genyewaw settings fow Cidew.", "settings.option.general.language": "Wanguage", @@ -330,6 +377,7 @@ "settings.option.audio.audioLab.description": "An assowtment of in-house devewoped audio effects fow Cidew.", "settings.option.audio.audioLab.subheader": "Designyed by Cidew Acoustic Technyowogies in Cawifownyia", "settings.warn.audioLab.withoutAF": "AudioContext (Advanced Functionyawity) is wequiwed to enyabwe Cidew Audio Wabowatowy.", + "settings.warn.enableAdvancedFunctionality": "AudioContext (Advanced Functionyawity) is wequiwed to enyabwe this featuwe.", "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Anyawog Wawmth", "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Simuwates the anyawog wawmth modewwed aftew the Kowg Nyutube 6P1", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Anyawog Wawmth intensity", @@ -390,6 +438,13 @@ "settings.header.visual.theme.github.page": "Themes fwom GitHub", "settings.option.visual.theme.github.install.confirm": "Awe you suwe you want to instaww {{ repo }}?", "settings.prompt.visual.theme.github.URL": "Entew the UWW of the theme you want to instaww", + "settings.prompt.visual.theme.uninstallTheme": "Awe you suwe you want to unyinstaww {{ theme }}?", + "settings.option.visual.theme.checkForUpdates": "Check fow updates", + "settings.option.visual.theme.manageStyles": "Manyage Stywes", + "settings.option.visual.theme.uninstall": "Unyinstaww", + "settings.option.visual.theme.viewInfo": "View Info", + "settings.option.visual.theme.github.available": "Avaiwabwe", + "settings.option.visual.theme.github.applied": "Appwied", "settings.notyf.visual.theme.install.success": "Theme instawwed successfuwwy", "settings.notyf.visual.theme.install.error": "Theme instawwation faiwed", "settings.header.visual.plugin": "Pwugin", @@ -426,6 +481,7 @@ "settings.option.connectivity.discordRPC.clientName": "Cwient Nyame", "settings.option.connectivity.discordRPC.clearOnPause": "Cweaw Discowd Wich Pwesence on Pause", "settings.option.connectivity.discordRPC.hideButtons": "Hide buttons on Discowd Wich Pwesence", + "settings.option.connectivity.discordRPC.hideTimestamp": "Hide timestamp on Discowd Wich Pwesence", "settings.option.connectivity.discordRPC.detailsFormat": "Detaiws Fowmat", "settings.option.connectivity.discordRPC.stateFormat": "State Fowmat", "settings.option.connectivity.lastfmScrobble": "Wast.fm Scwobbwing", From d1dca1c613876f6bbf8c1a03bb7fdf9284061936 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Tue, 10 May 2022 21:11:03 +0200 Subject: [PATCH 059/109] Add Relaunch Prompt to nativeTitleBar and hw_acc --- src/renderer/views/pages/settings.ejs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 59088eab..4e030e9d 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -597,7 +597,7 @@
From 9590824bd7bf0fb0536ed0765b8ba1a838487bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?= <46503943+jay900604@users.noreply.github.com> Date: Wed, 11 May 2022 15:03:13 +0800 Subject: [PATCH 060/109] Update zh_TW.json Update TW language. --- src/i18n/zh_TW.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json index 9fb1417a..4a5ab2c0 100644 --- a/src/i18n/zh_TW.json +++ b/src/i18n/zh_TW.json @@ -310,8 +310,14 @@ "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU", "settings.header.visual.theme": "主題", "settings.option.visual.theme.github.download": "從 GitHub 網址安裝", + "settings.option.visual.theme.github.openfolder": "打開主題存放位置", "settings.option.visual.theme.github.explore": "探索 GitHub 上的主題", "settings.prompt.visual.theme.github.URL": "輸入你要安裝的主題網址", + "settings.option.visual.theme.manageStyles": "管理主題", + "settings.option.visual.theme.uninstall": "移除", + "settings.option.visual.theme.viewInfo": "查看資訊", + "settings.option.visual.theme.github.available": "可用", + "settings.option.visual.theme.github.applied": "已套用", "settings.notyf.visual.theme.install.success": "主題成功安裝", "settings.notyf.visual.theme.install.error": "主題安裝失敗", "settings.header.visual.plugin": "模組", @@ -360,7 +366,7 @@ "settings.option.debug.openAppData": "打開 Cider 資料夾", "settings.header.experimental": "實驗性功能", "settings.header.experimental.description": "調整 Cider 的實驗性功能", - "settings.option.experimental.reinstallwidevine": "重新安裝 WidevineCDM", + "settings.option.experimental.reinstallwidevine": "重新安裝 WidevineCDM", "settings.option.experimental.reinstallwidevine.confirm": "你確定要重新安裝 WidevineCDM 嗎？", "settings.option.experimental.unknownPlugin": "未知來源", "settings.option.experimental.unknownPlugin.description": "允許從 Cider 來源以外的 repo 安裝套件", From bf56de05c41af6f94abd64403ea776f54ae6b938 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Wed, 11 May 2022 00:15:37 -0700 Subject: [PATCH 061/109] made some new playback icons --- Assets/Cider Icons/svg/cider-backward.svg | 12 ++++++++++++ Assets/Cider Icons/svg/cider-forward.svg | 12 ++++++++++++ Assets/Cider Icons/svg/cider-pause.svg | 10 ++++++++++ Assets/Cider Icons/svg/cider-play.svg | 7 +++++++ src/renderer/assets/cider-icons/backward.svg | 12 ++++++++++++ src/renderer/assets/cider-icons/forward.svg | 12 ++++++++++++ src/renderer/assets/cider-icons/pause.svg | 10 ++++++++++ src/renderer/assets/cider-icons/play.svg | 7 +++++++ src/renderer/less/elements.less | 16 ++++++++++++---- 9 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 Assets/Cider Icons/svg/cider-backward.svg create mode 100644 Assets/Cider Icons/svg/cider-forward.svg create mode 100644 Assets/Cider Icons/svg/cider-pause.svg create mode 100644 Assets/Cider Icons/svg/cider-play.svg create mode 100644 src/renderer/assets/cider-icons/backward.svg create mode 100644 src/renderer/assets/cider-icons/forward.svg create mode 100644 src/renderer/assets/cider-icons/pause.svg create mode 100644 src/renderer/assets/cider-icons/play.svg diff --git a/Assets/Cider Icons/svg/cider-backward.svg b/Assets/Cider Icons/svg/cider-backward.svg new file mode 100644 index 00000000..e5801e05 --- /dev/null +++ b/Assets/Cider Icons/svg/cider-backward.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/Assets/Cider Icons/svg/cider-forward.svg b/Assets/Cider Icons/svg/cider-forward.svg new file mode 100644 index 00000000..41154a4c --- /dev/null +++ b/Assets/Cider Icons/svg/cider-forward.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/Assets/Cider Icons/svg/cider-pause.svg b/Assets/Cider Icons/svg/cider-pause.svg new file mode 100644 index 00000000..bcc4cf53 --- /dev/null +++ b/Assets/Cider Icons/svg/cider-pause.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Assets/Cider Icons/svg/cider-play.svg b/Assets/Cider Icons/svg/cider-play.svg new file mode 100644 index 00000000..4246456a --- /dev/null +++ b/Assets/Cider Icons/svg/cider-play.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/renderer/assets/cider-icons/backward.svg b/src/renderer/assets/cider-icons/backward.svg new file mode 100644 index 00000000..87d5ecca --- /dev/null +++ b/src/renderer/assets/cider-icons/backward.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/renderer/assets/cider-icons/forward.svg b/src/renderer/assets/cider-icons/forward.svg new file mode 100644 index 00000000..37320d60 --- /dev/null +++ b/src/renderer/assets/cider-icons/forward.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/renderer/assets/cider-icons/pause.svg b/src/renderer/assets/cider-icons/pause.svg new file mode 100644 index 00000000..39b3608c --- /dev/null +++ b/src/renderer/assets/cider-icons/pause.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/renderer/assets/cider-icons/play.svg b/src/renderer/assets/cider-icons/play.svg new file mode 100644 index 00000000..885b90cc --- /dev/null +++ b/src/renderer/assets/cider-icons/play.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less index 11412567..10939150 100644 --- a/src/renderer/less/elements.less +++ b/src/renderer/less/elements.less @@ -1579,19 +1579,27 @@ input[type=checkbox][switch]:checked:active::before { } .playback-button.pause { - background-image: url('./assets/pause.svg'); + background-image: url('./assets/cider-icons/pause.svg'); + background-size: 38px; + background-position: center; } .playback-button.play { - background-image: url('./assets/play.svg'); + background-image: url('./assets/cider-icons/play.svg'); + background-size: 38px; + background-position: center; } .playback-button.next { - background-image: url('./assets/forward.svg'); + background-image: url('./assets/cider-icons/forward.svg'); + background-size: 60%; + background-position: center; } .playback-button.previous { - background-image: url('./assets/backward.svg'); + background-image: url('./assets/cider-icons/backward.svg'); + background-size: 60%; + background-position: center; } .playback-button { From 938eb6c222b2e8a8802558156b92f9c999c4c80e Mon Sep 17 00:00:00 2001 From: yazninja <71800112+yazninja@users.noreply.github.com> Date: Wed, 11 May 2022 16:05:08 +0800 Subject: [PATCH 062/109] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 430a36f2..f6cfbb0b 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ [![Get it from the Microsoft Store](https://img.shields.io/badge/Get_It_From_The_Microsoft_Store-100000?style=for-the-badge&logo=microsoft)](https://www.microsoft.com/store/apps/9P21XJ9D9G66) -[![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Nightly)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider.Nightly) +[![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Nightly)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider) - + + + +
\ No newline at end of file diff --git a/src/renderer/views/app/chrome-bottom.ejs b/src/renderer/views/app/chrome-bottom.ejs index e27a6e13..733b73e7 100644 --- a/src/renderer/views/app/chrome-bottom.ejs +++ b/src/renderer/views/app/chrome-bottom.ejs @@ -39,7 +39,8 @@
-
+
+
+ <%- include("../svg/pip.svg") %> +
+
+ <%- include("../svg/fullscreen.svg") %> +
From ccae1098fcc90775e77de86e12e614be73e219e5 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sun, 15 May 2022 13:47:35 +0700 Subject: [PATCH 101/109] fix airplay not working sometimes --- src/renderer/audio/audio.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index 6852fd92..95ce4357 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -296,6 +296,7 @@ const CiderAudio = { if (this._isBufferFull()) { this._flush(); } + try{ let dataLength = audioRawData[0].length; for (let idx=0; idx Date: Sun, 15 May 2022 13:57:54 +0700 Subject: [PATCH 102/109] ok --- src/renderer/audio/audio.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index 95ce4357..7a1dd251 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -270,7 +270,7 @@ const CiderAudio = { constructor() { super(); - this._bufferSize = 1024; + this._bufferSize = 2048; this._buffers = null; this._initBuffer(); } @@ -380,7 +380,7 @@ const CiderAudio = { } } CiderAudio.audioNodes.recorderNode.parameters.get('isRecording').setValueAtTime(1, CiderAudio.context.currentTime); - CiderAudio.source.connect(CiderAudio.audioNodes.recorderNode); + CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.recorderNode); }); clearInterval(searchInt); From c27d45273e16ae68a1b4b7849a1c13f5bca57e5a Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Sun, 15 May 2022 10:07:36 +0200 Subject: [PATCH 103/109] Translated some strings to Hungarian --- src/i18n/hu_HU.json | 93 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 3 deletions(-) diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json index 273853a8..7b00fbe8 100644 --- a/src/i18n/hu_HU.json +++ b/src/i18n/hu_HU.json @@ -21,11 +21,13 @@ "term.accountSettings": "Fiókbeállítások", "term.logout": "Kijelentkezés", "term.login": "Bejelentkezés", + "term.quickNav": "Főmenü", "term.cast": "Tükrözés", "term.about": "Névjegy", "term.privateSession": "Privát hallgatás", "term.disablePrivateSession": "Privát hallgatás kikapcsolása", "term.queue": "Várólista", + "term.autoplay": "Autoplay", "term.lyrics": "Dalszöveg", "term.miniplayer": "Minilejátszó", "term.history": "Előzmények", @@ -46,12 +48,19 @@ "term.createNewPlaylist": "Új lejátszási lista létrehozása", "term.createNewPlaylistFolder": "Új mappa létrehozása", "term.deletePlaylist": "Biztosan szeretné törölni a lejátszási listát?", + "term.navigateBack": "Visszalépés", + "term.navigateForward": "Előrelépés", "term.play": "Lejátszás", "term.pause": "Megállítás", "term.previous": "Előző", "term.next": "Következő", "term.shuffle": "Keverés", + "term.enableShuffle": "Keverés bekapcsolása", + "term.disableShuffle": "Keverés kikapcsolása", "term.repeat": "Ismétlés", + "term.enableRepeatOne": "Egyszeres ismétlés bekapcsolása", + "term.disableRepeatOne": "Egyszeres ismétlés kikapcsolása", + "term.disableRepeat": "Ismétlés kikapcsolása", "term.volume": "Hangerő", "term.mute": "Némítás", "term.unmute": "Némítás feloldása", @@ -73,6 +82,7 @@ "term.viewAs": "Megjelenítés", "term.viewAs.coverArt": "Borító", "term.viewAs.list": "Lista", + "term.dynamic": "Dinamikus", "term.size": "Méret", "term.size.normal": "Normál", "term.size.compact": "Kompakt", @@ -199,6 +209,9 @@ "podcast.episodes": "Epizódok", "podcast.playEpisode": "Epizód lejátszása", "podcast.website": "Podcast weboldala", + "action.edit": "Szerkesztés", + "action.done": "Kész", + "action.editTracklist": "Dalok szerkesztése", "action.addToLibrary": "Hozzáadás a Könyvtárhoz", "action.addToLibrary.success": "Hozzáadva a Könyvtárhoz", "action.addToLibrary.error": "Hiba a hozzáadáskor.", @@ -250,6 +263,7 @@ "action.newpreset": "Új előbeállítás...", "action.deletepreset": "Előbeállítás törlése", "action.open": "Megnyitás", + "action.close": "Bezárás", "action.relaunch.confirm": "Biztosan szeretnéd újraindítani a Cidert?", "action.cast.chromecast": "Chromecast", "action.cast.todevices": "Tükrözés", @@ -260,6 +274,46 @@ "action.cast.scanning": "Keresés folyamatban...", "action.createNew": "Új létrehozása...", "action.openArtworkInBrowser": "Borító megnyitása a böngészőben", + "action.scrollToTop": "Felülre", + "menubar.options.about": "Névjegy", + "menubar.options.settings": "Beállítások", + "menubar.options.quit": "Bezárás", + "menubar.options.view": "View ", + "menubar.options.reload": "Reload", + "menubar.options.forcereload": "Force Reload", + "menubar.options.toggledevtools": "Fejlesztői eszközök", + "menubar.options.window": "Ablak", + "menubar.options.minimize": "Kicsinyítés", + "menubar.options.toggleprivate": "Privát hallgatás ki/be", + "menubar.options.webremote": "Távirányító", + "menubar.options.audio": "Hangbeállítások", + "menubar.options.plugins": "Plug-in Menü", + "menubar.options.controls": "Controls", + "menubar.options.next": "Következő", + "menubar.options.playpause": "Lejátszás/Megállítás", + "menubar.options.previous": "Előző", + "menubar.options.volumeup": "Hangerő fel", + "menubar.options.volumedown": "Hangerő le", + "menubar.options.browse": "Böngészés", + "menubar.options.artists": "Előadók", + "menubar.options.search": "Keresés", + "menubar.options.albums": "Albumok", + "menubar.options.cast": "Tükrözés", + "menubar.options.account": "Fiók", + "menubar.options.accountsettings": "Fiókbeállítások", + "menubar.options.signout": "Kijelentkezés", + "menubar.options.support": "Támogatás", + "menubar.options.discord": "Discord", + "menubar.options.github": "GitHub Wiki", + "menubar.options.report": "Report a...", + "menubar.options.bug": "Bug", + "menubar.options.feature": "Feature Request", + "menubar.options.trans": "Translation Report/Request", + "menubar.options.license": "Licensz megtekintése", + "menubar.options.conf": "Open Configuration File in Editor", + "menubar.options.listennow": "Hallgatás most", + "menubar.options.recentlyAdded": "Nemrég hozzáadott", + "menubar.options.songs": "Dalok", "settings.header.general": "Általános", "settings.header.general.description": "A Cider általános beállításainak módosítása.", "settings.option.general.language": "Nyelv", @@ -284,7 +338,13 @@ "settings.option.general.customizeSidebar": "Oldalsáv elemeinek testreszabása", "settings.option.general.customizeSidebar.customize": "Testreszabás", "settings.option.general.keybindings": "Billentyűparancsok", + "settings.option.general.keybindings.pressCombination": "Nyomj le két billentyűt a parancs frissítéséhez.", + "settings.option.general.keybindings.pressEscape": "Nyomj Escape-et a visszalépéshez.", + "settings.notyf.general.keybindings.update.success": "Billentyűparancs sikeresen frissítve", + "settings.prompt.general.keybindings.update.success": "Billentyűparancs sikeresen frissítve. Kattints az OK-ra a Cider újraindításához!", "settings.option.general.keybindings.open": "Megnyitás", + "settings.option.general.themeUpdateNotification": "Automatikus témafrissítések keresése", + "settings.option.general.showLovedTracksInline": "Show loved tracks inline", "settings.description.search": "Keresés", "settings.description.albums": "Albumkönyvtár", "settings.description.artists": "Előadókönyvtár", @@ -296,6 +356,9 @@ "settings.description.cast": "Tükrözés", "settings.description.settings": "Beállítások", "settings.description.developer": "Fejlesztői eszközök", + "settings.description.listnow": "Hallgatás most", + "settings.description.recentAdd": "Nemrég hozzáadott", + "settings.description.songs": "Dalok", "settings.notyf.updateCider.update-not-available": "Nem található frissítés", "settings.notyf.updateCider.update-downloaded": "A frissítés le lett töltve, a telepítéshez indítsa újra az alkalmazást", "settings.notyf.updateCider.update-error": "Hiba történt a frissítés közben", @@ -322,13 +385,22 @@ "settings.warn.audio.enableAdvancedFunctionality.lowcores": "A Cider azt érzékelte, hogy ez a számítógép nem tudja kezelni ezeket a funkciókat. Biztos, hogy folytatni szeretné?", "settings.option.audio.audioLab": "Cider Hangstúdió", "settings.option.audio.audioLab.description": "A Ciderhez fejlesztett hangeffektek gyűjteménye.", + "settings.option.audio.audioLab.subheader": "Designed by Cider Acoustic Technologies in California", "settings.warn.audioLab.withoutAF": "A Haladó funkcionalitás (AudioContext) szükséges a Cider Hangstúdió engedélyezéséhez.", + "settings.warn.enableAdvancedFunctionality": "A Haladó funkcionalitás (AudioContext) szükséges ezen funkció engedélyezéséhez.", "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analóg Érzet", "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "A Korg Nutube 6P1 analóg érzetét szimulálja.", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Analóg Érzet erősség", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Az Analóg Érzet modul hangfeldolgozási erősségét változtatja.", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "Szokásos", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "Magas", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer": "Cider Atmoszféra Változató", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "Egy új zenei atmoszférát hoz létre, amely a legmodernebb hangfelszerelések mintájára készült.", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Cider Atmoszféra Változató™️ Mód", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "Az Atmoszféra Változató™️ modul módját változtatja meg.", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.NATURAL_STANDARD": "Natural (Standard)", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.NATURAL_HIGH": "Natural (High)", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.NATURAL_PLUS": "Natural (Plus)", "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️", "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Feljavítja a 256 kbps-es AAC hang minőségét egy valós idejű algoritmus segítségével, ami kihasználja az emberi hallás pszichoakusztikus modelljeit és az AAC hang kódolási jellemzőit.", "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "A CAP nem kompatibilis a Térbeli Hanggal. Kapcsold ki a Térbeli Hangot a folytatáshoz.", @@ -342,10 +414,17 @@ "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider Előbeállított Térbeli Hang", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "Előre beállított Térbeli hangzás, ami letiltja a Térbeli Hang testreszabási beállításait. A Térbeli Hangot be kell kapcsolni az engedélyezéshez.", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider Térbeli Hangprofil", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "Megváltoztatja a Térbeli Hang előbeállítás profilját. (Újraindítás szükséges)", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "Normál", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Professzionális", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "Megváltoztatja a Térbeli Hang előbeállítás profilját.", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "Standard", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.soundstage": "Soundstage", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.separation": "Separation", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.minimal": "Minimal", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiophile", "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "A Térbeli Hang nem kompatibilis a CAP-pal. Kapcsold ki a CAP-ot a folytatáshoz.", + "settings.option.audio.dbspl.display": "dB SPL kijelzés", + "settings.option.audio.dbspl.description": "(Haladó felhasználóknak) A hangerő dB SPL-ben történő kijelzése a dBFS helyett.", + "settings.option.audio.dbfs.calibration": "0 dBFS kalibráció", + "settings.option.audio.dbfs.description": "Enter the peak Z-weighted dB SPL when Cider is at 0 dBFS.", "settings.header.visual": "Vizuális", "settings.header.visual.description": "A Cider vizuális beállításainak módosítása.", "settings.option.visual.windowStyle": "Ablakelrendezés", @@ -376,6 +455,11 @@ "settings.header.visual.theme.github.page": "Témák a GitHub-ról", "settings.option.visual.theme.github.install.confirm": "Biztosan szeretnéd telepíteni a(z) {{ repo }} témát?", "settings.prompt.visual.theme.github.URL": "Add meg a telepítendő téma URL-jét", + "settings.prompt.visual.theme.uninstallTheme": "Biztos, hogy törölni szeretnéd a {{ theme }} témát?", + "settings.option.visual.theme.checkForUpdates": "Frissítések keresése", + "settings.option.visual.theme.manageStyles": "Témakezelő", + "settings.option.visual.theme.uninstall": "Törlés", + "settings.option.visual.theme.viewInfo": "Információk", "settings.option.visual.theme.github.available": "Elérhető", "settings.option.visual.theme.github.applied": "Alkalmazva", "settings.notyf.visual.theme.install.success": "Téma sikeresen telepítve", @@ -439,6 +523,9 @@ "settings.option.visual.transparent": "Átlátszó keret", "settings.option.visual.transparent.description": "Átlátszó ablakkeret (a Témák támogatása és újraindítás szükséges)", "settings.header.advanced": "Haladó", + "settings.header.connect": "Sync", + "settings.option.connect.link_account": "Enable Sync with Cider Connect", + "settings.option.connect.link_account.description": "Linking your Discord account with Cider Connect allows you to store userdata including Settings, EQ's, and eventually more once finished. (Work In Progress)", "spatial.notTurnedOn": "A Térbeli Hang ki van kapcsolva, használatához kapcsolja be.", "spatial.spatialProperties": "Térbeli Hang", "spatial.width": "Szélesség", From 2b180daa631832767cd4a5c59c4fff0f852ec163 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Sun, 15 May 2022 10:10:23 +0200 Subject: [PATCH 104/109] Remove 256 kbps from Hungarian --- src/i18n/hu_HU.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json index 7b00fbe8..303fa2bf 100644 --- a/src/i18n/hu_HU.json +++ b/src/i18n/hu_HU.json @@ -402,7 +402,7 @@ "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.NATURAL_HIGH": "Natural (High)", "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.NATURAL_PLUS": "Natural (Plus)", "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️", - "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Feljavítja a 256 kbps-es AAC hang minőségét egy valós idejű algoritmus segítségével, ami kihasználja az emberi hallás pszichoakusztikus modelljeit és az AAC hang kódolási jellemzőit.", + "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Feljavítja az AAC hang minőségét egy valós idejű algoritmus segítségével, ami kihasználja az emberi hallás pszichoakusztikus modelljeit és az AAC hang kódolási jellemzőit.", "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "A CAP nem kompatibilis a Térbeli Hanggal. Kapcsold ki a Térbeli Hangot a folytatáshoz.", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "CAP Erősség", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "Megváltoztatja a hangra végzett feldolgozás erősségét. (Az Agresszív mód nemkívánatos eredményeket hozhat!)", From 07ea88323f0bedc68e593f5947a367205300938c Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sun, 15 May 2022 16:52:19 +0700 Subject: [PATCH 105/109] some fixes --- src/main/base/browserwindow.ts | 5 +++++ src/renderer/main/vueapp.js | 18 ++++++++++++++++-- src/renderer/style.less | 2 +- src/renderer/views/app/panels.ejs | 10 ++++++---- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 5ff86506..8407702d 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -1076,6 +1076,11 @@ export class BrowserWindow { BrowserWindow.win.setFullScreen(flag) }) + //Fullscreen + ipcMain.on('getFullScreen', (event, flag) => { + event.returnValue = BrowserWindow.win.isFullScreen() + }) + //Fullscreen ipcMain.on('detachDT', (_event, _) => { BrowserWindow.win.webContents.openDevTools({mode: 'detach'}); diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 9145c1bd..e1fa1b10 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -29,6 +29,7 @@ const app = new Vue({ limit: 10 }, fullscreenLyrics: false, + fullscreenState: ipcRenderer.sendSync("getFullScreen"), playerLCD: { playbackDuration: 0, desiredDuration: 0, @@ -4130,10 +4131,11 @@ const app = new Vue({ }); }, fullscreen(flag) { + this.fullscreenState = 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() + // document.querySelector('video#apple-music-video-player').requestFullscreen() } else { app.appMode = 'fullscreen'; } @@ -4144,9 +4146,21 @@ const app = new Vue({ }); } else { ipcRenderer.send('setFullScreen', false); - app.appMode = 'player'; + if (app.mk.nowPlayingItem.type && app.mk.nowPlayingItem.type.toLowerCase().includes("video")) { + + } else { + app.appMode = 'player'; + } } }, + pip(){ + document.querySelector('video#apple-music-video-player').requestPictureInPicture() + // .then(pictureInPictureWindow => { + // pictureInPictureWindow.addEventListener("resize", () => { + // console.log("[PIP] Resized") + // }, false); + // }) + }, miniPlayer(flag) { if (flag) { this.tmpWidth = window.innerWidth; diff --git a/src/renderer/style.less b/src/renderer/style.less index 6009522d..6248ded5 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -2971,7 +2971,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { float: left; display: none; width: 100%; - height: calc(100% - var(--chromeHeight)); + height: 100%; bottom: 0; z-index: 100000; } diff --git a/src/renderer/views/app/panels.ejs b/src/renderer/views/app/panels.ejs index f748bfb9..15cbf4f7 100644 --- a/src/renderer/views/app/panels.ejs +++ b/src/renderer/views/app/panels.ejs @@ -112,13 +112,15 @@
+ @click="pip()" + title="Picture-in-Picture" + v-b-tooltip.hover> <%- include("../svg/pip.svg") %>
+ @click="fullscreen(!fullscreenState)" + title="Fullscreen" + v-b-tooltip.hover> <%- include("../svg/fullscreen.svg") %>
From 31ad899f989b20af31b3ffd0556e5498a07abe33 Mon Sep 17 00:00:00 2001 From: child_duckling <19170969+quacksire@users.noreply.github.com> Date: Sun, 15 May 2022 20:42:14 -0700 Subject: [PATCH 106/109] fix keyboard combos for mac. who tf uses Option+S for settings? --- src/main/base/store.ts | 24 ++++++++++++------------ src/renderer/views/pages/settings.ejs | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index c088ed2e..83f652bf 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -52,39 +52,39 @@ export class Store { }, "keybindings": { "search": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "F" ], "listnow": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "L" ], "browse": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "B" ], "recentAdd": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "G" ], "songs" : [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "J" ], "albums": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "S" ], "artists": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "D" ], "togglePrivateSession": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "P" ], "webRemote": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "W" ], "audioSettings": [ @@ -100,12 +100,12 @@ export class Store { "C" ], "settings": [ - process.platform == "darwin" ? "Option" : "Shift", + "CommandOrControl", // Who the hell uses a different key for this? Fucking Option? "S" ], "openDeveloperTools": [ - process.platform == "darwin" ? "Command" : "Control", - process.platform == "darwin" ? "Option" : "Shift", + "CommandOrControl", + "Shift", "I" ] }, diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index e172325d..5637102e 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -1275,7 +1275,7 @@
From 5d0db127af0b9f097a4b6b18dff487003368d762 Mon Sep 17 00:00:00 2001 From: child_duckling <19170969+quacksire@users.noreply.github.com> Date: Sun, 15 May 2022 20:45:58 -0700 Subject: [PATCH 107/109] keyboard combo conflict --- src/main/base/store.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 83f652bf..0edf8b67 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -73,7 +73,7 @@ export class Store { ], "albums": [ "CommandOrControl", - "S" + "A" ], "artists": [ "CommandOrControl", From 0316d70b9483f282e71e7892ee8a5107ea398ebc Mon Sep 17 00:00:00 2001 From: yazninja Date: Mon, 16 May 2022 13:57:26 +0800 Subject: [PATCH 108/109] resize genres in search page --- src/renderer/less/pages.less | 19 +++++++++++++++++++ src/renderer/views/pages/search.ejs | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index b98b560a..b0ee7c36 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -114,6 +114,25 @@ margin: 2em; } } +// Search Page +&.search-page { + .cd-mediaitem-square.mediaitem-brick { + width: 530px !important; + .artwork-container .artwork{ + height:168px !important; + width:507px !important; + z-index: 1; + } + .title{ + font-weight: bold; + justify-content: left; + font-size: 18px; + margin-top: -40px; + z-index: 5; + pointer-events: none; + } + } +} // Podcast Page .content-inner.podcasts-page { diff --git a/src/renderer/views/pages/search.ejs b/src/renderer/views/pages/search.ejs index ed71d84e..292f1a62 100644 --- a/src/renderer/views/pages/search.ejs +++ b/src/renderer/views/pages/search.ejs @@ -1,5 +1,5 @@