Compare commits

...

15 Commits

Author SHA1 Message Date
207a61d199 4.0.0 with electron 19.0.5 release 2022-06-23 17:06:17 +02:00
Tomasz Hołubowicz
7b18322e17 Bump electron version (#152) 2022-06-23 17:00:35 +02:00
8f47756244 fixed hardware media flag upadting gpu rasterization options 2022-06-18 10:40:31 +02:00
Marie
cdcf9431bf Fix bugs related to media info (#150)
* Fix duration time element

* change interval time from 200 to 500
2022-06-18 10:26:21 +02:00
374f3da740 Added a separate advanced options settings panel with flags
- Added gpu-rasterization flag

config setting `disableHardwareMediaKeys` moved to `flags.disableHardwareMediaKeys`, it will be migrated automatically
2022-05-07 18:13:36 +02:00
3965ada0a2 Add link to flathub 2022-04-23 23:18:08 +02:00
79ff02d06c Electron 15, single-instance-lock and setting to disable hardwareMediaKeyHandling (#134)
* Update to Electron 15 and add Flatpak to README (#131)

* Update functional

* Change to 15

* Replace window.hide, window.restart with counterparts

* Fix openexternal by doing default JS

* Change mouse to pointer for <a> elements

* turn mouse to pointer for exit button

* Fix deprecation of Audio for AudioVideo

* Made a small mistake

* Add Flatpak to readme

* 3.0.0 prep

* Added setting to disable multiple tidal-hifi windows (defaults to true)

fixes #121

* Added setting to disable HardwareMediaKeyHandling (defaults to false)

fixes #133

Co-authored-by: Marie <marie@kaifa.ch>
2022-04-23 22:59:32 +02:00
7b2afd2290 added separate build-unpacked config 2022-04-22 00:21:05 +02:00
5fde20ace1 hotfix, downgrade packaged version to 8.5.2 2022-04-21 23:58:48 +02:00
7f5f5e7f62 Merge branch 'master' of github.com:Mastermindzh/tidal-hifi 2022-04-21 17:52:50 +02:00
6a1a1efe74 add apt-get update 2022-04-21 17:52:31 +02:00
94e1bb1780 add apt-get update 2022-04-21 17:51:21 +02:00
d66dd8cc9e 2.8.1 release 2022-04-21 17:49:11 +02:00
Cukmekerb
de97ac8a00 make quit button actually quit app (#123) 2022-04-21 17:46:49 +02:00
Marie
82ac5edf22 Update build version to fit with package.json electron version (#128)
* Update build version to fit with package.json electron version

* Update electron-builder.yml

* Use wvcus.2 for additional fixes

* Also use wvcus.2 for package.json
2022-04-21 17:46:05 +02:00
16 changed files with 1790 additions and 1885 deletions

View File

@@ -9,6 +9,8 @@ jobs:
build_on_linux: build_on_linux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: update apt
run: sudo apt-get update
- name: Install libarchive-tools - name: Install libarchive-tools
run: sudo apt-get install -y libarchive-tools run: sudo apt-get install -y libarchive-tools
- uses: actions/checkout@master - uses: actions/checkout@master

View File

@@ -9,6 +9,8 @@ jobs:
build_on_linux: build_on_linux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: update apt
run: sudo apt-get update
- name: Install libarchive-tools - name: Install libarchive-tools
run: sudo apt-get install -y libarchive-tools run: sudo apt-get install -y libarchive-tools
- uses: actions/checkout@master - uses: actions/checkout@master

View File

@@ -4,6 +4,40 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## 4.0.0
- Updated to Electron 19.0.5
## 3.1.1
- Media update timeout set to 500 instead of 200
- Updated property name for duration because of a tidal update
- flag for "disable hardware media keys" now working again
## 3.1.0
- Added a separate advanced options settings panel with flags
- Added gpu-rasterization flag
- config setting `disableHardwareMediaKeys` moved to `flags.disableHardwareMediaKeys`, it will be migrated automatically
## 3.0.0
- Updated to Electron 15
- Fixed the develop "build-unpacked" command
- Added setting to disable multiple tidal-hifi windows (defaults to true)
- Added setting to disable HardwareMediaKeyHandling (defaults to false)
## 2.8.2
- Updated dependencies
- Downgraded packaged version of electron to 8.5.2, doesn't seem to like a newer build
- Fixed the annoying (and useless) terminal warning about `allowRendererProcessReuse`
## 2.8.1
- Mar0xy fixed some build issues (thanks!)
- vincens2005 fixed the quit button in the menubar
## 2.8.0 ## 2.8.0
- Added the ability to mute artists automatically - Added the ability to mute artists automatically

View File

@@ -15,6 +15,7 @@ The web version of [listen.tidal.com](https://listen.tidal.com) running in elect
- [Using releases](#using-releases) - [Using releases](#using-releases)
- [Snap install](#snap-install) - [Snap install](#snap-install)
- [Arch Linux](#arch-linux) - [Arch Linux](#arch-linux)
- [Flatpak](#flatpak)
- [Using source](#using-source) - [Using source](#using-source)
- [features](#features) - [features](#features)
- [Integrations](#integrations) - [Integrations](#integrations)
@@ -61,6 +62,14 @@ Arch Linux users can use the AUR to install tidal-hifi:
trizen tidal-hifi-bin trizen tidal-hifi-bin
``` ```
### Flatpak
To install via [Flatpak](https://flathub.org/apps/details/com.mastermindzh.tidal-hifi) run the following command:
```sh
flatpak install flathub com.mastermindzh.tidal-hifi
```
### Using source ### Using source
To install and work with the code on this project follow these steps: To install and work with the code on this project follow these steps:

View File

@@ -0,0 +1,4 @@
extends: ./build/electron-builder.yml
linux:
target:
- dir

View File

@@ -1,7 +1,7 @@
appId: com.rickvanlieshout.tidal-hifi appId: com.rickvanlieshout.tidal-hifi
electronVersion: 8.5.2 electronVersion: 19.0.5
electronDownload: electronDownload:
version: 8.5.2-wvvmp version: 19.0.5+wvcus
mirror: https://github.com/castlabs/electron-releases/releases/download/v mirror: https://github.com/castlabs/electron-releases/releases/download/v
snap: snap:
plugs: plugs:
@@ -27,7 +27,7 @@ linux:
StartupNotify: true StartupNotify: true
Terminal: false Terminal: false
Type: Application Type: Application
Categories: Network;Application;Audio;Video Categories: Network;Application;AudioVideo;Audio;Video
StartupWMClass: tidal-hifi StartupWMClass: tidal-hifi
X-PulseAudio-Properties: media.role=music X-PulseAudio-Properties: media.role=music
mac: mac:

3343
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,12 +1,13 @@
{ {
"name": "tidal-hifi", "name": "tidal-hifi",
"version": "2.8.0", "version": "4.0.0",
"description": "Tidal on Electron with widevine(hifi) support", "description": "Tidal on Electron with widevine(hifi) support",
"main": "src/main.js", "main": "src/main.js",
"scripts": { "scripts": {
"start": "electron .", "start": "electron .",
"build": "electron-builder --publish=never -c ./build/electron-builder.yml", "build": "electron-builder --publish=never -c ./build/electron-builder.yml",
"build-deb": "electron-builder --publish=never -c ./build/electron-builder.deb.yml", "build-deb": "electron-builder --publish=never -c ./build/electron-builder.deb.yml",
"build-unpacked": "electron-builder --publish=never -c ./build/electron-builder.unpacked.yml",
"build-rpm": "electron-builder --publish=never -c ./build/electron-builder.rpm.yml", "build-rpm": "electron-builder --publish=never -c ./build/electron-builder.rpm.yml",
"build-snap": "electron-builder --publish=never -c ./build/electron-builder.snap.yml", "build-snap": "electron-builder --publish=never -c ./build/electron-builder.snap.yml",
"build-arch": "electron-builder --publish=never -c ./build/electron-builder.pacman.yml", "build-arch": "electron-builder --publish=never -c ./build/electron-builder.pacman.yml",
@@ -23,6 +24,7 @@
"homepage": "https://github.com/Mastermindzh/tidal-hifi", "homepage": "https://github.com/Mastermindzh/tidal-hifi",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron/remote": "^2.0.8",
"discord-rpc": "^4.0.1", "discord-rpc": "^4.0.1",
"electron-store": "^8.0.1", "electron-store": "^8.0.1",
"express": "^4.17.1", "express": "^4.17.1",
@@ -32,9 +34,8 @@
}, },
"devDependencies": { "devDependencies": {
"@mastermindzh/prettier-config": "^1.0.0", "@mastermindzh/prettier-config": "^1.0.0",
"electron": "git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus", "electron": "git+https://github.com/castlabs/electron-releases.git#v19.0.5+wvcus",
"electron-builder": "^22.14.5", "electron-builder": "^23.2.0",
"electron-reload": "^1.5.0",
"prettier": "^2.5.0" "prettier": "^2.5.0"
}, },
"prettier": "@mastermindzh/prettier-config" "prettier": "@mastermindzh/prettier-config"

6
src/constants/flags.js Normal file
View File

@@ -0,0 +1,6 @@
const flags = {
gpuRasterization: [{ flag: "enable-gpu-rasterization", value: undefined }],
disableHardwareMediaKeys: [{ flag: "disable-features", value: "HardwareMediaKeyHandling" }],
};
module.exports = flags;

View File

@@ -19,6 +19,12 @@ const settings = {
root: "apiSettings", root: "apiSettings",
port: "apiSettings.port", port: "apiSettings.port",
}, },
singleInstance: "singleInstance",
disableHardwareMediaKeys: "disableHardwareMediaKeys",
flags: {
disableHardwareMediaKeys: "flags.disableHardwareMediaKeys",
gpuRasterization: "flags.gpuRasterization",
},
mpris: "mpris", mpris: "mpris",
enableCustomHotkeys: "enableCustomHotkeys", enableCustomHotkeys: "enableCustomHotkeys",
trayIcon: "trayIcon", trayIcon: "trayIcon",

View File

@@ -1,4 +1,5 @@
const { app, BrowserWindow, globalShortcut, ipcMain } = require("electron"); require("@electron/remote/main").initialize();
const { app, BrowserWindow, components, globalShortcut, ipcMain } = require("electron");
const { const {
settings, settings,
store, store,
@@ -16,23 +17,31 @@ const mediaKeys = require("./constants/mediaKeys");
const mediaInfoModule = require("./scripts/mediaInfo"); const mediaInfoModule = require("./scripts/mediaInfo");
const discordModule = require("./scripts/discord"); const discordModule = require("./scripts/discord");
const globalEvents = require("./constants/globalEvents"); const globalEvents = require("./constants/globalEvents");
const flagValues = require("./constants/flags");
let mainWindow; let mainWindow;
let icon = path.join(__dirname, "../assets/icon.png"); let icon = path.join(__dirname, "../assets/icon.png");
/** setFlags();
* Enable live reload in development builds
*/
if (!app.isPackaged) {
require("electron-reload")(`${__dirname}`, {
electron: require(`${__dirname}/../node_modules/electron`),
});
}
/** function setFlags() {
* Fix Display Compositor issue. const flags = store.get().flags;
*/ if (flags) {
app.commandLine.appendSwitch('disable-seccomp-filter-sandbox'); for (const [key, value] of Object.entries(flags)) {
if (value) {
flagValues[key].forEach((flag) => {
console.log(`enabling command line switch ${flag.flag} with value ${flag.value}`);
app.commandLine.appendSwitch(flag.flag, flag.value);
});
}
}
}
/**
* Fix Display Compositor issue.
*/
app.commandLine.appendSwitch("disable-seccomp-filter-sandbox");
}
/** /**
* Update the menuBarVisbility according to the store value * Update the menuBarVisbility according to the store value
@@ -42,6 +51,23 @@ function syncMenuBarWithStore() {
mainWindow.setMenuBarVisibility(store.get(settings.menuBar)); mainWindow.setMenuBarVisibility(store.get(settings.menuBar));
} }
/**
* Determine whether the current window is the main window
* if singleInstance is requested.
* If singleInstance isn't requested simply return true
* @returns true if singInstance is not requested, otherwise true/false based on whether the current window is the main window
*/
function isMainInstanceOrMultipleInstancesAllowed() {
if (store.get(settings.singleInstance)) {
const gotTheLock = app.requestSingleInstanceLock();
if (!gotTheLock) {
return false;
}
}
return true;
}
function createWindow(options = {}) { function createWindow(options = {}) {
// Create the browser window. // Create the browser window.
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
@@ -50,16 +76,14 @@ function createWindow(options = {}) {
width: store && store.get(settings.windowBounds.width), width: store && store.get(settings.windowBounds.width),
height: store && store.get(settings.windowBounds.height), height: store && store.get(settings.windowBounds.height),
icon, icon,
tray: true,
backgroundColor: options.backgroundColor, backgroundColor: options.backgroundColor,
webPreferences: { webPreferences: {
affinity: "window",
preload: path.join(__dirname, "preload.js"), preload: path.join(__dirname, "preload.js"),
plugins: true, plugins: true,
devTools: true, // I like tinkering, others might too devTools: true, // I like tinkering, others might too
enableRemoteModule: true,
}, },
}); });
require("@electron/remote/main").enable(mainWindow.webContents);
syncMenuBarWithStore(); syncMenuBarWithStore();
@@ -100,15 +124,20 @@ function addGlobalShortcuts() {
// This method will be called when Electron has finished // This method will be called when Electron has finished
// initialization and is ready to create browser windows. // initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs. // Some APIs can only be used after this event occurs.
app.on("ready", () => { app.on("ready", async () => {
createWindow(); if (isMainInstanceOrMultipleInstancesAllowed()) {
addMenu(); await components.whenReady();
createSettingsWindow(); createWindow();
addGlobalShortcuts(); addMenu();
store.get(settings.trayIcon) && addTray({ icon }) && refreshTray(); createSettingsWindow();
store.get(settings.api) && expressModule.run(mainWindow); addGlobalShortcuts();
store.get(settings.enableDiscord) && discordModule.initRPC(); store.get(settings.trayIcon) && addTray({ icon }) && refreshTray();
// mainWindow.webContents.openDevTools(); store.get(settings.api) && expressModule.run(mainWindow);
store.get(settings.enableDiscord) && discordModule.initRPC();
// mainWindow.webContents.openDevTools();
} else {
app.quit();
}
}); });
app.on("activate", function () { app.on("activate", function () {
@@ -119,23 +148,27 @@ app.on("activate", function () {
} }
}); });
app.on("browser-window-created", (_, window) => {
require("@electron/remote/main").enable(window.webContents);
});
// IPC // IPC
ipcMain.on(globalEvents.updateInfo, (event, arg) => { ipcMain.on(globalEvents.updateInfo, (_event, arg) => {
mediaInfoModule.update(arg); mediaInfoModule.update(arg);
}); });
ipcMain.on(globalEvents.hideSettings, (event, arg) => { ipcMain.on(globalEvents.hideSettings, (_event, _arg) => {
hideSettingsWindow(); hideSettingsWindow();
}); });
ipcMain.on(globalEvents.showSettings, (event, arg) => { ipcMain.on(globalEvents.showSettings, (_event, _arg) => {
showSettingsWindow(); showSettingsWindow();
}); });
ipcMain.on(globalEvents.refreshMenuBar, (event, arg) => { ipcMain.on(globalEvents.refreshMenuBar, (_event, _arg) => {
syncMenuBarWithStore(); syncMenuBarWithStore();
}); });
ipcMain.on(globalEvents.storeChanged, (event, arg) => { ipcMain.on(globalEvents.storeChanged, (_event, _arg) => {
syncMenuBarWithStore(); syncMenuBarWithStore();
if (store.get(settings.enableDiscord) && !discordModule.rpc) { if (store.get(settings.enableDiscord) && !discordModule.rpc) {
@@ -145,6 +178,6 @@ ipcMain.on(globalEvents.storeChanged, (event, arg) => {
} }
}); });
ipcMain.on(globalEvents.error, (event, arg) => { ipcMain.on(globalEvents.error, (event, _arg) => {
console.log(event); console.log(event);
}); });

View File

@@ -9,12 +9,16 @@ let trayIcon,
api, api,
port, port,
menuBar, menuBar,
mutedArtists; mutedArtists,
singleInstance,
disableHardwareMediaKeys,
gpuRasterization;
const { store, settings } = require("./../../scripts/settings"); const { store, settings } = require("./../../scripts/settings");
const { ipcRenderer } = require("electron"); const { ipcRenderer } = require("electron");
const globalEvents = require("./../../constants/globalEvents"); const globalEvents = require("./../../constants/globalEvents");
const remote = require("@electron/remote");
const { app } = remote;
/** /**
* Sync the UI forms with the current settings * Sync the UI forms with the current settings
*/ */
@@ -31,31 +35,33 @@ function refreshSettings() {
minimizeOnClose.checked = store.get(settings.minimizeOnClose); minimizeOnClose.checked = store.get(settings.minimizeOnClose);
muteArtists.checked = store.get(settings.muteArtists); muteArtists.checked = store.get(settings.muteArtists);
mutedArtists.value = store.get(settings.mutedArtists).join("\n"); mutedArtists.value = store.get(settings.mutedArtists).join("\n");
singleInstance.checked = store.get(settings.singleInstance);
disableHardwareMediaKeys.checked = store.get(settings.flags.disableHardwareMediaKeys);
gpuRasterization.checked = store.get(settings.flags.gpuRasterization);
} }
/** /**
* Open an url in the default browsers * Open an url in the default browsers
*/ */
window.openExternal = function (url) { function openExternal(url) {
const { shell } = require("electron"); const { shell } = require("electron");
shell.openExternal(url); shell.openExternal(url);
}; }
/** /**
* hide the settings window * hide the settings window
*/ */
window.hide = function () { function hide() {
ipcRenderer.send(globalEvents.hideSettings); ipcRenderer.send(globalEvents.hideSettings);
}; }
/** /**
* Restart tidal-hifi after changes * Restart tidal-hifi after changes
*/ */
window.restart = function () { function restart() {
const remote = require("electron").remote; app.relaunch();
remote.app.relaunch(); app.quit();
remote.app.exit(0); }
};
/** /**
* Bind UI components to functions after DOMContentLoaded * Bind UI components to functions after DOMContentLoaded
@@ -65,8 +71,16 @@ window.addEventListener("DOMContentLoaded", () => {
return document.getElementById(id); return document.getElementById(id);
} }
document.getElementById("close").addEventListener("click", hide);
document.getElementById("restart").addEventListener("click", restart);
document.querySelectorAll("#openExternal").forEach((elem) =>
elem.addEventListener("click", function (event) {
openExternal(event.target.getAttribute("data-url"));
})
);
function addInputListener(source, key) { function addInputListener(source, key) {
source.addEventListener("input", function (event, data) { source.addEventListener("input", function (_event, _data) {
if (this.value === "on") { if (this.value === "on") {
store.set(key, source.checked); store.set(key, source.checked);
} else { } else {
@@ -77,7 +91,7 @@ window.addEventListener("DOMContentLoaded", () => {
} }
function addTextAreaListener(source, key) { function addTextAreaListener(source, key) {
source.addEventListener("input", function (event, data) { source.addEventListener("input", function (_event, _data) {
store.set(key, source.value.split("\n")); store.set(key, source.value.split("\n"));
ipcRenderer.send(globalEvents.storeChanged); ipcRenderer.send(globalEvents.storeChanged);
}); });
@@ -103,6 +117,9 @@ window.addEventListener("DOMContentLoaded", () => {
enableDiscord = get("enableDiscord"); enableDiscord = get("enableDiscord");
muteArtists = get("muteArtists"); muteArtists = get("muteArtists");
mutedArtists = get("mutedArtists"); mutedArtists = get("mutedArtists");
singleInstance = get("singleInstance");
disableHardwareMediaKeys = get("disableHardwareMediaKeys");
gpuRasterization = get("gpuRasterization");
refreshSettings(); refreshSettings();
@@ -118,4 +135,7 @@ window.addEventListener("DOMContentLoaded", () => {
addInputListener(minimizeOnClose, settings.minimizeOnClose); addInputListener(minimizeOnClose, settings.minimizeOnClose);
addInputListener(muteArtists, settings.muteArtists); addInputListener(muteArtists, settings.muteArtists);
addTextAreaListener(mutedArtists, settings.mutedArtists); addTextAreaListener(mutedArtists, settings.mutedArtists);
addInputListener(singleInstance, settings.singleInstance);
addInputListener(disableHardwareMediaKeys, settings.flags.disableHardwareMediaKeys);
addInputListener(gpuRasterization, settings.flags.gpuRasterization);
}); });

View File

@@ -11,7 +11,7 @@
<body> <body>
<div class="header"> <div class="header">
<h1 class="title">Settings</h1> <h1 class="title">Settings</h1>
<a href="javascript:hide();" class="exitWindow"> <a id="close" style="cursor: pointer;" class="exitWindow">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 348.333 348.334"> <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 348.333 348.334">
<g> <g>
@@ -37,6 +37,9 @@
<input type="radio" name="tabset" id="integrations" /> <input type="radio" name="tabset" id="integrations" />
<label for="integrations">Integrations</label> <label for="integrations">Integrations</label>
<!-- advanced tab -->
<input type="radio" name="tabset" id="advanced" />
<label for="advanced">Advanced</label>
<!-- about tab --> <!-- about tab -->
<input type="radio" name="tabset" id="about" /> <input type="radio" name="tabset" id="about" />
<label for="about">About</label> <label for="about">About</label>
@@ -105,13 +108,23 @@
<div class="option"> <div class="option">
<h4>Hotkeys</h4> <h4>Hotkeys</h4>
<p> <p>
Enables extra hotkeys to achieve feature parity with the <a href = "javascript:openExternal('https://defkey.com/tidal-desktop-shortcuts')">desktop apps</a><br /> Enables extra hotkeys to achieve feature parity with the <a id="openExternal" style="text-decoration: underline; cursor: pointer;" data-url= "https://defkey.com/tidal-desktop-shortcuts">desktop apps</a><br />
</p> </p>
<label class="switch"> <label class="switch">
<input id="enableCustomHotkeys" type="checkbox"> <input id="enableCustomHotkeys" type="checkbox">
<span class="slider round"></span> <span class="slider round"></span>
</label> </label>
</div> </div>
<div class="option">
<h4>Single instance</h4>
<p>
Prevent opening multiple tidal-hifi instances
</p>
<label class="switch">
<input id="singleInstance" type="checkbox">
<span class="slider round"></span>
</label>
</div>
</div> </div>
</section> </section>
<section id="api" class="tab-panel"> <section id="api" class="tab-panel">
@@ -175,19 +188,47 @@
</div> </div>
</div> </div>
</section> </section>
<section id="about" class="tab-panel">
<div class="section">
<img alt="tidal icon" style="width: 100px; height: auto; display: block; margin: 0 auto; margin-bottom: 20px; margin-top: 20px;" src = "./icon.png">
<p style="max-width: 350px; display:block; margin: 0 auto; text-align: center;">
<a href ="javascript:openExternal('https://github.com/Mastermindzh/tidal-hifi');">Tidal-hifi</a> is made by <a href ="javascript:openExternal('https://www.rickvanlieshout.com')">Rick van Lieshout</a>.<br />
It uses <a href="javascript:openExternal('https://castlabs.com/');">Castlabs'</a> versions of Electron for widevine support.
</p>
<section id="advanced" class="tab-panel">
<div class="section">
<h3>Flags</h3>
<div class="option">
<h4>Disable hardware media keys</h4>
<p>
Disable built-in media keys. <br />
Also prevents certain desktop environments from recognizing the chrome MPRIS client separetely from the custom MPRIS client.
</p>
<label class="switch">
<input id="disableHardwareMediaKeys" type="checkbox">
<span class="slider round"></span>
</label>
</div> </div>
</section> <div class="option">
<h4>Enable GPU rasterization</h4>
<p>
Move a part of the rendering to the GPU for increased performance.
</p>
<label class="switch">
<input id="gpuRasterization" type="checkbox">
<span class="slider round"></span>
</label>
</div>
</div>
</section>
<!-- about -->
<section id="about" class="tab-panel">
<div class="section">
<img alt="tidal icon" style="width: 100px; height: auto; display: block; margin: 0 auto; margin-bottom: 20px; margin-top: 20px;" src = "./icon.png">
<p style="max-width: 350px; display:block; margin: 0 auto; text-align: center;">
<a id="openExternal" style="text-decoration: underline; cursor: pointer;" data-url="https://github.com/Mastermindzh/tidal-hifi">Tidal-hifi</a> is made by <a id="openExternal" data-url="https://www.rickvanlieshout.com" style="text-decoration: underline; cursor: pointer;">Rick van Lieshout</a>.<br />
It uses <a style="text-decoration: underline; cursor: pointer;" id="openExternal" data-url="https://castlabs.com/">Castlabs'</a> versions of Electron for widevine support.
</p>
</div>
</section>
<small>Some settings require a restart of Tidal-hifi. To do so, click the button below:</small> <small>Some settings require a restart of Tidal-hifi. To do so, click the button below:</small>
<button onClick="restart()" style ="width: 100%">Restart Tidal-hifi</button> <button id="restart" style ="width: 100%">Restart Tidal-hifi</button>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -1,13 +1,14 @@
const { setTitle } = require("./scripts/window-functions"); const { setTitle } = require("./scripts/window-functions");
const { dialog, process, Notification } = require("electron").remote; const { dialog, process, Notification } = require('@electron/remote');
const { store, settings } = require("./scripts/settings"); const { store, settings } = require("./scripts/settings");
const { ipcRenderer } = require("electron"); const { ipcRenderer } = require("electron");
const { app } = require("electron").remote; const { app } = require('@electron/remote');
const { downloadFile } = require("./scripts/download"); const { downloadFile } = require("./scripts/download");
const statuses = require("./constants/statuses"); const statuses = require("./constants/statuses");
const hotkeys = require("./scripts/hotkeys"); const hotkeys = require("./scripts/hotkeys");
const globalEvents = require("./constants/globalEvents"); const globalEvents = require("./constants/globalEvents");
const notificationPath = `${app.getPath("userData")}/notification.jpg`; const notificationPath = `${app.getPath("userData")}/notification.jpg`;
const appName = "Tidal Hifi";
let currentSong = ""; let currentSong = "";
let player; let player;
let currentPlayStatus = statuses.paused; let currentPlayStatus = statuses.paused;
@@ -36,7 +37,7 @@ const elements = {
media: '*[data-test="current-media-imagery"]', media: '*[data-test="current-media-imagery"]',
image: "img", image: "img",
current: '*[data-test="current-time"]', current: '*[data-test="current-time"]',
duration: '*[data-test="duration-time"]', duration: '*[data-test="duration"]',
bar: '*[data-test="progress-bar"]', bar: '*[data-test="progress-bar"]',
footer: "#footerPlayer", footer: "#footerPlayer",
album_header_title: '.header-details [data-test="title"]', album_header_title: '.header-details [data-test="title"]',
@@ -225,7 +226,7 @@ function handleLogout() {
} }
function addFullScreenListeners() { function addFullScreenListeners() {
window.document.addEventListener("fullscreenchange", (event) => { window.document.addEventListener("fullscreenchange", () => {
ipcRenderer.send(globalEvents.refreshMenuBar); ipcRenderer.send(globalEvents.refreshMenuBar);
}); });
} }
@@ -236,7 +237,7 @@ function addFullScreenListeners() {
*/ */
function addIPCEventListeners() { function addIPCEventListeners() {
window.addEventListener("DOMContentLoaded", () => { window.addEventListener("DOMContentLoaded", () => {
ipcRenderer.on("globalEvent", (event, args) => { ipcRenderer.on("globalEvent", (_event, args) => {
switch (args) { switch (args) {
case globalEvents.playPause: case globalEvents.playPause:
playPause(); playPause();
@@ -336,7 +337,6 @@ setInterval(function () {
const album = elements.getAlbumName(); const album = elements.getAlbumName();
const current = elements.getText("current"); const current = elements.getText("current");
const duration = elements.getText("duration"); const duration = elements.getText("duration");
const appName = "Tidal Hifi";
const progressBarcurrentTime = elements.get("bar").getAttribute("aria-valuenow"); const progressBarcurrentTime = elements.get("bar").getAttribute("aria-valuenow");
const songDashArtistTitle = `${title} - ${artists}`; const songDashArtistTitle = `${title} - ${artists}`;
const currentStatus = getCurrentlyPlayingStatus(); const currentStatus = getCurrentlyPlayingStatus();
@@ -429,7 +429,7 @@ setInterval(function () {
} }
} }
} }
}, 200); }, 500);
if (process.platform === "linux" && store.get(settings.mpris)) { if (process.platform === "linux" && store.get(settings.mpris)) {
try { try {

View File

@@ -1,4 +1,4 @@
const { Menu } = require("electron"); const { Menu, app } = require("electron");
const { showSettingsWindow } = require("./settings"); const { showSettingsWindow } = require("./settings");
const isMac = process.platform === "darwin"; const isMac = process.platform === "darwin";
@@ -10,6 +10,14 @@ const settingsMenuEntry = {
accelerator: "Control+/", accelerator: "Control+/",
}; };
const quitMenuEntry = {
label: "Quit",
click() {
app.exit(0);
},
accelerator: "Control+Q"
};
const mainMenu = [ const mainMenu = [
...(isMac ...(isMac
? [ ? [
@@ -25,17 +33,15 @@ const mainMenu = [
{ role: "hideothers" }, { role: "hideothers" },
{ role: "unhide" }, { role: "unhide" },
{ type: "separator" }, { type: "separator" },
{ role: "quit" }, quitMenuEntry,
], ],
}, },
] ]
: []), : []),
// { role: 'fileMenu' }
{ {
label: "File", label: "File",
submenu: [settingsMenuEntry, isMac ? { role: "close" } : { role: "quit" }], submenu: [settingsMenuEntry, isMac ? { role: "close" } : quitMenuEntry],
}, },
// { role: 'editMenu' }
{ {
label: "Edit", label: "Edit",
submenu: [ submenu: [
@@ -61,7 +67,6 @@ const mainMenu = [
settingsMenuEntry, settingsMenuEntry,
], ],
}, },
// { role: 'viewMenu' }
{ {
label: "View", label: "View",
submenu: [ submenu: [
@@ -75,7 +80,6 @@ const mainMenu = [
{ role: "togglefullscreen" }, { role: "togglefullscreen" },
], ],
}, },
// { role: 'windowMenu' }
{ {
label: "Window", label: "Window",
submenu: [ submenu: [

View File

@@ -16,12 +16,27 @@ const store = new Store({
apiSettings: { apiSettings: {
port: 47836, port: 47836,
}, },
singleInstance: true,
disableHardwareMediaKeys: false,
trayIcon: true, trayIcon: true,
minimizeOnClose: false, minimizeOnClose: false,
mpris: false, mpris: false,
enableCustomHotkeys: false, enableCustomHotkeys: false,
enableDiscord: false, enableDiscord: false,
windowBounds: { width: 800, height: 600 }, windowBounds: { width: 800, height: 600 },
flags: {
gpuRasterization: true,
disableHardwareMediaKeys: false,
},
},
migrations: {
"3.1.0": (migrationStore) => {
console.log("running migrations for 3.1.0");
migrationStore.set(
settings.flags.disableHardwareMediaKeys,
migrationStore.get("disableHardwareMediaKeys") ?? false
);
},
}, },
}); });
@@ -39,7 +54,6 @@ settingsModule.createSettingsWindow = function () {
frame: false, frame: false,
title: "Tidal-hifi - settings", title: "Tidal-hifi - settings",
webPreferences: { webPreferences: {
affinity: "window",
preload: path.join(__dirname, "../pages/settings/preload.js"), preload: path.join(__dirname, "../pages/settings/preload.js"),
plugins: true, plugins: true,
nodeIntegration: true, nodeIntegration: true,