renamed stopAfterCurrent -> pauseAfterCurrent

backend/app.go

@@ -598,8 +598,8 @@ func (a *App) checkFlagsAndSendIPCMsg(cli *ipc.Client) error {
 		return cli.SeekNext()
 	case *FlagStop:
 		return cli.Stop()
-	case *FlagStopAfterCurrent:
+	case *FlagPauseAfterCurrent:
-		return cli.StopAfterCurrent()
+		return cli.PauseAfterCurrent()
 	case *FlagShow:
 		return cli.Show()
 	case VolumeCLIArg >= 0:

backend/cmdlineoptions.go

@@ -28,7 +28,7 @@ var (
 	FlagPrevious          = flag.Bool("previous", false, "seek to previous track or beginning of current")
 	FlagNext              = flag.Bool("next", false, "seek to next track")
 	FlagStop              = flag.Bool("stop", false, "stop playback")
-	FlagStopAfterCurrent = flag.Bool("stop-after-current", false, "stop playback after current track")
+	FlagPauseAfterCurrent = flag.Bool("pause-after-current", false, "pause playback after current track")
 	FlagStartMinimized    = flag.Bool("start-minimized", false, "start app minimized")
 	FlagShow              = flag.Bool("show", false, "show minimized app")
 	FlagShuffle           = flag.Bool("shuffle", false, "shuffle the tracklist (to be used with either -play-album-by-id or -play-playlist-by-id)")

backend/ipc/api.go

@@ -18,7 +18,7 @@ const (
 	PlayPausePath         = "/transport/playpause"
 	PausePath             = "/transport/pause"
 	StopPath              = "/transport/stop"
-	StopAfterCurrentPath = "/transport/stop-after-current"
+	PauseAfterCurrentPath = "/transport/pause-after-current"
 	PreviousPath          = "/transport/previous"
 	NextPath              = "/transport/next"
 	TimePosPath           = "/transport/timepos" // ?s=<seconds>

backend/ipc/client.go

@@ -83,8 +83,8 @@ func (c *Client) Stop() error {
 	return err
 }
 
-func (c *Client) StopAfterCurrent() error {
+func (c *Client) PauseAfterCurrent() error {
-	_, err := c.sendRequest(StopAfterCurrentPath)
+	_, err := c.sendRequest(PauseAfterCurrentPath)
 	return err
 }
 

backend/ipc/server.go

@@ -21,7 +21,7 @@ type PlaybackHandler interface {
 	Continue()
 	SeekBackOrPrevious()
 	SeekNext()
-	SetStopAfterCurrent(bool)
+	SetPauseAfterCurrent(bool)
 	SeekSeconds(float64)
 	SeekBySeconds(float64)
 	Volume() int
@@ -83,8 +83,8 @@ 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() {
+	m.HandleFunc(PauseAfterCurrentPath, s.makeSimpleEndpointHandler(func() {
-		s.pbHandler.SetStopAfterCurrent(true)
+		s.pbHandler.SetPauseAfterCurrent(true)
 	}))
 	m.HandleFunc(PreviousPath, s.makeSimpleEndpointHandler(s.pbHandler.SeekBackOrPrevious))
 	m.HandleFunc(NextPath, s.makeSimpleEndpointHandler(s.pbHandler.SeekNext))

backend/playbackengine.go

@@ -66,7 +66,7 @@ type playbackEngine struct {
 	isRadio       bool
 	loopMode      LoopMode
 
-	stopAfterCurrent bool // flag to stop playback after current track ends
+	pauseAfterCurrent bool // flag to pause playback after current track ends
 
 	// flags for handleOnTrackChange / handleOnStopped callbacks - reset to false in the callbacks
 	wasStopped       bool // true iff player was stopped before handleOnTrackChange invocation
@@ -337,8 +337,8 @@ func (p *playbackEngine) Stop() error {
 	return p.player.Stop(false)
 }
 
-func (p *playbackEngine) SetStopAfterCurrent(stopAfterCurrent bool) {
+func (p *playbackEngine) SetPauseAfterCurrent(pauseAfterCurrent bool) {
-	p.stopAfterCurrent = stopAfterCurrent
+	p.pauseAfterCurrent = pauseAfterCurrent
 }
 
 func (p *playbackEngine) Pause() error {
@@ -641,7 +641,7 @@ func (p *playbackEngine) handleOnStopped() {
 	p.alreadyScrobbled = false
 	p.wasStopped = true
 	p.nowPlayingIdx = -1
-	p.stopAfterCurrent = false
+	p.pauseAfterCurrent = false
 }
 
 // to be invoked as soon as the next item in the queue that should play changes

backend/playbackmanager.go

@@ -135,9 +135,9 @@ func (p *PlaybackManager) addOnTrackChangeHook() {
 					p.cmdQueue.addCommand(playbackCommand{Type: cmdForceRestartPlayback})
 				}
 
-				if p.engine.stopAfterCurrent {
+				if p.engine.pauseAfterCurrent {
 					p.Pause()
-					p.engine.SetStopAfterCurrent(false)
+					p.engine.SetPauseAfterCurrent(false)
 				}
 			}()
 		}
@@ -692,12 +692,12 @@ func (p *PlaybackManager) PlayPause() {
 	}
 }
 
-func (p *PlaybackManager) SetStopAfterCurrent(stopAfterCurrent bool) {
+func (p *PlaybackManager) SetPauseAfterCurrent(pauseAfterCurrent bool) {
-	p.engine.SetStopAfterCurrent(stopAfterCurrent)
+	p.engine.SetPauseAfterCurrent(pauseAfterCurrent)
 }
 
-func (p *PlaybackManager) IsStopAfterCurrent() bool {
+func (p *PlaybackManager) IsPauseAfterCurrent() bool {
-	return p.engine.stopAfterCurrent
+	return p.engine.pauseAfterCurrent
 }
 
 func (p *PlaybackManager) enqueueAutoplayTracks() {

res/translations/en.json

@@ -228,7 +228,7 @@
     "Soundtrack": "Soundtrack",
     "Spoken Word": "Spoken Word",
     "Startup page": "Startup page",
-    "Stop after current track": "Stop after current track",
+    "Pause after current track": "Pause after current track",
     "Stopped": "Stopped",
     "Success": "Success",
     "Successfully created playlist": "Successfully created playlist",

res/translations/fr.json

@@ -219,7 +219,7 @@
     "Soundtrack": "Bande originale",
     "Spoken Word": "Spoken Word",
     "Startup page": "Page de démarrage",
-    "Stop after current track": "Arrêter après la piste en cours",
+    "Pause after current track": "Arrêter après la piste en cours",
     "Stopped": "Arrêté",
     "Success": "Succès",
     "Support the project": "Soutenir le projet",
@@ -283,7 +283,6 @@
     "Oct": "Oct",
     "Nov": "Nov",
     "Dec": "Déc",
-
     "playlist.addedtracks": {
         "one": "Une piste ajoutée à la liste de lecture",
         "other": "{{.trackCount}} pistes ajoutées à la liste de lecture"

ui/controller/controller.go

@@ -59,7 +59,7 @@ type Controller struct {
 
 	popUpQueue         *widget.PopUp
 	popUpQueueList     *widgets.PlayQueueList
-	stopAfterCurrent   *widget.Check
+	pauseAfterCurrent  *widget.Check
 	popUpQueueLastUsed int64
 	escapablePopUp     fyne.CanvasObject
 	haveModal          bool
@@ -198,10 +198,10 @@ func (m *Controller) ShowPopUpPlayQueue() {
 		title := widget.NewRichTextWithText(lang.L("Play Queue"))
 		title.Segments[0].(*widget.TextSegment).Style.Alignment = fyne.TextAlignCenter
 		title.Segments[0].(*widget.TextSegment).Style.TextStyle.Bold = true
-		m.stopAfterCurrent = widget.NewCheck(lang.L("Stop after current track"), func(b bool) {
+		m.pauseAfterCurrent = widget.NewCheck(lang.L("Pause after current track"), func(b bool) {
-			m.App.PlaybackManager.SetStopAfterCurrent(b)
+			m.App.PlaybackManager.SetPauseAfterCurrent(b)
 		})
-		bottomRow := container.NewHBox(layout.NewSpacer(), m.stopAfterCurrent)
+		bottomRow := container.NewHBox(layout.NewSpacer(), m.pauseAfterCurrent)
 		ctr := container.NewBorder(title, bottomRow, nil, nil,
 			container.NewPadded(m.popUpQueueList),
 		)
@@ -231,7 +231,7 @@ func (m *Controller) ShowPopUpPlayQueue() {
 						fynetooltip.DestroyPopUpToolTipLayer(m.popUpQueue)
 						m.popUpQueue = nil
 						m.popUpQueueList = nil
-						m.stopAfterCurrent = nil
+						m.pauseAfterCurrent = nil
 						m.popUpQueueLastUsed = 0
 						t.Stop()
 						return
@@ -260,7 +260,7 @@ func (m *Controller) ShowPopUpPlayQueue() {
 	))
 	pop.Resize(size)
 	popUpQueueList.ScrollToNowPlaying() // must come after resize
-	m.stopAfterCurrent.SetChecked(m.App.PlaybackManager.IsStopAfterCurrent())
+	m.pauseAfterCurrent.SetChecked(m.App.PlaybackManager.IsPauseAfterCurrent())
 	pop.ShowAtPosition(fyne.NewPos(
 		canvasSize.Width-size.Width-10,
 		canvasSize.Height-size.Height-100,