p/desktop-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wmstatus: don't spam X session logs without MPD
All checks were successful
Alpine 3.21 Success
Details
OpenBSD 7.6 Success
Details

Browse Source 
Allow and default to setting the MPD address to null.
This commit is contained in:
Přemysl Eric Janouch 2025-08-10 00:22:22 +02:00
parent f2ec611c26
commit f26cfd3bb5
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wmstatus.c
View File

@ -809,10 +809,10 @@ static const struct config_schema g_config_general[] =
static const struct config_schema g_config_mpd[] = static const struct config_schema g_config_mpd[] =
{ {
// XXX: We might want to allow config item defaults to not disable nulls.
{ .name = "address", { .name = "address",
.comment = "MPD host or socket", .comment = "MPD host or socket",
.type = CONFIG_ITEM_STRING, .type = CONFIG_ITEM_STRING },
.default_ = "\"localhost\"" },
{ .name = "service", { .name = "service",
.comment = "MPD service name or port", .comment = "MPD service name or port",
.type = CONFIG_ITEM_STRING, .type = CONFIG_ITEM_STRING,
@ -1809,8 +1809,12 @@ mpd_on_io_hook (void *user_data, bool outgoing, const char *line)
static void static void
on_mpd_reconnect (void *user_data) on_mpd_reconnect (void *user_data)
{ {
// FIXME: the user should be able to disable MPD
struct app_context *ctx = user_data; struct app_context *ctx = user_data;
struct config_item *root = ctx->config.root;
const char *address = get_config_string (root, "mpd.address");
const char *service = get_config_string (root, "mpd.service");
if (!address)
return;
struct mpd_client *c = &ctx->mpd_client; struct mpd_client *c = &ctx->mpd_client;
c->user_data = ctx; c->user_data = ctx;
@ -1820,10 +1824,7 @@ on_mpd_reconnect (void *user_data)
c->on_io_hook = mpd_on_io_hook; c->on_io_hook = mpd_on_io_hook;
struct error *e = NULL; struct error *e = NULL;
struct config_item *root = ctx->config.root; if (!mpd_client_connect (&ctx->mpd_client, address, service, &e))
if (!mpd_client_connect (&ctx->mpd_client,
get_config_string (root, "mpd.address"),
get_config_string (root, "mpd.service"), &e))
{ {
print_error ("%s: %s", "cannot connect to MPD", e->message); print_error ("%s: %s", "cannot connect to MPD", e->message);
error_free (e); error_free (e);