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

Lossless Brand removal

Browse source
This commit is contained in:
Maikiwi 2022-02-05 10:16:01 -08:00
parent 2f7543177d
commit 789792ebb4
9 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/i18n/README.md
View file

@ -54,5 +54,5 @@ Update 05/02/2022 09:00 UTC
* `settings.header.audio.quality.hireslossless.description`: Added for `en_US`. * `settings.header.audio.quality.hireslossless.description`: Added for `en_US`.
* `settings.header.audio.quality.lossless`: Added for `en_US`. * `settings.header.audio.quality.lossless`: Added for `en_US`.
* `settings.header.audio.quality.lossless.description`: Added for `en_US`. * `settings.header.audio.quality.lossless.description`: Added for `en_US`.
* `settings.option.audio.enableAdvancedFunctionality.decryptLLPW`: Added for `en_US`. * `settings.option.audio.enableAdvancedFunctionality.ciderPPE`: Added for `en_US`.
* `settings.option.audio.enableAdvancedFunctionality.decryptLLPW.description`: Added for `en_US`. * `settings.option.audio.enableAdvancedFunctionality.ciderPPE.description`: Added for `en_US`.

5
src/i18n/en_US.jsonc
View file

@ -236,14 +236,15 @@
"settings.header.audio.quality.hireslossless.description": "(up to 24-bit/192 kHz)", "settings.header.audio.quality.hireslossless.description": "(up to 24-bit/192 kHz)",
"settings.header.audio.quality.lossless": "Lossless", "settings.header.audio.quality.lossless": "Lossless",
"settings.header.audio.quality.lossless.description": "(up to 24-bit/48 kHz)", "settings.header.audio.quality.lossless.description": "(up to 24-bit/48 kHz)",
"settings.header.audio.quality.enhanced": "Enhanced",
"settings.header.audio.quality.high": "High", "settings.header.audio.quality.high": "High",
"settings.header.audio.quality.low": "Low", "settings.header.audio.quality.low": "Low",
"settings.header.audio.quality.auto": "Auto", "settings.header.audio.quality.auto": "Auto",
"settings.option.audio.seamlessTransition": "Seamless Audio Transition", // Toggle "settings.option.audio.seamlessTransition": "Seamless Audio Transition", // Toggle
"settings.option.audio.enableAdvancedFunctionality": "Enable Advanced Functionality", // Toggle "settings.option.audio.enableAdvancedFunctionality": "Enable Advanced Functionality", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "Enabling AudioContext functionality will allow for extended audio features like Audio Normalization , Equalizers and Visualizers, however on some systems this may cause stuttering in audio tracks.", "settings.option.audio.enableAdvancedFunctionality.description": "Enabling AudioContext functionality will allow for extended audio features like Audio Normalization , Equalizers and Visualizers, however on some systems this may cause stuttering in audio tracks.",
"settings.option.audio.enableAdvancedFunctionality.decryptLLPW": "Decrypt Lossless Playback Workflow", // Toggle "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Psychoacoustic Processing Engine", // Toggle
"settings.option.audio.enableAdvancedFunctionality.decryptLLPW.description": "Enables the ability for Cider to decrypt Lossless Audio Files. A minor performance hit will occur.", "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Processing workflow that tricks your brain into thinking that the files are higher-quality sounding.",
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Audio Normalization", // Toggle "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Audio Normalization", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normalizes peak volume for individual tracks to create a more uniform listening experience.", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normalizes peak volume for individual tracks to create a more uniform listening experience.",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "Audio Spatialization", // Toggle "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "Audio Spatialization", // Toggle

5
src/i18n/ja_JP.jsonc
View file

@ -201,14 +201,15 @@
"settings.header.audio.quality.hireslossless.description": "(最大解像度 24 ビット／192 kHz)", "settings.header.audio.quality.hireslossless.description": "(最大解像度 24 ビット／192 kHz)",
"settings.header.audio.quality.lossless": "ロスレス", "settings.header.audio.quality.lossless": "ロスレス",
"settings.header.audio.quality.lossless.description": "(最大解像度 24 ビット／48 kHz)", "settings.header.audio.quality.lossless.description": "(最大解像度 24 ビット／48 kHz)",
"settings.header.audio.quality.enhanced": "エンハンスド",
"settings.header.audio.quality.high": "高品質", "settings.header.audio.quality.high": "高品質",
"settings.header.audio.quality.low": "高効率", "settings.header.audio.quality.low": "高効率",
"settings.header.audio.quality.auto": "自動", "settings.header.audio.quality.auto": "自動",
"settings.option.audio.seamlessTransition": "曲間なしで再生", // Toggle "settings.option.audio.seamlessTransition": "曲間なしで再生", // Toggle
"settings.option.audio.enableAdvancedFunctionality": "先進的な機能", // Toggle "settings.option.audio.enableAdvancedFunctionality": "先進的な機能", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "AudioContext 機能を有効にすると、オーディオノーマライズ、空間オーディオ、イコライザーなどの機能を使用できますが、音が途切れるかもしれません。", // Toggle "settings.option.audio.enableAdvancedFunctionality.description": "AudioContext 機能を有効にすると、オーディオノーマライズ、空間オーディオ、イコライザーなどの機能を使用できますが、音が途切れるかもしれません。", // Toggle
"settings.option.audio.enableAdvancedFunctionality.decryptLLPW": "ロスレスオーディオ", // Toggle "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider PPE", // Toggle
"settings.option.audio.enableAdvancedFunctionality.decryptLLPW.description": "ロスレスオーディオを有効にする", // Toggle "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "圧縮音源を高解像度に処理することによって、ロスレス相当の音質に向上させます。", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "オーディオノーマライズ", // Toggle "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "オーディオノーマライズ", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "オーディオ空間化", // Toggle "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "オーディオ空間化", // Toggle

3
src/i18n/zh_CN.jsonc
View file

@ -201,12 +201,15 @@
"settings.header.audio.quality.hireslossless.description": "(最高 24 位/192 kHz)", "settings.header.audio.quality.hireslossless.description": "(最高 24 位/192 kHz)",
"settings.header.audio.quality.lossless": "无损", "settings.header.audio.quality.lossless": "无损",
"settings.header.audio.quality.lossless.description": "(最高 24 位/48 kHz)", "settings.header.audio.quality.lossless.description": "(最高 24 位/48 kHz)",
"settings.header.audio.quality.enhanced": "数字增强",
"settings.header.audio.quality.high": "高音质", "settings.header.audio.quality.high": "高音质",
"settings.header.audio.quality.low": "高效率", "settings.header.audio.quality.low": "高效率",
"settings.header.audio.quality.auto": "自动", "settings.header.audio.quality.auto": "自动",
"settings.option.audio.seamlessTransition": "无缝播放", // Toggle "settings.option.audio.seamlessTransition": "无缝播放", // Toggle
"settings.option.audio.enableAdvancedFunctionality": "进阶功能", // Toggle "settings.option.audio.enableAdvancedFunctionality": "进阶功能", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "启用 AudioContext 将解锁例如音量标准化和音频空间化的功能，但可能会在小部分设备上出现音频上的卡顿。", "settings.option.audio.enableAdvancedFunctionality.description": "启用 AudioContext 将解锁例如音量标准化和音频空间化的功能，但可能会在小部分设备上出现音频上的卡顿。",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider 数字增强引擎", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "将欺骗您的大脑来感知到近似无损音频的效果。",
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "音量标准化", // Toggle "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "音量标准化", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "使所感知到的音频响度统一", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "使所感知到的音频响度统一",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "音频空间化", // Toggle "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "音频空间化", // Toggle

5
src/i18n/zh_TW.jsonc
View file

@ -202,14 +202,15 @@
"settings.header.audio.quality.hireslossless.description": "（高達 24-bit/192 kHz）", "settings.header.audio.quality.hireslossless.description": "（高達 24-bit/192 kHz）",
"settings.header.audio.quality.lossless": "無損壓縮", "settings.header.audio.quality.lossless": "無損壓縮",
"settings.header.audio.quality.lossless.description": "（高達 24-bit/48 kHz）", "settings.header.audio.quality.lossless.description": "（高達 24-bit/48 kHz）",
"settings.header.audio.quality.enhanced": "數位增强",
"settings.header.audio.quality.high": "高品質", "settings.header.audio.quality.high": "高品質",
"settings.header.audio.quality.low": "高效率", "settings.header.audio.quality.low": "高效率",
"settings.header.audio.quality.auto": "自動", "settings.header.audio.quality.auto": "自動",
"settings.option.audio.seamlessTransition": "無間斷播放", // Toggle "settings.option.audio.seamlessTransition": "無間斷播放", // Toggle
"settings.option.audio.enableAdvancedFunctionality": "進階機能", // Toggle "settings.option.audio.enableAdvancedFunctionality": "進階機能", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "啟用 AudioContext 將解鎖類似音訊標準化和等化器的進階機能。但是會在部分電腦造成音樂卡頓。", "settings.option.audio.enableAdvancedFunctionality.description": "啟用 AudioContext 將解鎖類似音訊標準化和等化器的進階機能。但是會在部分電腦造成音樂卡頓。",
"settings.option.audio.enableAdvancedFunctionality.decryptLLPW": "無損壓縮解碼", // Toggle "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider 數位增强音訊處理", // Toggle
"settings.option.audio.enableAdvancedFunctionality.decryptLLPW.description": "提供 Cider 解碼無損壓縮檔案的能力，但相應地也會對電腦硬體提升使用率。", "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "將欺騙您的大腦使其感受近似保真壓縮的音質。",
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "音訊標準化", // Toggle "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "音訊標準化", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "將平衡輕柔和響亮的歌曲，建立更統一的聆聽體驗。", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "將平衡輕柔和響亮的歌曲，建立更統一的聆聽體驗。",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "音訊空間化", // Toggle "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "音訊空間化", // Toggle

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

@ -31,7 +31,7 @@ export class Store {
"quality": "256", "quality": "256",
"seamless_audio": true, "seamless_audio": true,
"normalization": false, "normalization": false,
"decryptLLPW": false, "ciderPPE": false,
"spatial": false, "spatial": false,
"maxVolume": 1, "maxVolume": 1,
"volumePrecision": 0.1, "volumePrecision": 0.1,

2
src/renderer/index.js
View file

@ -2350,7 +2350,7 @@ const app = new Vue({
}, },
async losslessBadge() { async losslessBadge() {
const songID = (this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem["_songId"] ?? -1 : -1; const songID = (this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem["_songId"] ?? -1 : -1;
if (app.cfg.audio.quality == 2304 && app.cfg.advanced.decryptLLPW && songID != -1) { if (app.cfg.audio.quality == 2304 && app.cfg.advanced.ciderPPE && songID != -1) {
let extendedAssets = await app.mk.api.song(songID, {extend : 'extendedAssetUrls'}) let extendedAssets = await app.mk.api.song(songID, {extend : 'extendedAssetUrls'})
if (extendedAssets.attributes.audioTraits.includes('lossless')) { if (extendedAssets.attributes.audioTraits.includes('lossless')) {
app.mk.nowPlayingItem['attributes']['lossless'] = true app.mk.nowPlayingItem['attributes']['lossless'] = true

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

@ -36,7 +36,8 @@
<select class="md-select" style="width:180px;" v-model="app.cfg.audio.quality" <select class="md-select" style="width:180px;" v-model="app.cfg.audio.quality"
v-on:change="changeAudioQuality"> v-on:change="changeAudioQuality">
<!-- // <option value="9216">{{$root.getLz('settings.header.audio.quality.hireslossless')}}</option> --> <!-- // <option value="9216">{{$root.getLz('settings.header.audio.quality.hireslossless')}}</option> -->
<option value="2304">{{$root.getLz('settings.header.audio.quality.lossless')}}</option> <!-- <option value="2304">{{$root.getLz('settings.header.audio.quality.lossless')}}</option> -->
<option value="2303">{{$root.getLz('settings.header.audio.quality.ciderPPE')}}</option>
<option value="256">{{$root.getLz('settings.header.audio.quality.high')}}</option> <option value="256">{{$root.getLz('settings.header.audio.quality.high')}}</option>
<option value="64">{{$root.getLz('settings.header.audio.quality.low')}}</option> <option value="64">{{$root.getLz('settings.header.audio.quality.low')}}</option>
<option value="auto">{{$root.getLz('settings.header.audio.quality.auto')}}</option> <option value="auto">{{$root.getLz('settings.header.audio.quality.auto')}}</option>
@ -64,12 +65,12 @@
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext"> <div class="md-option-line" v-show="app.cfg.advanced.AudioContext">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.decryptLLPW')}} {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
<br> <br>
<small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.decryptLLPW.description')}}</small> <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE.description')}}</small>
</div> </div>
<div class="md-option-segment md-option-segment_auto"> <div class="md-option-segment md-option-segment_auto">
<input type="checkbox" v-model="app.cfg.advanced.decryptLLPW" switch/> <input type="checkbox" v-model="app.cfg.advanced.ciderPPE" switch/>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext"> <div class="md-option-line" v-show="app.cfg.advanced.AudioContext">
@ -779,7 +780,7 @@
CiderAudio.spatialOn() CiderAudio.spatialOn()
} }
} else { } else {
app.cfg.advanced.decryptLLPW = false; app.cfg.advanced.ciderPPE = false;
CiderAudio.off(); CiderAudio.off();
} }
}, },

1
yarn.lock Normal file
View file

@ -0,0 +1 @@