heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make getDecode more useful

Browse Source
This commit is contained in:
sentriz
2023-11-24 21:45:50 +00:00
parent 3d73a9f784
commit 5bc29f4e21
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jukebox/jukebox.go
View File

@@ -77,7 +77,7 @@ func (j *Jukebox) Start(sockPath string, mpvExtraArgs []string) error {
} }
var mpvVersionStr string var mpvVersionStr string
if err := j.getDecode(&mpvVersionStr, "mpv-version"); err != nil { if err := getDecode(j.conn, &mpvVersionStr, "mpv-version"); err != nil {
return fmt.Errorf("get mpv version: %w", err) return fmt.Errorf("get mpv version: %w", err)
} }
if major, minor, patch := parseMPVVersion(mpvVersionStr); major == 0 && minor < 34 { if major, minor, patch := parseMPVVersion(mpvVersionStr); major == 0 && minor < 34 {
@@ -104,7 +104,7 @@ func (j *Jukebox) GetPlaylist() ([]string, error) {
defer lockr(&j.mu)() defer lockr(&j.mu)()
var playlist mpvPlaylist var playlist mpvPlaylist
if err := j.getDecode(&playlist, "playlist"); err != nil { if err := getDecode(j.conn, &playlist, "playlist"); err != nil {
return nil, fmt.Errorf("get playlist: %w", err) return nil, fmt.Errorf("get playlist: %w", err)
} }
var items []string var items []string
@@ -118,7 +118,7 @@ func (j *Jukebox) SetPlaylist(items []string) error {
defer lock(&j.mu)() defer lock(&j.mu)()
var playlist mpvPlaylist var playlist mpvPlaylist
if err := j.getDecode(&playlist, "playlist"); err != nil { if err := getDecode(j.conn, &playlist, "playlist"); err != nil {
return fmt.Errorf("get playlist: %w", err) return fmt.Errorf("get playlist: %w", err)
} }
current, currentIndex := find(playlist, func(item mpvPlaylistItem) bool { current, currentIndex := find(playlist, func(item mpvPlaylistItem) bool {
@@ -260,7 +260,7 @@ func (j *Jukebox) GetVolumePct() (float64, error) {
defer lockr(&j.mu)() defer lockr(&j.mu)()
var volume float64 var volume float64
if err := j.getDecode(&volume, "volume"); err != nil { if err := getDecode(j.conn, &volume, "volume"); err != nil {
return 0, fmt.Errorf("get volume: %w", err) return 0, fmt.Errorf("get volume: %w", err)
} }
return volume, nil return volume, nil
@@ -279,11 +279,11 @@ func (j *Jukebox) GetStatus() (*Status, error) {
defer lockr(&j.mu)() defer lockr(&j.mu)()
var status Status var status Status
_ = j.getDecode(&status.Position, "time-pos") // property may not always be there _ = getDecode(j.conn, &status.Position, "time-pos") // property may not always be there
_ = j.getDecode(&status.GainPct, "volume") // property may not always be there _ = getDecode(j.conn, &status.GainPct, "volume") // property may not always be there
var playlist mpvPlaylist var playlist mpvPlaylist
_ = j.getDecode(&playlist, "playlist") _ = getDecode(j.conn, &playlist, "playlist")
status.CurrentIndex = slices.IndexFunc(playlist, func(pl mpvPlaylistItem) bool { status.CurrentIndex = slices.IndexFunc(playlist, func(pl mpvPlaylistItem) bool {
return pl.Current return pl.Current
@@ -298,7 +298,7 @@ func (j *Jukebox) GetStatus() (*Status, error) {
status.CurrentFilename = playlist[status.CurrentIndex].Filename status.CurrentFilename = playlist[status.CurrentIndex].Filename
var paused bool var paused bool
_ = j.getDecode(&paused, "pause") // property may not always be there _ = getDecode(j.conn, &paused, "pause") // property may not always be there
status.Playing = !paused status.Playing = !paused
return &status, nil return &status, nil
@@ -324,8 +324,8 @@ func (j *Jukebox) Quit() error {
return nil return nil
} }
func (j *Jukebox) getDecode(dest any, property string) error { func getDecode(conn *mpvipc.Connection, dest any, property string) error {
raw, err := j.conn.Get(property) raw, err := conn.Get(property)
if err != nil { if err != nil {
return fmt.Errorf("get property: %w", err) return fmt.Errorf("get property: %w", err)
} }