Merge branch 'main' into feature/shuffle

backend/app.go

@@ -384,6 +384,7 @@ func (a *App) setupMPV() error {
 		PreampGain:      a.Config.ReplayGain.PreampGainDB,
 	})
 	a.LocalPlayer.SetAudioExclusive(a.Config.LocalPlayback.AudioExclusive)
+	a.LocalPlayer.SetPauseFade(a.Config.LocalPlayback.PauseFade)
 
 	eq := &mpv.ISO15BandEqualizer{
 		EQPreamp: a.Config.LocalPlayback.EqualizerPreamp,

backend/config.go

@@ -136,6 +136,7 @@ type LocalPlaybackConfig struct {
 	EqualizerEnabled      bool
 	EqualizerPreamp       float64
 	GraphicEqualizerBands []float64
+	PauseFade             bool
 }
 
 type ScrobbleConfig struct {
@@ -270,6 +271,7 @@ func DefaultConfig(appVersionTag string) *Config {
 			EqualizerEnabled:      false,
 			EqualizerPreamp:       0,
 			GraphicEqualizerBands: make([]float64, 15),
+			PauseFade:             true,
 		},
 		Scrobbling: ScrobbleConfig{
 			Enabled:              true,

backend/player/mpv/player.go

@@ -69,6 +69,7 @@ type Player struct {
 	clientName     string
 	equalizer      Equalizer
 	peaksEnabled   bool
+	pauseFade      bool
 
 	fileLoadedLock sync.Mutex
 	fileLoadedSig  *sync.Cond
@@ -283,6 +284,10 @@ func (p *Player) SetAudioExclusive(tf bool) {
 	}
 }
 
+func (p *Player) SetPauseFade(pauseFade bool) {
+	p.pauseFade = pauseFade
+}
+
 // Gets the current volume of the player.
 func (p *Player) GetVolume() int {
 	return p.vol
@@ -308,27 +313,37 @@ func (p *Player) Pause() error {
 	if p.status.State != player.Playing {
 		return nil
 	}
-	p.prePausedState = p.status.State
-	p.setState(player.Paused)
 
-	v := p.vol
-	ctx, cancel := context.WithCancel(context.Background())
-	p.fadePauseCancel = cancel
-	go func() {
-		t := time.NewTicker(2 * time.Millisecond)
-		for c := 0; c < 100; c++ {
-			select {
-			case <-ctx.Done():
-				return
-			case <-t.C:
-				p.mpv.SetProperty("volume", mpv.FORMAT_INT64, int64(v*(100-c)/100))
+	if p.pauseFade {
+		p.prePausedState = p.status.State
+		p.setState(player.Paused)
+
+		v := p.vol
+		ctx, cancel := context.WithCancel(context.Background())
+		p.fadePauseCancel = cancel
+		go func() {
+			t := time.NewTicker(2 * time.Millisecond)
+			for c := 0; c < 100; c++ {
+				select {
+				case <-ctx.Done():
+					return
+				case <-t.C:
+					p.mpv.SetProperty("volume", mpv.FORMAT_INT64, int64(v*(100-c)/100))
+				}
 			}
+			t.Stop()
+			p.SetVolume(p.vol)
+			p.setPaused(true)
+		}()
+		return nil
+	} else {
+		err := p.setPaused(true)
+		if err == nil {
+			p.prePausedState = p.status.State
+			p.setState(player.Paused)
 		}
-		t.Stop()
-		p.SetVolume(p.vol)
-		p.setPaused(true)
-	}()
-	return nil
+		return err
+	}
 }
 
 // Continue playback and update the player state