pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

module/mpd: remember *when* the 'elapsed' member was set.

Browse source 
This allows us to update the elapsed field without having to talk to
MPD.

In particular, it fixes a bug where we reported the same elapsed value
when we we're updated due to *other* modules calling bar->refresh().
This commit is contained in:
Daniel Eklöf 2018-12-28 12:45:35 +01:00
parent adb70e9f35
commit 89ebfa0dbb
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
modules/mpd/mpd.c
View file

@ -3,6 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h>
#include <assert.h> #include <assert.h>
#include <poll.h> #include <poll.h>
@ -31,7 +32,10 @@ struct private {
char *artist; char *artist;
char *title; char *title;
unsigned elapsed; struct {
unsigned value;
time_t when;
} elapsed;
unsigned duration; unsigned duration;
}; };
@ -56,6 +60,10 @@ content(struct module *mod)
{ {
struct private *m = mod->private; struct private *m = mod->private;
/* Calculate what elapsed is now */
time_t now = time(NULL);
unsigned elapsed = m->elapsed.value + (now - m->elapsed.when);
mtx_lock(&mod->lock); mtx_lock(&mod->lock);
const char *state_str = NULL; const char *state_str = NULL;
@ -68,14 +76,13 @@ content(struct module *mod)
char pos[16], end[16]; char pos[16], end[16];
if (m->elapsed >= 60 * 60) if (elapsed >= 60 * 60)
snprintf(pos, sizeof(pos), "%02u:%02u:%02u", snprintf(pos, sizeof(pos), "%02u:%02u:%02u",
m->elapsed / (60 * 60), elapsed / (60 * 60),
m->elapsed % (60 * 60) / 60, elapsed % (60 * 60) / 60,
m->elapsed % 60); elapsed % 60);
else else
snprintf(pos, sizeof(pos), "%02u:%02u", snprintf(pos, sizeof(pos), "%02u:%02u", elapsed / 60, elapsed % 60);
m->elapsed / 60, m->elapsed % 60);
if (m->duration >= 60 * 60) if (m->duration >= 60 * 60)
snprintf(end, sizeof(end), "%02u:%02u:%02u", snprintf(end, sizeof(end), "%02u:%02u:%02u",
@ -96,7 +103,7 @@ content(struct module *mod)
tag_new_string(mod, "end", end), tag_new_string(mod, "end", end),
tag_new_int(mod, "duration", m->duration), tag_new_int(mod, "duration", m->duration),
tag_new_int_realtime( tag_new_int_realtime(
"elapsed", m->elapsed, 0, m->duration, mod, "elapsed", elapsed, 0, m->duration,
m->state == STATE_PLAY ? TAG_REALTIME_SECONDS : TAG_REALTIME_NONE), m->state == STATE_PLAY ? TAG_REALTIME_SECONDS : TAG_REALTIME_NONE),
}, },
.count = 8, .count = 8,
@ -149,7 +156,8 @@ update_status(struct module *mod)
mtx_lock(&mod->lock); mtx_lock(&mod->lock);
m->state = mpd_status_get_state(status); m->state = mpd_status_get_state(status);
m->duration = mpd_status_get_total_time(status); m->duration = mpd_status_get_total_time(status);
m->elapsed = mpd_status_get_elapsed_time(status); m->elapsed.value = mpd_status_get_elapsed_time(status);
m->elapsed.when = now;
mtx_unlock(&mod->lock); mtx_unlock(&mod->lock);
mpd_status_free(status); mpd_status_free(status);
@ -208,7 +216,7 @@ run(struct module_run_context *ctx)
free(m->artist); m->artist = NULL; free(m->artist); m->artist = NULL;
free(m->title); m->title = NULL; free(m->title); m->title = NULL;
m->state = STATE_OFFLINE; m->state = STATE_OFFLINE;
m->elapsed = m->duration = 0; m->elapsed.value = m->elapsed.when = m->duration = 0;
mtx_unlock(&mod->lock); mtx_unlock(&mod->lock);
/* Keep trying to connect, until we succeed */ /* Keep trying to connect, until we succeed */
@ -291,7 +299,8 @@ module_mpd(const char *host, uint16_t port, struct particle *label)
priv->album = NULL; priv->album = NULL;
priv->artist = NULL; priv->artist = NULL;
priv->title = NULL; priv->title = NULL;
priv->elapsed = 0; priv->elapsed.value = 0;
priv->elapsed.when = 0;
priv->duration = 0; priv->duration = 0;
struct module *mod = module_common_new(); struct module *mod = module_common_new();