diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06df201..edf16fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ before_script: - apk add pixman-dev freetype-dev fontconfig-dev - apk add libxcb-dev xcb-util-wm-dev xcb-util-cursor-dev yaml-dev - apk add wayland-dev wayland-protocols wlroots-dev - - apk add json-c-dev libmpdclient-dev alsa-lib-dev + - apk add json-c-dev libmpdclient-dev alsa-lib-dev pulseaudio-dev - apk add ttf-dejavu - apk add git diff --git a/.woodpecker.yml b/.woodpecker.yml index 5f95979..13c0cf6 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -33,7 +33,7 @@ pipeline: - apk add pixman-dev freetype-dev fontconfig-dev - apk add libxcb-dev xcb-util-wm-dev xcb-util-cursor-dev yaml-dev - apk add wayland-dev wayland-protocols wlroots-dev - - apk add json-c-dev libmpdclient-dev alsa-lib-dev + - apk add json-c-dev libmpdclient-dev alsa-lib-dev pulseaudio-dev - apk add ttf-dejavu - apk add git @@ -83,7 +83,7 @@ pipeline: - apk add pixman-dev freetype-dev fontconfig-dev - apk add libxcb-dev xcb-util-wm-dev xcb-util-cursor-dev yaml-dev - apk add wayland-dev wayland-protocols wlroots-dev - - apk add json-c-dev libmpdclient-dev alsa-lib-dev + - apk add json-c-dev libmpdclient-dev alsa-lib-dev pulseaudio-dev - apk add ttf-dejavu - apk add git diff --git a/doc/yambar-modules-pulse.5.scd b/doc/yambar-modules-pulse.5.scd index 2086aaf..dab1a7f 100644 --- a/doc/yambar-modules-pulse.5.scd +++ b/doc/yambar-modules-pulse.5.scd @@ -37,11 +37,11 @@ pulse - Monitors one pulseaudio source and sink for volume and mute/unmute chang :[ *Type* :[ *Req* :[ *Description* -| sink_name +| sink : string : no : Sink name to monitor. Defaults to _@DEFAULT\_SINK@_ -| source_name +| source : string : no : Source name to monitor. Defaults to _@DEFAULT\_SOURCE@_ diff --git a/modules/pulse.c b/modules/pulse.c index 00f22b7..6a336d1 100644 --- a/modules/pulse.c +++ b/modules/pulse.c @@ -414,8 +414,8 @@ pulse_new(const char *sink_name, const char *source_name, struct particle *label static struct module * from_conf(const struct yml_node *node, struct conf_inherit inherited) { - const struct yml_node *sink_name = yml_get_value(node, "sink_name"); - const struct yml_node *source_name = yml_get_value(node, "source_name"); + const struct yml_node *sink_name = yml_get_value(node, "sink"); + const struct yml_node *source_name = yml_get_value(node, "source"); const struct yml_node *content = yml_get_value(node, "content"); return pulse_new(sink_name != NULL ? yml_value_as_string(sink_name) : "@DEFAULT_SINK@", @@ -427,8 +427,8 @@ static bool verify_conf(keychain_t *chain, const struct yml_node *node) { static const struct attr_info attrs[] = { - {"sink_name", false, &conf_verify_string}, - {"source_name", false, &conf_verify_string}, + {"sink", false, &conf_verify_string}, + {"source", false, &conf_verify_string}, MODULE_COMMON_ATTRS, };