owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use no track object path instead of empty string

Browse Source
This commit is contained in:
Drew Weymouth
2023-07-17 17:01:03 -07:00
parent 96a9ea7b03
commit 36bc8ef57b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/mpris.go
+7 -4
View File
@@ -12,7 +12,10 @@ import (
"github.com/quarckster/go-mpris-server/pkg/types" "github.com/quarckster/go-mpris-server/pkg/types"
) )
const dbusTrackIDPrefix = "/Supersonic/Track/" const (
dbusTrackIDPrefix = "/Supersonic/Track/"
noTrackObjectPath = "/org/mpris/MediaPlayer2/TrackList/NoTrack"
)
var ( var (
_ types.OrgMprisMediaPlayer2Adapter = (*MPRISHandler)(nil) _ types.OrgMprisMediaPlayer2Adapter = (*MPRISHandler)(nil)
@@ -230,9 +233,9 @@ func (m *MPRISHandler) Metadata() (types.Metadata, error) {
if np := m.pm.NowPlaying(); np != nil && status.State != player.Stopped { if np := m.pm.NowPlaying(); np != nil && status.State != player.Stopped {
tr = *np tr = *np
} }
var trackID string trackObjPath := noTrackObjectPath
if tr.ID != "" { if tr.ID != "" {
trackID = dbusTrackIDPrefix + tr.ID trackObjPath = dbusTrackIDPrefix + tr.ID
} }
var artURL string var artURL string
if tr.ID != "" && m.ArtURLLookup != nil { if tr.ID != "" && m.ArtURLLookup != nil {
@@ -241,7 +244,7 @@ func (m *MPRISHandler) Metadata() (types.Metadata, error) {
} }
} }
return types.Metadata{ return types.Metadata{
TrackId: dbus.ObjectPath(trackID), TrackId: dbus.ObjectPath(trackObjPath),
Length: types.Microseconds(status.Duration), Length: types.Microseconds(status.Duration),
Title: tr.Name, Title: tr.Name,
Album: tr.Album, Album: tr.Album,