feat: remember last volume set

Closes #147

Author: devgianlu

README.md

@@ -167,6 +167,7 @@ audio_output_pipe_format: s16le # Audio output pipe format (s16le, s32le, f32le)
 bitrate: 160 # Playback bitrate (96, 160, 320)
 volume_steps: 100 # Volume steps count
 initial_volume: 100 # Initial volume in steps (not applied to the mixer device)
+ignore_last_volume: false # Whether to ignore the last saved volume and always use initial_volume
 external_volume: false # Whether volume is controlled externally 
 disable_autoplay: false # Whether autoplay of more songs should be disabled
 ```

cmd/daemon/controls.go

@@ -663,6 +663,12 @@ func (p *AppPlayer) updateVolume(newVal uint32) {
 	p.app.log.Debugf("update volume requested to %d/%d", newVal, player.MaxStateVolume)
 	p.player.SetVolume(newVal)
 
+	// Save the volume to the state
+	p.app.state.LastVolume = &newVal
+	if err := p.app.state.Write(); err != nil {
+		p.app.log.WithError(err).Error("failed writing state after volume change")
+	}
+
 	// If there is a value in the channel buffer, remove it.
 	select {
 	case <-p.volumeUpdate:

cmd/daemon/main.go

@@ -383,6 +383,7 @@ type Config struct {
 	Bitrate                       int       `koanf:"bitrate"`
 	VolumeSteps                   uint32    `koanf:"volume_steps"`
 	InitialVolume                 uint32    `koanf:"initial_volume"`
+	IgnoreLastVolume              bool      `koanf:"ignore_last_volume"`
 	NormalisationDisabled         bool      `koanf:"normalisation_disabled"`
 	NormalisationUseAlbumGain     bool      `koanf:"normalisation_use_album_gain"`
 	NormalisationPregain          float32   `koanf:"normalisation_pregain"`

cmd/daemon/player.go

@@ -84,7 +84,11 @@ func (p *AppPlayer) handleDealerMessage(ctx context.Context, msg dealer.Message)
 		if !p.app.cfg.ExternalVolume && len(p.app.cfg.MixerDevice) == 0 {
 			// update initial volume
 			p.initialVolumeOnce.Do(func() {
-				p.updateVolume(p.app.cfg.InitialVolume * player.MaxStateVolume / p.app.cfg.VolumeSteps)
+				if lastVolume := p.app.state.LastVolume; !p.app.cfg.IgnoreLastVolume && lastVolume != nil {
+					p.updateVolume(*lastVolume)
+				} else {
+					p.updateVolume(p.app.cfg.InitialVolume * player.MaxStateVolume / p.app.cfg.VolumeSteps)
+				}
 			})
 		}
 	} else if strings.HasPrefix(msg.Uri, "hm://connect-state/v1/connect/volume") {

config_schema.json

@@ -232,6 +232,11 @@
           "min": 0,
           "default": 100
         },
+        "ignore_last_volume": {
+          "type": "boolean",
+          "description": "Whether the last saved volume should be ignored",
+          "default": false
+        },
         "normalisation_disabled": {
           "type": "boolean",
           "description": "Whether track/album normalisation should be disabled",

state.go

@@ -20,6 +20,7 @@ type AppState struct {
 		Username string `json:"username"`
 		Data     []byte `json:"data"`
 	} `json:"credentials"`
+	LastVolume *uint32 `json:"last_volume"`
 }
 
 func (s *AppState) SetLogger(log Logger) {