From 8fb3211594ced057025d2b8a9acc1b63a27cb388 Mon Sep 17 00:00:00 2001
From: PlusMinus0 <brandt.matthias+github@gmail.com>
Date: Mon, 13 Jan 2020 11:18:19 +0100
Subject: [PATCH] Use PA_PROP_DEVICE_FORM_FACTOR for device icon.

---
 include/modules/pulseaudio.hpp | 1 +
 src/modules/pulseaudio.cpp     | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/modules/pulseaudio.hpp b/include/modules/pulseaudio.hpp
index d575f627..ba5a2aaf 100644
--- a/include/modules/pulseaudio.hpp
+++ b/include/modules/pulseaudio.hpp
@@ -34,6 +34,7 @@ class Pulseaudio : public ALabel {
   pa_cvolume  pa_volume_;
   bool        muted_;
   std::string port_name_;
+  std::string form_factor_;
   std::string desc_;
   std::string monitor_;
   // SOURCE
diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp
index ef2bc273..eb05b8c7 100644
--- a/src/modules/pulseaudio.cpp
+++ b/src/modules/pulseaudio.cpp
@@ -158,6 +158,9 @@ void waybar::modules::Pulseaudio::sinkInfoCb(pa_context * /*context*/, const pa_
     pa->desc_ = i->description;
     pa->monitor_ = i->monitor_source_name;
     pa->port_name_ = i->active_port != nullptr ? i->active_port->name : "Unknown";
+    if (auto ff = pa_proplist_gets(i->proplist, PA_PROP_DEVICE_FORM_FACTOR)) {
+      pa->form_factor_ = ff;
+    }
     pa->dp.emit();
   }
 }
@@ -185,7 +188,7 @@ static const std::array<std::string, 9> ports = {
 };
 
 const std::string waybar::modules::Pulseaudio::getPortIcon() const {
-  std::string nameLC = port_name_;
+  std::string nameLC = port_name_ + form_factor_;
   std::transform(nameLC.begin(), nameLC.end(), nameLC.begin(), ::tolower);
   for (auto const &port : ports) {
     if (nameLC.find(port) != std::string::npos) {