From 7f73fc1ff2e50a4e76f4d3c13c3f3e75e32fb899 Mon Sep 17 00:00:00 2001 From: BrandonPlank Date: Fri, 24 Dec 2021 21:05:00 -0500 Subject: [PATCH] Revert "moved some objects in backend" This reverts commit 2fca495a5d1b7cd1eb4efa743b317f76a92ca5b2. aaa --- index.js | 75 ------------------ src/main/cider-base.js | 76 +++++++++++++++++++ .../views/components/animatedartwork-view.ejs | 3 +- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/index.js b/index.js index 28be17fc..df8a4246 100644 --- a/index.js +++ b/index.js @@ -9,81 +9,6 @@ ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.inge app.commandLine.appendSwitch('enable-unsafe-webgpu'); -const configSchema = { - "general": { - "close_behavior": { - type: "number", - default: 0 - }, - "startup_behavior": { - type: "number", - default: 0 - }, - "discord_rpc": { - type: "number", - default: 1 - }, - }, - "behavior": { - "hw_acceleration": { - type: "number", - default: 0 // 0 = default, 1 = webgpu, 2 = gpu disabled - } - }, - "audio": { - "quality": { - type: "string", - default: "extreme", - }, - "seamless_audio": { - type: "boolean", - default: true, - } - }, - "visual": { - "theme": { - type: "string", - default: "" - }, - "scrollbars": { - type: "number", - default: 0 - }, - "refresh_rate": { - type: "number", - default: 0 - }, - "animated_artwork": { - type: "number", - default: 0 // 0 = always, 1 = limited, 2 = never - } - }, - "lyrics": { - "enable_mxm": { - type: "boolean", - default: false - }, - "mxm_language": { - type: "string", - default: "en" - } - }, - "lastfm": { - "enabled": { - type: "boolean", - default: false - }, - "scrobble_after": { - type: "number", - default: 30 - }, - "auth_token": { - type: "string", - default: "" - } - } -} - // Creating the Application Window and Calling all the Functions function CreateWindow() { if (app.isQuiting) { app.quit(); return; } diff --git a/src/main/cider-base.js b/src/main/cider-base.js index b347941a..d530c6d3 100644 --- a/src/main/cider-base.js +++ b/src/main/cider-base.js @@ -6,8 +6,84 @@ const path = require("path"); const windowStateKeeper = require("electron-window-state"); const os = require('os'); const Store = require("electron-store"); +const store = new Store(); const yt = require('youtube-search-without-api-key'); +const schema = { + "general": { + "close_behavior": { + type: "number", + default: 0 + }, + "startup_behavior": { + type: "number", + default: 0 + }, + "discord_rpc": { + type: "number", + default: 1 + }, + }, + "behavior": { + "hw_acceleration": { + type: "number", + default: 0 // 0 = default, 1 = webgpu, 2 = gpu disabled + } + }, + "audio": { + "quality": { + type: "string", + default: "extreme", + }, + "seamless_audio": { + type: "boolean", + default: true, + } + }, + "visual": { + "theme": { + type: "string", + default: "" + }, + "scrollbars": { + type: "number", + default: 0 + }, + "refresh_rate": { + type: "number", + default: 0 + }, + "animated_artwork": { + type: "number", + default: 0 // 0 = always, 1 = limited, 2 = never + } + }, + "lyrics": { + "enable_mxm": { + type: "boolean", + default: false + }, + "mxm_language": { + type: "string", + default: "en" + } + }, + "lastfm": { + "enabled": { + type: "boolean", + default: false + }, + "scrobble_after": { + type: "number", + default: 30 + }, + "auth_token": { + type: "string", + default: "" + } + } +} + // Analytics for debugging. const ElectronSentry = require("@sentry/electron"); ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214"}); diff --git a/src/renderer/views/components/animatedartwork-view.ejs b/src/renderer/views/components/animatedartwork-view.ejs index 63fe656f..a99b0c8c 100644 --- a/src/renderer/views/components/animatedartwork-view.ejs +++ b/src/renderer/views/components/animatedartwork-view.ejs @@ -20,8 +20,7 @@ enableCEA708Captions: false, emeEnabled: false, abrEwmaDefaultEstimate: 10000, - testBandwidth: false, - capLevelToPlayerSize: true + testBandwidth: false }; if (this.hls) { console.log('detached');