diff options
| author | Louis Burda <quent.burda@gmail.com> | 2022-05-04 00:57:14 +0200 |
|---|---|---|
| committer | Louis Burda <quent.burda@gmail.com> | 2022-05-04 00:57:14 +0200 |
| commit | 3862d00855b93034019cff9a5fdec8a62117fbfa (patch) | |
| tree | 81d6f95e021a4922016b1216a95e621cc4c6c3ef /src | |
| parent | e739524bfd5549df43ac6219eea30705995a04c3 (diff) | |
| download | tmus-3862d00855b93034019cff9a5fdec8a62117fbfa.tar.gz tmus-3862d00855b93034019cff9a5fdec8a62117fbfa.zip | |
Implement fix for volume resetting in pipewire
Diffstat (limited to 'src')
| -rw-r--r-- | src/player_mpd.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/player_mpd.c b/src/player_mpd.c index ae227a7..092ee4b 100644 --- a/src/player_mpd.c +++ b/src/player_mpd.c @@ -121,7 +121,7 @@ player_init(void) player.shuffle = true; player.state = PLAYER_STATE_PAUSED; - player.volume = 0; + player.volume = 50; player.time_pos = 0; player.time_end = 0; @@ -146,18 +146,20 @@ player_deinit(void) void player_update(void) { + static bool init = false; struct mpd_status *status; struct mpd_song *current_song; bool queue_empty; if (!mpd.conn) { + if (init) PLAYER_STATUS(ERR, "MPD: Connection reset"); + init = true; mpd.conn = mpd_connection_new(NULL, 0, 0); - if (!mpd.conn) ERROR("MPD: Connect to server failed\n"); + if (!mpd.conn) ERROR("MPD: Connection failed\n"); } status = mpd_run_status(mpd.conn); if (!status) { - PLAYER_STATUS(ERR, "Resetting MPD server connection"); mpd_connection_free(mpd.conn); mpd.conn = NULL; return; @@ -218,7 +220,10 @@ player_update(void) PANIC(); } - player.volume = mpd_status_get_volume(status); + if (player.volume >= 0 && player.volume != mpd_status_get_volume(status)) + mpd_run_set_volume(mpd.conn, player.volume); + else + player.volume = mpd_status_get_volume(status); if (mpd.seek_delay) { mpd.seek_delay -= 1; @@ -368,6 +373,7 @@ player_set_volume(unsigned int vol) status = mpd_run_set_volume(mpd.conn, vol); if (!mpd_handle_status(status)) return PLAYER_STATUS_ERR; + player.volume = vol; return PLAYER_STATUS_OK; } |