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

module/mpd: export module info through the new module_info struct type

Browse source
This commit is contained in:
Daniel Eklöf 2019-01-12 12:52:16 +01:00
parent fb9f07dcad
commit a16e2f5a53
4 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/mpd/mpd.c
View file

@ -18,6 +18,7 @@
#define LOG_ENABLE_DBG 0
#include "../../log.h"
#include "../../bar.h"
#include "../../config.h"
enum state {
STATE_OFFLINE = 1000,
@ -451,8 +452,8 @@ refresh_in(struct module *mod, long milli_seconds)
return r == 0;
}
struct module *
module_mpd(const char *host, uint16_t port, struct particle *label)
static struct module *
mpd_new(const char *host, uint16_t port, struct particle *label)
{
struct private *priv = malloc(sizeof(*priv));
priv->host = strdup(host);
@ -478,3 +479,28 @@ module_mpd(const char *host, uint16_t port, struct particle *label)
mod->refresh_in = &refresh_in;
return mod;
}
static struct module *
from_conf(const struct yml_node *node, const struct font *parent_font)
{
const struct yml_node *host = yml_get_value(node, "host");
const struct yml_node *port = yml_get_value(node, "port");
const struct yml_node *c = yml_get_value(node, "content");
return mpd_new(
yml_value_as_string(host),
port != NULL ? yml_value_as_int(port) : 0,
conf_to_particle(c, parent_font));
}
const struct module_info module_mpd = {
.from_conf = &from_conf,
.attr_count = 4,
.attrs = {
{"host", true, &conf_verify_string},
{"port", false, &conf_verify_int},
{"content", true, &conf_verify_particle},
{"anchors", false, NULL},
{NULL, false, NULL},
},
};