From 9385008dc26fdc69f3efcfba4c3c28c8e36f6a0d Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Wed, 2 Feb 2022 10:28:55 +0000 Subject: [PATCH] Updated Cider preload functions and MPRIS to reflect this --- src/main/plugins/mpris.ts | 10 +++++----- src/preload/cider-preload.js | 20 ++++++++++++++------ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/plugins/mpris.ts b/src/main/plugins/mpris.ts index 869cbceb..c1f92652 100644 --- a/src/main/plugins/mpris.ts +++ b/src/main/plugins/mpris.ts @@ -21,11 +21,11 @@ export default class MPRIS { */ private mpris: any; private mprisEvents: Object = { - "playpause": "pausePlay", - "play": "pausePlay", - "pause": "pausePlay", - "next": "nextTrack", - "previous": "previousTrack", + "playpause": "playPause", + "play": "play", + "pause": "pause", + "next": "next", + "previous": "previous", } /******************************************************************************************* diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js index 0f55e657..03c9b10a 100644 --- a/src/preload/cider-preload.js +++ b/src/preload/cider-preload.js @@ -88,20 +88,28 @@ const MusicKitInterop = { return true; }, - pausePlay: function () { + play: () => { + MusicKit.getInstance().play().then(r => console.log(`[MusicKitInterop.play] ${r}`)); + }, + + pause: () => { + MusicKit.getInstance().pause(); + }, + + playPause: () => { if (MusicKit.getInstance().isPlaying) { MusicKit.getInstance().pause(); } else if (MusicKit.getInstance().nowPlayingItem != null) { - MusicKit.getInstance().play().then(r => console.log(`[MusicKitInterop] Playing ${r}`)); + MusicKit.getInstance().play().then(r => console.log(`[MusicKitInterop.playPause] Playing ${r}`)); } }, - nextTrack: function () { - MusicKit.getInstance().skipToNextItem().then(r => console.log(`[MusicKitInterop] Skipping to Next ${r}`)); + next: () => { + MusicKit.getInstance().skipToNextItem().then(r => console.log(`[MusicKitInterop.next] Skipping to Next ${r}`)); }, - previousTrack: function () { - MusicKit.getInstance().skipToPreviousItem().then(r => console.log(`[MusicKitInterop] Skipping to Previous ${r}`)); + previous: () => { + MusicKit.getInstance().skipToPreviousItem().then(r => console.log(`[MusicKitInterop.previous] Skipping to Previous ${r}`)); } }