RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2092 from chayleaf/mpris-fix-non-dynamic-tag-escapes

pull/2128/head
Alex 2023-04-17 08:58:40 +02:00 committed by GitHub
parent 1d7d1a8fe8 659fea07ee
commit da2163ae41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/mpris/mpris.cpp
View File

@ -619,9 +619,12 @@ auto Mpris::update() -> void {
try { try {
auto label_format = fmt::format( auto label_format = fmt::format(
fmt::runtime(formatstr), fmt::arg("player", info.name), fmt::runtime(formatstr),
fmt::arg("status", info.status_string), fmt::arg("artist", getArtistStr(info, true)), fmt::arg("player", std::string(Glib::Markup::escape_text(info.name))),
fmt::arg("title", getTitleStr(info, true)), fmt::arg("album", getAlbumStr(info, true)), fmt::arg("status", info.status_string),
fmt::arg("artist", std::string(Glib::Markup::escape_text(getArtistStr(info, true)))),
fmt::arg("title", std::string(Glib::Markup::escape_text(getTitleStr(info, true)))),
fmt::arg("album", std::string(Glib::Markup::escape_text(getAlbumStr(info, true)))),
fmt::arg("length", length), fmt::arg("position", position), fmt::arg("length", length), fmt::arg("position", position),
fmt::arg("dynamic", getDynamicStr(info, true, true)), fmt::arg("dynamic", getDynamicStr(info, true, true)),
fmt::arg("player_icon", getIconFromJson(config_["player-icons"], info.name)), fmt::arg("player_icon", getIconFromJson(config_["player-icons"], info.name)),