From 8a1a3795bcdb05df5644ccaec5a0671e782e0184 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Wed, 12 Jul 2023 18:14:20 -0700 Subject: [PATCH] uncomment events and fix artURL - will crash unless building against pull #4 in quarckster/go-mpris-server --- backend/mpris.go | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/backend/mpris.go b/backend/mpris.go index 12abd32..252b5ec 100644 --- a/backend/mpris.go +++ b/backend/mpris.go @@ -44,19 +44,21 @@ func NewMPRISHandler(playerName string, p *player.Player, pm *PlaybackManager) * m := &MPRISHandler{playerName: playerName, p: p, pm: pm} m.s = server.NewServer(playerName, m, m) m.evt = events.NewEventHandler(m.s) - /* - m.p.OnSeek(func() { - pos := secondsToMicroseconds(m.p.GetStatus().TimePos) - m.evt.Player.OnSeek(pos) - }) - m.pm.OnSongChange(func(_, _ *mediaprovider.Track) { - m.evt.Player.OnTitle() - }) - emitPlayStatus := func() { m.evt.Player.OnPlayPause() } - m.p.OnStopped(emitPlayStatus) - m.p.OnPlaying(emitPlayStatus) - m.p.OnPaused(emitPlayStatus) - */ + + m.p.OnSeek(func() { + pos := secondsToMicroseconds(m.p.GetStatus().TimePos) + m.evt.Player.OnSeek(pos) + }) + m.pm.OnSongChange(func(_, _ *mediaprovider.Track) { + m.evt.Player.OnTitle() + }) + emitPlayStatus := func() { + m.evt.Player.OnPlayPause() + } + m.p.OnStopped(emitPlayStatus) + m.p.OnPlaying(emitPlayStatus) + m.p.OnPaused(emitPlayStatus) + return m } @@ -189,7 +191,7 @@ func (m *MPRISHandler) Metadata() (types.Metadata, error) { } var artURL string if tr.ID != "" && m.ArtURLLookup != nil { - if u, err := m.ArtURLLookup(tr.ID); err == nil { + if u, err := m.ArtURLLookup(tr.CoverArtID); err == nil { artURL = u } }