pulse: Rename source/sink and add libpulse-dev to CI deps

This commit is contained in:
Stanislav Ochotnický 2021-10-10 20:29:26 +02:00
parent d66b86de1f
commit 78d144429d
4 changed files with 9 additions and 9 deletions

View file

@ -13,7 +13,7 @@ before_script:
- apk add pixman-dev freetype-dev fontconfig-dev - apk add pixman-dev freetype-dev fontconfig-dev
- apk add libxcb-dev xcb-util-wm-dev xcb-util-cursor-dev yaml-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 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 ttf-dejavu
- apk add git - apk add git

View file

@ -33,7 +33,7 @@ pipeline:
- apk add pixman-dev freetype-dev fontconfig-dev - apk add pixman-dev freetype-dev fontconfig-dev
- apk add libxcb-dev xcb-util-wm-dev xcb-util-cursor-dev yaml-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 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 ttf-dejavu
- apk add git - apk add git
@ -83,7 +83,7 @@ pipeline:
- apk add pixman-dev freetype-dev fontconfig-dev - apk add pixman-dev freetype-dev fontconfig-dev
- apk add libxcb-dev xcb-util-wm-dev xcb-util-cursor-dev yaml-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 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 ttf-dejavu
- apk add git - apk add git

View file

@ -37,11 +37,11 @@ pulse - Monitors one pulseaudio source and sink for volume and mute/unmute chang
:[ *Type* :[ *Type*
:[ *Req* :[ *Req*
:[ *Description* :[ *Description*
| sink_name | sink
: string : string
: no : no
: Sink name to monitor. Defaults to _@DEFAULT\_SINK@_ : Sink name to monitor. Defaults to _@DEFAULT\_SINK@_
| source_name | source
: string : string
: no : no
: Source name to monitor. Defaults to _@DEFAULT\_SOURCE@_ : Source name to monitor. Defaults to _@DEFAULT\_SOURCE@_

View file

@ -414,8 +414,8 @@ pulse_new(const char *sink_name, const char *source_name, struct particle *label
static struct module * static struct module *
from_conf(const struct yml_node *node, struct conf_inherit inherited) 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 *sink_name = yml_get_value(node, "sink");
const struct yml_node *source_name = yml_get_value(node, "source_name"); const struct yml_node *source_name = yml_get_value(node, "source");
const struct yml_node *content = yml_get_value(node, "content"); const struct yml_node *content = yml_get_value(node, "content");
return pulse_new(sink_name != NULL ? yml_value_as_string(sink_name) : "@DEFAULT_SINK@", 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) verify_conf(keychain_t *chain, const struct yml_node *node)
{ {
static const struct attr_info attrs[] = { static const struct attr_info attrs[] = {
{"sink_name", false, &conf_verify_string}, {"sink", false, &conf_verify_string},
{"source_name", false, &conf_verify_string}, {"source", false, &conf_verify_string},
MODULE_COMMON_ATTRS, MODULE_COMMON_ATTRS,
}; };