diff options
| author | Louis Burda <quent.burda@gmail.com> | 2022-05-12 12:08:50 +0200 |
|---|---|---|
| committer | Louis Burda <quent.burda@gmail.com> | 2022-05-12 12:08:50 +0200 |
| commit | bdd07eec829df74c49f2929c19bd0a649f72b7d0 (patch) | |
| tree | 74f09d4fb82496dda50623891cc4e39a437c12fb /src | |
| parent | 3862d00855b93034019cff9a5fdec8a62117fbfa (diff) | |
| download | tmus-bdd07eec829df74c49f2929c19bd0a649f72b7d0.tar.gz tmus-bdd07eec829df74c49f2929c19bd0a649f72b7d0.zip | |
Remove volume patch for upstream volume resetting bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/player_mpd.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/player_mpd.c b/src/player_mpd.c index 092ee4b..b2c7289 100644 --- a/src/player_mpd.c +++ b/src/player_mpd.c @@ -146,20 +146,19 @@ 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: Connection failed\n"); } status = mpd_run_status(mpd.conn); if (!status) { + PLAYER_STATUS(ERR, "MPD connection reset: %s", + mpd_connection_get_error_message(mpd.conn)); mpd_connection_free(mpd.conn); mpd.conn = NULL; return; @@ -183,7 +182,8 @@ player_update(void) * get status and track name again.. */ status = mpd_run_status(mpd.conn); if (!status) { - PLAYER_STATUS(ERR, "Resetting MPD server connection"); + PLAYER_STATUS(ERR, "MPD connection reset: %s", + mpd_connection_get_error_message(mpd.conn)); mpd_connection_free(mpd.conn); mpd.conn = NULL; return; @@ -220,10 +220,7 @@ player_update(void) PANIC(); } - 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); + player.volume = mpd_status_get_volume(status); if (mpd.seek_delay) { mpd.seek_delay -= 1; |