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

add implementations for several mpris methods

Browse Source
This commit is contained in:
Drew Weymouth
2023-07-12 17:41:16 -07:00
parent 1ce8442138
commit 2a17718969
3 changed files with 98 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app.go
+2 -2
View File
@@ -51,7 +51,7 @@ func (a *App) VersionTag() string {
return a.appVersionTag
}
func StartupApp(appName, appVersionTag, configFile, latestReleaseURL string) (*App, error) {
func StartupApp(appName, displayAppName, appVersionTag, configFile, latestReleaseURL string) (*App, error) {
sessionPath := configdir.LocalConfig(appName, sessionDir)
if _, err := os.Stat(path.Join(sessionPath, sessionLockFile)); err == nil {
log.Println("Another instance is running. Reactivating it...")
@@ -104,7 +104,7 @@ func StartupApp(appName, appVersionTag, configFile, latestReleaseURL string) (*A
_, _ = a.ImageManager.GetCoverThumbnail(coverID)
})
a.MPRISHandler = NewMPRISHandler(a.Player, a.PlaybackManager)
a.MPRISHandler = NewMPRISHandler(displayAppName, a.Player, a.PlaybackManager)
a.MPRISHandler.Start()
return a, nil
backend/mpris.go
+95 -26
View File
@@ -2,13 +2,18 @@ package backend
import (
"errors"
"fmt"
"github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/player"
"github.com/godbus/dbus/v5"
"github.com/quarckster/go-mpris-server/pkg/events"
"github.com/quarckster/go-mpris-server/pkg/server"
"github.com/quarckster/go-mpris-server/pkg/types"
)
const dbusTrackIDPrefix = "/Supersonic/Track/"
var (
_ types.OrgMprisMediaPlayer2Adapter = (*MPRISHandler)(nil)
_ types.OrgMprisMediaPlayer2PlayerAdapter = (*MPRISHandler)(nil)
@@ -18,23 +23,36 @@ var (
)
type MPRISHandler struct {
p *player.Player
pm *PlaybackManager
s *server.Server
evt *events.EventHandler
// Function called if the player is requested to quit through MPRIS.
// Should *asynchronously* start shutdown and return immediately true if a shutdown will happen.
OnQuit func() error
// Function called if the player is requested to bring its UI to the front.
OnRaise func() error
// Function to look up the artwork URL for a given track ID
ArtURLLookup func(trackID string) string
playerName string
p *player.Player
pm *PlaybackManager
s *server.Server
evt *events.EventHandler
}
func NewMPRISHandler(p *player.Player, pm *PlaybackManager) *MPRISHandler {
m := &MPRISHandler{p: p, pm: pm}
m.s = server.NewServer("Supersonic", m, m)
func NewMPRISHandler(playerName string, p *player.Player, pm *PlaybackManager) *MPRISHandler {
m := &MPRISHandler{playerName: playerName, p: p, pm: pm}
m.s = server.NewServer(playerName, m, m)
m.evt = events.NewEventHandler(m.s)
return m
}
// Starts listening for MPRIS events.
func (m *MPRISHandler) Start() {
go m.s.Listen()
}
// Stops listening for MPRIS events and releases any D-Bus resources.
func (m *MPRISHandler) Shutdown() {
m.s.Stop()
}
@@ -42,23 +60,29 @@ func (m *MPRISHandler) Shutdown() {
// OrgMprisMediaPlayer2Adapter implementation
func (m *MPRISHandler) Identity() (string, error) {
return "supersonic", nil
return m.playerName, nil
}
func (m *MPRISHandler) CanQuit() (bool, error) {
return false, nil
return m.OnQuit != nil, nil
}
func (m *MPRISHandler) Quit() error {
return errors.New("not implemented")
if m.OnQuit != nil {
return m.OnQuit()
}
return errors.New("no quit handler added")
}
func (m *MPRISHandler) CanRaise() (bool, error) {
return false, nil
return m.OnRaise != nil, nil
}
func (m *MPRISHandler) Raise() error {
return errors.New("not implemented")
if m.OnRaise != nil {
return m.OnRaise()
}
return errors.New("no raise handler added")
}
func (m *MPRISHandler) HasTrackList() (bool, error) {
@@ -84,7 +108,10 @@ func (m *MPRISHandler) Previous() error {
}
func (m *MPRISHandler) Pause() error {
return notImplemented
if m.p.GetStatus().State == player.Playing {
return m.p.PlayPause()
}
return nil
}
func (m *MPRISHandler) PlayPause() error {
@@ -92,15 +119,21 @@ func (m *MPRISHandler) PlayPause() error {
}
func (m *MPRISHandler) Stop() error {
return notImplemented
return m.p.Stop()
}
func (m *MPRISHandler) Play() error {
return notImplemented
switch m.p.GetStatus().State {
case player.Paused:
return m.p.PlayPause()
case player.Stopped:
return m.p.PlayFromBeginning()
}
return nil
}
func (m *MPRISHandler) Seek(offset types.Microseconds) error {
return notImplemented
return m.p.Seek(fmt.Sprintf("%0.2f", float64(offset)/1_000_000), player.SeekRelative)
}
func (m *MPRISHandler) SetPosition(trackId string, position types.Microseconds) error {
@@ -112,11 +145,19 @@ func (m *MPRISHandler) OpenUri(uri string) error {
}
func (m *MPRISHandler) PlaybackStatus() (types.PlaybackStatus, error) {
return "", notImplemented
switch m.p.GetStatus().State {
case player.Playing:
return types.PlaybackStatusPlaying, nil
case player.Paused:
return types.PlaybackStatusPaused, nil
case player.Stopped:
return types.PlaybackStatusStopped, nil
}
return "", errors.New("unknown playback status")
}
func (m *MPRISHandler) Rate() (float64, error) {
return 0, notImplemented
return 1, nil
}
func (m *MPRISHandler) SetRate(float64) error {
@@ -124,11 +165,35 @@ func (m *MPRISHandler) SetRate(float64) error {
}
func (m *MPRISHandler) Metadata() (types.Metadata, error) {
return types.Metadata{}, notImplemented
status := m.p.GetStatus()
var tr mediaprovider.Track
if np := m.pm.NowPlaying(); np != nil && status.State != player.Stopped {
tr = *np
}
var trackID string
if tr.ID != "" {
trackID = dbusTrackIDPrefix + tr.ID
}
var artURL string
if tr.ID != "" && m.ArtURLLookup != nil {
artURL = m.ArtURLLookup(tr.ID)
}
return types.Metadata{
TrackId: dbus.ObjectPath(trackID),
Length: types.Microseconds(status.Duration),
Title: tr.Name,
Album: tr.Album,
Artist: tr.ArtistNames,
DiscNumber: tr.DiscNumber,
TrackNumber: tr.TrackNumber,
Genre: []string{tr.Genre},
UserRating: float64(tr.Rating) / 5,
ArtUrl: artURL,
}, nil
}
func (m *MPRISHandler) Volume() (float64, error) {
return 0, notImplemented
return float64(m.p.GetVolume()) / 100, nil
}
func (m *MPRISHandler) SetVolume(float64) error {
@@ -136,7 +201,7 @@ func (m *MPRISHandler) SetVolume(float64) error {
}
func (m *MPRISHandler) Position() (int64, error) {
return 0, notImplemented
return int64(secondsToMicroseconds(m.p.GetStatus().TimePos)), nil
}
func (m *MPRISHandler) MinimumRate() (float64, error) {
@@ -148,19 +213,19 @@ func (m *MPRISHandler) MaximumRate() (float64, error) {
}
func (m *MPRISHandler) CanGoNext() (bool, error) {
return false, notImplemented
return true, nil
}
func (m *MPRISHandler) CanGoPrevious() (bool, error) {
return false, notImplemented
return true, nil
}
func (m *MPRISHandler) CanPlay() (bool, error) {
return false, notImplemented
return true, nil
}
func (m *MPRISHandler) CanPause() (bool, error) {
return false, notImplemented
return true, nil
}
func (m *MPRISHandler) CanSeek() (bool, error) {
@@ -168,5 +233,9 @@ func (m *MPRISHandler) CanSeek() (bool, error) {
}
func (m *MPRISHandler) CanControl() (bool, error) {
return false, notImplemented
return true, nil
}
func secondsToMicroseconds(s float64) types.Microseconds {
return types.Microseconds(s * 1_000_000)
}
main.go
+1 -1
View File
@@ -23,7 +23,7 @@ const (
)
func main() {
myApp, err := backend.StartupApp(appname, appVersionTag, configFile, latestReleaseURL)
myApp, err := backend.StartupApp(appname, displayName, appVersionTag, configFile, latestReleaseURL)
if err != nil {
log.Fatalf("fatal startup error: %v", err.Error())
}