mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
Merge pull request #222 from alebastr/pulseaudio-ci-icon-lookup
fix(pulseaudio) use case-insensitive comparison for icon lookup
This commit is contained in:
commit
3257968a28
@ -1,4 +1,5 @@
|
||||
#include "modules/pulseaudio.hpp"
|
||||
#include <array>
|
||||
|
||||
waybar::modules::Pulseaudio::Pulseaudio(const std::string& id, const Json::Value &config)
|
||||
: ALabel(config, "{volume}%"),
|
||||
@ -174,9 +175,7 @@ void waybar::modules::Pulseaudio::serverInfoCb(pa_context *context,
|
||||
sinkInfoCb, data);
|
||||
}
|
||||
|
||||
const std::string waybar::modules::Pulseaudio::getPortIcon() const
|
||||
{
|
||||
std::vector<std::string> ports = {
|
||||
static const std::array<std::string, 9> ports = {
|
||||
"headphones",
|
||||
"speaker",
|
||||
"hdmi",
|
||||
@ -186,9 +185,14 @@ const std::string waybar::modules::Pulseaudio::getPortIcon() const
|
||||
"car",
|
||||
"hifi",
|
||||
"phone",
|
||||
};
|
||||
};
|
||||
|
||||
const std::string waybar::modules::Pulseaudio::getPortIcon() const
|
||||
{
|
||||
std::string nameLC = port_name_;
|
||||
std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower);
|
||||
for (auto const& port : ports) {
|
||||
if (port_name_.find(port) != std::string::npos) {
|
||||
if (nameLC.find(port) != std::string::npos) {
|
||||
return port;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user