mastermindzh/tidal-hifi
1
0
Fork 0
mirror of https://github.com/Mastermindzh/tidal-hifi.git synced 2024-11-22 13:32:42 +01:00
Code Issues Projects Releases Wiki Activity

Refactored nowPlaying code to always display the current state, even when the built-in UI is updated. fixes #351 #356 #370

Browse Source
This commit is contained in:
Rick van Lieshout 2024-03-24 16:13:21 +01:00
parent 4ef76c262e
commit 17b2818b70
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- TIDAL will now close the previous notification if a new one is sent whilst the old is still visible. [#364](https://github.com/Mastermindzh/tidal-hifi/pull/364) - TIDAL will now close the previous notification if a new one is sent whilst the old is still visible. [#364](https://github.com/Mastermindzh/tidal-hifi/pull/364)
- Updated developer documentation to get started in README [#365](https://github.com/Mastermindzh/tidal-hifi/pull/365) - Updated developer documentation to get started in README [#365](https://github.com/Mastermindzh/tidal-hifi/pull/365)
- Links in the about window now open in the user's default browser. fixes [#360](https://github.com/Mastermindzh/tidal-hifi/issues/360) - Links in the about window now open in the user's default browser. fixes [#360](https://github.com/Mastermindzh/tidal-hifi/issues/360)
- Refactored "nowPlaying" code to always display the current state, even when the built-in UI is updated.
- fixes [#351](https://github.com/Mastermindzh/tidal-hifi/issues/351)
- fixes [#356](https://github.com/Mastermindzh/tidal-hifi/issues/356)
- fixes [#370](https://github.com/Mastermindzh/tidal-hifi/issues/370)
## [5.9.0] ## [5.9.0]

18
src/preload.ts
View File

@ -26,7 +26,8 @@ let player: Player;
let currentPlayStatus = MediaStatus.paused; let currentPlayStatus = MediaStatus.paused;
let currentListenBrainzDelayId: ReturnType<typeof setTimeout>; let currentListenBrainzDelayId: ReturnType<typeof setTimeout>;
let scrobbleWaitingForDelay = false; let scrobbleWaitingForDelay = false;
let wasJustPausedOrResumed = false;
let currentlyPlaying = MediaStatus.paused;
let currentMediaInfo: Options; let currentMediaInfo: Options;
let currentNotification: Electron.Notification; let currentNotification: Electron.Notification;
@ -185,7 +186,6 @@ function getUpdateFrequency() {
* Play or pause the current song * Play or pause the current song
*/ */
function playPause() { function playPause() {
wasJustPausedOrResumed = true;
const play = elements.get("play"); const play = elements.get("play");
if (play) { if (play) {
@ -361,7 +361,11 @@ function updateMediaInfo(options: Options, notify: boolean) {
ipcRenderer.send(globalEvents.updateInfo, options); ipcRenderer.send(globalEvents.updateInfo, options);
if (settingsStore.get(settings.notifications) && notify) { if (settingsStore.get(settings.notifications) && notify) {
if (currentNotification) currentNotification.close(); if (currentNotification) currentNotification.close();
currentNotification = new Notification({ title: options.title, body: options.artists, icon: options.icon }); currentNotification = new Notification({
title: options.title,
body: options.artists,
icon: options.icon,
});
currentNotification.show(); currentNotification.show();
} }
updateMpris(options); updateMpris(options);
@ -518,10 +522,12 @@ setInterval(function () {
const current = elements.getText("current"); const current = elements.getText("current");
const currentStatus = getCurrentlyPlayingStatus(); const currentStatus = getCurrentlyPlayingStatus();
const playStateChanged = currentStatus != currentlyPlaying;
// update info if song changed or was just paused/resumed // update info if song changed or was just paused/resumed
if (titleOrArtistsChanged || wasJustPausedOrResumed) { if (titleOrArtistsChanged || playStateChanged) {
if (wasJustPausedOrResumed) { if (playStateChanged) {
wasJustPausedOrResumed = false; currentlyPlaying = currentStatus;
} }
skipArtistsIfFoundInSkippedArtistsList(artistsArray); skipArtistsIfFoundInSkippedArtistsList(artistsArray);