Merge pull request #507 from xaiki/master

pulseaudio: export desc as a format
This commit is contained in:
Alex 2019-11-25 21:33:36 +00:00 committed by GitHub
commit 502b33b64a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions

View File

@ -82,6 +82,8 @@ Additionally you can control the volume by scrolling *up* or *down* while the cu
# FORMAT REPLACEMENTS # FORMAT REPLACEMENTS
*{desc}*: Pulseaudio port's description, for bluetooth it'll be the device name.
*{volume}*: Volume in percentage. *{volume}*: Volume in percentage.
*{icon}*: Icon, as defined in *format-icons*. *{icon}*: Icon, as defined in *format-icons*.

View File

@ -221,6 +221,7 @@ auto waybar::modules::Pulseaudio::update() -> void {
} }
format_source = fmt::format(format_source, fmt::arg("volume", source_volume_)); format_source = fmt::format(format_source, fmt::arg("volume", source_volume_));
label_.set_markup(fmt::format(format, label_.set_markup(fmt::format(format,
fmt::arg("desc", desc_),
fmt::arg("volume", volume_), fmt::arg("volume", volume_),
fmt::arg("format_source", format_source), fmt::arg("format_source", format_source),
fmt::arg("icon", getIcon(volume_, getPortIcon())))); fmt::arg("icon", getIcon(volume_, getPortIcon()))));