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

Expose more local files metadata + fix norm error

Browse source
This commit is contained in:
maikirakiwi 2022-07-03 01:05:05 -07:00
parent 4759d809f4
commit eca84c4849
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/providers/local/index.ts
View file

@ -100,6 +100,12 @@ export class LocalFiles {
"contentRating": "clean" "contentRating": "clean"
}, },
flavor: Math.floor((metadata.format?.bitrate ?? 0) / 1000), flavor: Math.floor((metadata.format?.bitrate ?? 0) / 1000),
localFilesMetadata: {
lossless: metadata.format?.lossless,
container: metadata.format?.container,
bitDepth: metadata.format?.bitsPerSample ?? 0,
sampleRate: metadata.format?.sampleRate ?? 0,
},
}; };
let art = { let art = {
id: "ciderlocal" + lochash, id: "ciderlocal" + lochash,

11
src/renderer/main/vueapp.js
View file

@ -969,12 +969,12 @@ const app = new Vue({
localStorage.setItem("playingBitrate", app.mk.nowPlayingItem.flavor) localStorage.setItem("playingBitrate", app.mk.nowPlayingItem.flavor)
} }
} catch (e) { } catch (e) {
console.error(e) localFiles = true;
localStorage.setItem("playingBitrate", "256") localStorage.setItem("playingBitrate", app.mk.nowPlayingItem.flavor)
} }
if (!app.cfg.audio.normalization) { CiderAudio.hierarchical_loading(); } if (!app.cfg.audio.normalization) { CiderAudio.hierarchical_loading(); }
if (app.cfg.audio.normalization) { else {
// get unencrypted audio previews to get SoundCheck's normalization tag // get unencrypted audio previews to get SoundCheck's normalization tag
try { try {
let previewURL = null let previewURL = null
@ -988,11 +988,14 @@ const app = new Vue({
} }
if (previewURL == null && ((app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id)) != -1)) { if (previewURL == null && ((app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id)) != -1)) {
app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id)}`).then((response) => { app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id)}`).then((response) => {
previewURL = response.data.data[0].attributes.previews[0].url previewURL = response.data.data[0].attributes.previews[0].url ?? false;
if (previewURL) { if (previewURL) {
console.debug("[Cider][MaikiwiSoundCheck] previewURL response.data.data[0].attributes.previews[0].url: " + previewURL) console.debug("[Cider][MaikiwiSoundCheck] previewURL response.data.data[0].attributes.previews[0].url: " + previewURL)
ipcRenderer.send('getPreviewURL', previewURL) ipcRenderer.send('getPreviewURL', previewURL)
} }
else {
if (localFiles === true) {CiderAudio.audioNodes.gainNode.gain = 0.8222426499470}
}
}) })
} else { } else {
if (previewURL) { if (previewURL) {