X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fxmms.c;h=87e3564fe70c4363285cbe8f1f77e4270924c4f1;hb=936c450a86c841eea89888c8550c9118fae90c25;hp=29f2acd0f630977b42d3dff37b59965e8b60be21;hpb=43aca8ed8b22a7a5a14f8c740948d6ce06efbc95;p=collectd.git diff --git a/src/xmms.c b/src/xmms.c index 29f2acd0..87e3564f 100644 --- a/src/xmms.c +++ b/src/xmms.c @@ -25,52 +25,46 @@ **/ #include "collectd.h" -#include "plugin.h" + #include "common.h" +#include "plugin.h" #include static gint xmms_session; -static void cxmms_submit (const char *type, gauge_t value) -{ - value_t values[1]; - value_list_t vl = VALUE_LIST_INIT; - - values[0].gauge = value; +static void cxmms_submit(const char *type, gauge_t value) { + value_list_t vl = VALUE_LIST_INIT; - vl.values = values; - vl.values_len = 1; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "xmms", sizeof (vl.plugin)); - sstrncpy (vl.type, type, sizeof (vl.type)); + vl.values = &(value_t){.gauge = value}; + vl.values_len = 1; + sstrncpy(vl.plugin, "xmms", sizeof(vl.plugin)); + sstrncpy(vl.type, type, sizeof(vl.type)); - plugin_dispatch_values (&vl); + plugin_dispatch_values(&vl); } /* void cxmms_submit */ -static int cxmms_read (void) -{ +static int cxmms_read(void) { gint rate; gint freq; gint nch; - if (!xmms_remote_is_running (xmms_session)) + if (!xmms_remote_is_running(xmms_session)) return (0); - xmms_remote_get_info (xmms_session, &rate, &freq, &nch); + xmms_remote_get_info(xmms_session, &rate, &freq, &nch); if ((freq == 0) || (nch == 0)) return (-1); - cxmms_submit ("bitrate", rate); - cxmms_submit ("frequency", freq); + cxmms_submit("bitrate", rate); + cxmms_submit("frequency", freq); return (0); } /* int read */ -void module_register (void) -{ - plugin_register_read ("xmms", cxmms_read); +void module_register(void) { + plugin_register_read("xmms", cxmms_read); } /* void module_register */ /*