antebudimir/feishin
1
0
Fork 0
mirror of https://github.com/antebudimir/feishin.git synced 2026-01-01 10:23:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

prevent change of media state with empty queue

Browse source
This commit is contained in:
Kendall Garner 2024-04-20 22:01:29 -07:00
parent ba531505af
commit 0d03b66fe5
No known key found for this signature in database
GPG key ID: 18D2767419676C87
5 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/features/core/player/index.ts
View file

@ -306,7 +306,7 @@ ipcMain.on('player-seek-to', async (_event, time: number) => {
// Sets the queue in position 0 and 1 to the given data. Used when manually starting a song or using the next/prev buttons
ipcMain.on('player-set-queue', async (_event, data: PlayerData, pause?: boolean) => {
if (!data.queue.current && !data.queue.next) {
if (!data.queue.current?.id && !data.queue.next?.id) {
try {
await getMpvInstance()?.clearPlaylist();
await getMpvInstance()?.pause();
@ -317,14 +317,14 @@ ipcMain.on('player-set-queue', async (_event, data: PlayerData, pause?: boolean)
}
try {
if (data.queue.current) {
if (data.queue.current?.streamUrl) {
await getMpvInstance()
?.load(data.queue.current.streamUrl, 'replace')
.catch(() => {
getMpvInstance()?.play();
});
if (data.queue.next) {
if (data.queue.next?.streamUrl) {
await getMpvInstance()?.load(data.queue.next.streamUrl, 'append');
}
}
@ -353,7 +353,7 @@ ipcMain.on('player-set-queue-next', async (_event, data: PlayerData) => {
await getMpvInstance()?.playlistRemove(1);
}
if (data.queue.next) {
if (data.queue.next?.streamUrl) {
await getMpvInstance()?.load(data.queue.next.streamUrl, 'append');
}
} catch (err: NodeMpvError | any) {
@ -373,7 +373,7 @@ ipcMain.on('player-auto-next', async (_event, data: PlayerData) => {
getMpvInstance()?.pause();
});
if (data.queue.next) {
if (data.queue.next?.streamUrl) {
await getMpvInstance()?.load(data.queue.next.streamUrl, 'append');
}
} catch (err: NodeMpvError | any) {

14
src/main/features/linux/mpris.ts
View file

@ -18,22 +18,29 @@ mprisPlayer.on('quit', () => {
process.exit();
});
const hasData = (): boolean => {
return mprisPlayer.metadata && !!mprisPlayer.metadata['mpris:length'];
};
mprisPlayer.on('stop', () => {
getMainWindow()?.webContents.send('renderer-player-stop');
mprisPlayer.playbackStatus = 'Paused';
});
mprisPlayer.on('pause', () => {
if (!hasData()) return;
getMainWindow()?.webContents.send('renderer-player-pause');
mprisPlayer.playbackStatus = 'Paused';
});
mprisPlayer.on('play', () => {
if (!hasData()) return;
getMainWindow()?.webContents.send('renderer-player-play');
mprisPlayer.playbackStatus = 'Playing';
});
mprisPlayer.on('playpause', () => {
if (!hasData()) return;
getMainWindow()?.webContents.send('renderer-player-play-pause');
if (mprisPlayer.playbackStatus !== 'Playing') {
mprisPlayer.playbackStatus = 'Playing';
@ -43,6 +50,7 @@ mprisPlayer.on('playpause', () => {
});
mprisPlayer.on('next', () => {
if (!hasData()) return;
getMainWindow()?.webContents.send('renderer-player-next');
if (mprisPlayer.playbackStatus !== 'Playing') {
@ -51,6 +59,7 @@ mprisPlayer.on('next', () => {
});
mprisPlayer.on('previous', () => {
if (!hasData()) return;
getMainWindow()?.webContents.send('renderer-player-previous');
if (mprisPlayer.playbackStatus !== 'Playing') {
@ -136,7 +145,10 @@ ipcMain.on('update-song', (_event, args: SongUpdate) => {
mprisPlayer.shuffle = shuffle;
}
if (!song) return;
if (!song) {
mprisPlayer.metadata = {};
return;
}
const upsizedImageUrl = song.imageUrl
? song.imageUrl