Merge from main

backend/ipc/api.go

@@ -7,25 +7,26 @@ import (
 )
 
 const (
-	PingPath           = "/ping"
-	PlayPath           = "/transport/play"
-	PlayAlbumPath      = "/transport/play-album"      // ?id=<album ID>&t=<firstTrack>&s=<shuffle>
-	PlayPlaylistPath   = "/transport/play-playlist"   // ?id=<playlist ID>&t=<firstTrack>&s=<shuffle>
-	PlayTrackPath      = "/transport/play-track"      // ?id=<track ID>
-	SearchAlbumPath    = "/transport/search-album"    // ?s=<searchQuery>
-	SearchPlaylistPath = "/transport/search-playlist" // ?s=<searchQuery>
-	SearchTrackPath    = "/transport/search-track"    // ?s=<searchQuery>
-	PlayPausePath      = "/transport/playpause"
-	PausePath          = "/transport/pause"
-	StopPath           = "/transport/stop"
-	PreviousPath       = "/transport/previous"
-	NextPath           = "/transport/next"
-	TimePosPath        = "/transport/timepos" // ?s=<seconds>
-	SeekByPath         = "/transport/seek-by" // ?s=<+/- seconds>
-	VolumePath         = "/volume"            // ?v=<vol>
-	VolumeAdjustPath   = "/volume/adjust"     // ?pct=<+/- percentage>
-	ShowPath           = "/window/show"
-	QuitPath           = "/window/quit"
+	PingPath             = "/ping"
+	PlayPath             = "/transport/play"
+	PlayAlbumPath        = "/transport/play-album"      // ?id=<album ID>&t=<firstTrack>&s=<shuffle>
+	PlayPlaylistPath     = "/transport/play-playlist"   // ?id=<playlist ID>&t=<firstTrack>&s=<shuffle>
+	PlayTrackPath        = "/transport/play-track"      // ?id=<track ID>
+	SearchAlbumPath      = "/transport/search-album"    // ?s=<searchQuery>
+	SearchPlaylistPath   = "/transport/search-playlist" // ?s=<searchQuery>
+	SearchTrackPath      = "/transport/search-track"    // ?s=<searchQuery>
+	PlayPausePath        = "/transport/playpause"
+	PausePath            = "/transport/pause"
+	StopPath             = "/transport/stop"
+	StopAfterCurrentPath = "/transport/stop-after-current"
+	PreviousPath         = "/transport/previous"
+	NextPath             = "/transport/next"
+	TimePosPath          = "/transport/timepos" // ?s=<seconds>
+	SeekByPath           = "/transport/seek-by" // ?s=<+/- seconds>
+	VolumePath           = "/volume"            // ?v=<vol>
+	VolumeAdjustPath     = "/volume/adjust"     // ?pct=<+/- percentage>
+	ShowPath             = "/window/show"
+	QuitPath             = "/window/quit"
 )
 
 type Response struct {

backend/ipc/client.go

@@ -76,6 +76,16 @@ func (c *Client) PlayPause() error {
 	return err
 }
 
+func (c *Client) Stop() error {
+	_, err := c.sendRequest(StopPath)
+	return err
+}
+
+func (c *Client) StopAfterCurrent() error {
+	_, err := c.sendRequest(StopAfterCurrentPath)
+	return err
+}
+
 func (c *Client) SeekNext() error {
 	_, err := c.sendRequest(NextPath)
 	return err

backend/ipc/server.go

@@ -18,6 +18,7 @@ type PlaybackHandler interface {
 	Continue()
 	SeekBackOrPrevious()
 	SeekNext()
+	SetStopAfterCurrent(bool)
 	SeekSeconds(float64)
 	SeekBySeconds(float64)
 	Volume() int
@@ -75,6 +76,9 @@ func (s *serverImpl) createHandler() http.Handler {
 	m.HandleFunc(PausePath, s.makeSimpleEndpointHandler(s.pbHandler.Pause))
 	m.HandleFunc(PlayPausePath, s.makeSimpleEndpointHandler(s.pbHandler.PlayPause))
 	m.HandleFunc(StopPath, s.makeSimpleEndpointHandler(s.pbHandler.Stop))
+	m.HandleFunc(StopAfterCurrentPath, s.makeSimpleEndpointHandler(func() {
+		s.pbHandler.SetStopAfterCurrent(true)
+	}))
 	m.HandleFunc(PreviousPath, s.makeSimpleEndpointHandler(s.pbHandler.SeekBackOrPrevious))
 	m.HandleFunc(NextPath, s.makeSimpleEndpointHandler(s.pbHandler.SeekNext))
 	m.HandleFunc(TimePosPath, s.makeFloatEndpointHandler("s", s.pbHandler.SeekSeconds))