aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptrcnull <git@ptrcnull.me>2024-03-20 09:10:05 +0100
committerPatrycja Rosa <alpine@ptrcnull.me>2024-03-21 15:48:17 +0000
commite49bee505a355607cb0526bd5df3d0728e69a966 (patch)
tree67834f3c7f966f9f9922d5d541d5c3959392c2ec
parent05a7901d40f29fd51bd574e8de5bfb04374c9751 (diff)
community/waybar: rebuild with wireplumber-0.5
-rw-r--r--community/waybar/APKBUILD4
-rw-r--r--community/waybar/wireplumber-0.5.patch539
2 files changed, 542 insertions, 1 deletions
diff --git a/community/waybar/APKBUILD b/community/waybar/APKBUILD
index 596e7764cd8..d2ef47bc62c 100644
--- a/community/waybar/APKBUILD
+++ b/community/waybar/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=waybar
pkgver=0.10.0
-pkgrel=0
+pkgrel=1
pkgdesc="Highly customizable Wayland bar for Sway and Wlroots based compositors"
url="https://github.com/Alexays/Waybar/"
# s390x: no wireplumber (but who uses it there anyway)
@@ -32,6 +32,7 @@ makedepends="
subpackages="$pkgname-doc"
source="https://github.com/Alexays/Waybar/archive/$pkgver/Waybar-$pkgver.tar.gz
config-fix-clock.patch
+ wireplumber-0.5.patch
"
options="!check" # No test suite
builddir="$srcdir/Waybar-$pkgver"
@@ -64,4 +65,5 @@ package() {
sha512sums="
89d5ee6fb52438aadfcad8929940b2f2c4a469f7f07331fa5dff77997e1dedb6b3b020c2c2f809687993a7da2571b9f08768e92172d08bfb3d4b66db2d20d61f Waybar-0.10.0.tar.gz
cd6fea7e9981e13ecb911da66b4f22e949542d4085d696e01d8d4eac0986e0ab15d5c1430040b76be730437a586dbe1f5c49ac8435269e6310fb2c213b6c74a2 config-fix-clock.patch
+287764a68dccacdb6bdfe4c77d6c71d291e250df009aea8d5a7f3d8abc5db5b091feb1deb846aaa9efc316fa2a8ff98a102a33630001646526e55beb5f9044ab wireplumber-0.5.patch
"
diff --git a/community/waybar/wireplumber-0.5.patch b/community/waybar/wireplumber-0.5.patch
new file mode 100644
index 00000000000..7cfe343790d
--- /dev/null
+++ b/community/waybar/wireplumber-0.5.patch
@@ -0,0 +1,539 @@
+From 70de2fb8b2123a042ace28346d8ad1885e9acfe5 Mon Sep 17 00:00:00 2001
+From: Ryan Walklin <ryan@testtoast.com>
+Date: Thu, 15 Feb 2024 09:37:36 +1300
+Subject: [PATCH 1/3] Update Wireplumber API to 0.5
+
+The WP component loader API has changed to be asynchronous, so implement a (GAsyncReadyCallback)-based loader to manage them. Logging integration change was required for 0.5.0 RCs but not for the 0.5.0 release.
+---
+ include/modules/wireplumber.hpp | 7 ++-
+ meson.build | 2 +-
+ src/modules/wireplumber.cpp | 78 ++++++++++++++++++++++-----------
+ 3 files changed, 59 insertions(+), 28 deletions(-)
+
+diff --git a/include/modules/wireplumber.hpp b/include/modules/wireplumber.hpp
+index 9bbf4d464..50121424b 100644
+--- a/include/modules/wireplumber.hpp
++++ b/include/modules/wireplumber.hpp
+@@ -3,6 +3,9 @@
+ #include <fmt/format.h>
+ #include <wp/wp.h>
+
++#define WP_LOCAL_LOG_TOPIC wp_waybar
++WP_LOG_TOPIC_EXTERN (wp_waybar)
++
+ #include <algorithm>
+ #include <array>
+
+@@ -17,12 +20,14 @@ class Wireplumber : public ALabel {
+ auto update() -> void override;
+
+ private:
+- void loadRequiredApiModules();
++ void asyncLoadRequiredApiModules();
+ void prepare();
+ void activatePlugins();
+ static void updateVolume(waybar::modules::Wireplumber* self, uint32_t id);
+ static void updateNodeName(waybar::modules::Wireplumber* self, uint32_t id);
+ static void onPluginActivated(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
++ static void onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
++ static void onMixerApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
+ static void onObjectManagerInstalled(waybar::modules::Wireplumber* self);
+ static void onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id);
+ static void onDefaultNodesApiChanged(waybar::modules::Wireplumber* self);
+diff --git a/meson.build b/meson.build
+index e21ff262c..120976083 100644
+--- a/meson.build
++++ b/meson.build
+@@ -92,7 +92,7 @@ libevdev = dependency('libevdev', required: get_option('libevdev'))
+ libmpdclient = dependency('libmpdclient', required: get_option('mpd'))
+ xkbregistry = dependency('xkbregistry')
+ libjack = dependency('jack', required: get_option('jack'))
+-libwireplumber = dependency('wireplumber-0.4', required: get_option('wireplumber'))
++libwireplumber = dependency('wireplumber-0.5', required: get_option('wireplumber'))
+
+ libsndio = compiler.find_library('sndio', required: get_option('sndio'))
+ if libsndio.found()
+diff --git a/src/modules/wireplumber.cpp b/src/modules/wireplumber.cpp
+index 51bb708d1..021160168 100644
+--- a/src/modules/wireplumber.cpp
++++ b/src/modules/wireplumber.cpp
+@@ -18,31 +18,24 @@ waybar::modules::Wireplumber::Wireplumber(const std::string& id, const Json::Val
+ min_step_(0.0),
+ node_id_(0) {
+ wp_init(WP_INIT_PIPEWIRE);
+- wp_core_ = wp_core_new(NULL, NULL);
++ wp_core_ = wp_core_new(NULL, NULL, NULL);
+ apis_ = g_ptr_array_new_with_free_func(g_object_unref);
+ om_ = wp_object_manager_new();
+
+ prepare();
+
+- loadRequiredApiModules();
++ spdlog::debug("[{}]: connecting to pipewire...", name_);
+
+- spdlog::debug("[{}]: connecting to pipewire...", this->name_);
+-
+- if (!wp_core_connect(wp_core_)) {
+- spdlog::error("[{}]: Could not connect to PipeWire", this->name_);
++ if (wp_core_connect(wp_core_) == 0) {
++ spdlog::error("[{}]: Could not connect to PipeWire", name_);
+ throw std::runtime_error("Could not connect to PipeWire\n");
+ }
+
+- spdlog::debug("[{}]: connected!", this->name_);
++ spdlog::debug("[{}]: connected!", name_);
+
+ g_signal_connect_swapped(om_, "installed", (GCallback)onObjectManagerInstalled, this);
+
+- activatePlugins();
+-
+- dp.emit();
+-
+- event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
+- event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &Wireplumber::handleScroll));
++ asyncLoadRequiredApiModules();
+ }
+
+ waybar::modules::Wireplumber::~Wireplumber() {
+@@ -251,26 +244,59 @@ void waybar::modules::Wireplumber::prepare() {
+ "=s", "Audio/Sink", NULL);
+ }
+
+-void waybar::modules::Wireplumber::loadRequiredApiModules() {
+- spdlog::debug("[{}]: loading required modules", name_);
+- g_autoptr(GError) error = NULL;
++void waybar::modules::Wireplumber::onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res,
++ waybar::modules::Wireplumber* self) {
++ gboolean success = FALSE;
++ g_autoptr(GError) error = nullptr;
++
++ spdlog::debug("[{}]: callback loading default node api module", self->name_);
+
+- if (!wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", NULL,
+- &error)) {
++
++ success = wp_core_load_component_finish(self->wp_core_, res, &error);
++
++ if (success == FALSE) {
++ spdlog::error("[{}]: default nodes API load failed", self->name_);
+ throw std::runtime_error(error->message);
+ }
++ spdlog::debug("[{}]: loaded default nodes api", self->name_);
++ g_ptr_array_add(self->apis_, wp_plugin_find(self->wp_core_, "default-nodes-api"));
++
++ spdlog::debug("[{}]: loading mixer api module", self->name_);
++ wp_core_load_component(self->wp_core_, "libwireplumber-module-mixer-api", "module", nullptr,
++ "mixer-api", nullptr, (GAsyncReadyCallback)onMixerApiLoaded, self);
++}
+
+- if (!wp_core_load_component(wp_core_, "libwireplumber-module-mixer-api", "module", NULL,
+- &error)) {
++void waybar::modules::Wireplumber::onMixerApiLoaded(WpObject* p, GAsyncResult* res,
++ waybar::modules::Wireplumber* self) {
++ gboolean success = FALSE;
++ g_autoptr(GError) error = nullptr;
++
++ success = wp_core_load_component_finish(self->wp_core_, res, nullptr);
++
++ if (success == FALSE) {
++ spdlog::error("[{}]: mixer API load failed", self->name_);
+ throw std::runtime_error(error->message);
+ }
+
+- g_ptr_array_add(apis_, wp_plugin_find(wp_core_, "default-nodes-api"));
+- g_ptr_array_add(apis_, ({
+- WpPlugin* p = wp_plugin_find(wp_core_, "mixer-api");
+- g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, NULL);
+- p;
+- }));
++ spdlog::debug("[{}]: loaded mixer API", self->name_);
++ g_ptr_array_add(self->apis_, ({
++ WpPlugin* p = wp_plugin_find(self->wp_core_, "mixer-api");
++ g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, nullptr);
++ p;
++ }));
++
++ self->activatePlugins();
++
++ self->dp.emit();
++
++ self->event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
++ self->event_box_.signal_scroll_event().connect(sigc::mem_fun(*self, &Wireplumber::handleScroll));
++}
++
++void waybar::modules::Wireplumber::asyncLoadRequiredApiModules() {
++ spdlog::debug("[{}]: loading default nodes api module", name_);
++ wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", nullptr,
++ "default-nodes-api", nullptr, (GAsyncReadyCallback)onDefaultNodesApiLoaded, this);
+ }
+
+ auto waybar::modules::Wireplumber::update() -> void {
+
+From 2aa6b862c51b2f71eb6688a7aff6f8f42f524923 Mon Sep 17 00:00:00 2001
+From: Ryan Walklin <ryan@testtoast.com>
+Date: Wed, 20 Mar 2024 14:10:21 +1300
+Subject: [PATCH 2/3] Remove WP_LOCAL_LOG_TOPIC - this was required for
+ 0.4.81-0.4.90, but fixed for 0.5.0
+
+See https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e9d8eeedefa8adf47646ab9375c8888506f143e6
+---
+ include/modules/wireplumber.hpp | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/include/modules/wireplumber.hpp b/include/modules/wireplumber.hpp
+index 50121424b..aa6e96ec1 100644
+--- a/include/modules/wireplumber.hpp
++++ b/include/modules/wireplumber.hpp
+@@ -3,9 +3,6 @@
+ #include <fmt/format.h>
+ #include <wp/wp.h>
+
+-#define WP_LOCAL_LOG_TOPIC wp_waybar
+-WP_LOG_TOPIC_EXTERN (wp_waybar)
+-
+ #include <algorithm>
+ #include <array>
+
+
+From 19f792a3e43c8351c8eb7368e60bf3763ca56df1 Mon Sep 17 00:00:00 2001
+From: Ryan Walklin <ryan@testtoast.com>
+Date: Wed, 20 Mar 2024 14:12:48 +1300
+Subject: [PATCH 3/3] Fix clang-tidy and clang-format warnings
+
+Note these are significantly wider than the changes for 0.5.0 so optional beyond the existing patchset.
+---
+ include/modules/wireplumber.hpp | 3 +-
+ src/modules/wireplumber.cpp | 132 ++++++++++++++++----------------
+ 2 files changed, 70 insertions(+), 65 deletions(-)
+
+diff --git a/include/modules/wireplumber.hpp b/include/modules/wireplumber.hpp
+index aa6e96ec1..6255b95fd 100644
+--- a/include/modules/wireplumber.hpp
++++ b/include/modules/wireplumber.hpp
+@@ -23,7 +23,8 @@ class Wireplumber : public ALabel {
+ static void updateVolume(waybar::modules::Wireplumber* self, uint32_t id);
+ static void updateNodeName(waybar::modules::Wireplumber* self, uint32_t id);
+ static void onPluginActivated(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
+- static void onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
++ static void onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res,
++ waybar::modules::Wireplumber* self);
+ static void onMixerApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self);
+ static void onObjectManagerInstalled(waybar::modules::Wireplumber* self);
+ static void onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id);
+diff --git a/src/modules/wireplumber.cpp b/src/modules/wireplumber.cpp
+index 021160168..bd019b623 100644
+--- a/src/modules/wireplumber.cpp
++++ b/src/modules/wireplumber.cpp
+@@ -18,7 +18,7 @@ waybar::modules::Wireplumber::Wireplumber(const std::string& id, const Json::Val
+ min_step_(0.0),
+ node_id_(0) {
+ wp_init(WP_INIT_PIPEWIRE);
+- wp_core_ = wp_core_new(NULL, NULL, NULL);
++ wp_core_ = wp_core_new(nullptr, nullptr, nullptr);
+ apis_ = g_ptr_array_new_with_free_func(g_object_unref);
+ om_ = wp_object_manager_new();
+
+@@ -56,32 +56,36 @@ void waybar::modules::Wireplumber::updateNodeName(waybar::modules::Wireplumber*
+ return;
+ }
+
+- auto proxy = static_cast<WpProxy*>(wp_object_manager_lookup(
+- self->om_, WP_TYPE_GLOBAL_PROXY, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, NULL));
++ auto* proxy = static_cast<WpProxy*>(wp_object_manager_lookup(self->om_, WP_TYPE_GLOBAL_PROXY,
++ WP_CONSTRAINT_TYPE_G_PROPERTY,
++ "bound-id", "=u", id, nullptr));
+
+- if (!proxy) {
++ if (proxy == nullptr) {
+ auto err = fmt::format("Object '{}' not found\n", id);
+ spdlog::error("[{}]: {}", self->name_, err);
+ throw std::runtime_error(err);
+ }
+
+ g_autoptr(WpProperties) properties =
+- WP_IS_PIPEWIRE_OBJECT(proxy) ? wp_pipewire_object_get_properties(WP_PIPEWIRE_OBJECT(proxy))
+- : wp_properties_new_empty();
+- g_autoptr(WpProperties) global_p = wp_global_proxy_get_global_properties(WP_GLOBAL_PROXY(proxy));
++ WP_IS_PIPEWIRE_OBJECT(proxy) != 0
++ ? wp_pipewire_object_get_properties(WP_PIPEWIRE_OBJECT(proxy))
++ : wp_properties_new_empty();
++ g_autoptr(WpProperties) globalP = wp_global_proxy_get_global_properties(WP_GLOBAL_PROXY(proxy));
+ properties = wp_properties_ensure_unique_owner(properties);
+- wp_properties_add(properties, global_p);
+- wp_properties_set(properties, "object.id", NULL);
+- auto nick = wp_properties_get(properties, "node.nick");
+- auto description = wp_properties_get(properties, "node.description");
+-
+- self->node_name_ = nick ? nick : description ? description : "Unknown node name";
++ wp_properties_add(properties, globalP);
++ wp_properties_set(properties, "object.id", nullptr);
++ const auto* nick = wp_properties_get(properties, "node.nick");
++ const auto* description = wp_properties_get(properties, "node.description");
++
++ self->node_name_ = nick != nullptr ? nick
++ : description != nullptr ? description
++ : "Unknown node name";
+ spdlog::debug("[{}]: Updating node name to: {}", self->name_, self->node_name_);
+ }
+
+ void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* self, uint32_t id) {
+ spdlog::debug("[{}]: updating volume", self->name_);
+- GVariant* variant = NULL;
++ GVariant* variant = nullptr;
+
+ if (!isValidNodeId(id)) {
+ spdlog::error("[{}]: '{}' is not a valid node ID. Ignoring volume update.", self->name_, id);
+@@ -90,7 +94,7 @@ void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* se
+
+ g_signal_emit_by_name(self->mixer_api_, "get-volume", id, &variant);
+
+- if (!variant) {
++ if (variant == nullptr) {
+ auto err = fmt::format("Node {} does not support volume\n", id);
+ spdlog::error("[{}]: {}", self->name_, err);
+ throw std::runtime_error(err);
+@@ -108,9 +112,9 @@ void waybar::modules::Wireplumber::onMixerChanged(waybar::modules::Wireplumber*
+ spdlog::debug("[{}]: (onMixerChanged) - id: {}", self->name_, id);
+
+ g_autoptr(WpNode) node = static_cast<WpNode*>(wp_object_manager_lookup(
+- self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, NULL));
++ self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, nullptr));
+
+- if (!node) {
++ if (node == nullptr) {
+ spdlog::warn("[{}]: (onMixerChanged) - Object with id {} not found", self->name_, id);
+ return;
+ }
+@@ -133,49 +137,49 @@ void waybar::modules::Wireplumber::onMixerChanged(waybar::modules::Wireplumber*
+ void waybar::modules::Wireplumber::onDefaultNodesApiChanged(waybar::modules::Wireplumber* self) {
+ spdlog::debug("[{}]: (onDefaultNodesApiChanged)", self->name_);
+
+- uint32_t default_node_id;
+- g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &default_node_id);
++ uint32_t defaultNodeId;
++ g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &defaultNodeId);
+
+- if (!isValidNodeId(default_node_id)) {
++ if (!isValidNodeId(defaultNodeId)) {
+ spdlog::warn("[{}]: '{}' is not a valid node ID. Ignoring node change.", self->name_,
+- default_node_id);
++ defaultNodeId);
+ return;
+ }
+
+ g_autoptr(WpNode) node = static_cast<WpNode*>(
+ wp_object_manager_lookup(self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id",
+- "=u", default_node_id, NULL));
++ "=u", defaultNodeId, nullptr));
+
+- if (!node) {
++ if (node == nullptr) {
+ spdlog::warn("[{}]: (onDefaultNodesApiChanged) - Object with id {} not found", self->name_,
+- default_node_id);
++ defaultNodeId);
+ return;
+ }
+
+- const gchar* default_node_name =
++ const gchar* defaultNodeName =
+ wp_pipewire_object_get_property(WP_PIPEWIRE_OBJECT(node), "node.name");
+
+ spdlog::debug(
+ "[{}]: (onDefaultNodesApiChanged) - got the following default node: Node(name: {}, id: {})",
+- self->name_, default_node_name, default_node_id);
++ self->name_, defaultNodeName, defaultNodeId);
+
+- if (g_strcmp0(self->default_node_name_, default_node_name) == 0) {
++ if (g_strcmp0(self->default_node_name_, defaultNodeName) == 0) {
+ spdlog::debug(
+ "[{}]: (onDefaultNodesApiChanged) - Default node has not changed. Node(name: {}, id: {}). "
+ "Ignoring.",
+- self->name_, self->default_node_name_, default_node_id);
++ self->name_, self->default_node_name_, defaultNodeId);
+ return;
+ }
+
+ spdlog::debug(
+ "[{}]: (onDefaultNodesApiChanged) - Default node changed to -> Node(name: {}, id: {})",
+- self->name_, default_node_name, default_node_id);
++ self->name_, defaultNodeName, defaultNodeId);
+
+ g_free(self->default_node_name_);
+- self->default_node_name_ = g_strdup(default_node_name);
+- self->node_id_ = default_node_id;
+- updateVolume(self, default_node_id);
+- updateNodeName(self, default_node_id);
++ self->default_node_name_ = g_strdup(defaultNodeName);
++ self->node_id_ = defaultNodeId;
++ updateVolume(self, defaultNodeId);
++ updateNodeName(self, defaultNodeId);
+ }
+
+ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wireplumber* self) {
+@@ -183,14 +187,14 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir
+
+ self->def_nodes_api_ = wp_plugin_find(self->wp_core_, "default-nodes-api");
+
+- if (!self->def_nodes_api_) {
++ if (self->def_nodes_api_ == nullptr) {
+ spdlog::error("[{}]: default nodes api is not loaded.", self->name_);
+ throw std::runtime_error("Default nodes API is not loaded\n");
+ }
+
+ self->mixer_api_ = wp_plugin_find(self->wp_core_, "mixer-api");
+
+- if (!self->mixer_api_) {
++ if (self->mixer_api_ == nullptr) {
+ spdlog::error("[{}]: mixer api is not loaded.", self->name_);
+ throw std::runtime_error("Mixer api is not loaded\n");
+ }
+@@ -199,7 +203,7 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir
+ &self->default_node_name_);
+ g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &self->node_id_);
+
+- if (self->default_node_name_) {
++ if (self->default_node_name_ != nullptr) {
+ spdlog::debug("[{}]: (onObjectManagerInstalled) - default configured node name: {} and id: {}",
+ self->name_, self->default_node_name_, self->node_id_);
+ }
+@@ -214,11 +218,11 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir
+
+ void waybar::modules::Wireplumber::onPluginActivated(WpObject* p, GAsyncResult* res,
+ waybar::modules::Wireplumber* self) {
+- auto plugin_name = wp_plugin_get_name(WP_PLUGIN(p));
+- spdlog::debug("[{}]: onPluginActivated: {}", self->name_, plugin_name);
+- g_autoptr(GError) error = NULL;
++ const auto* pluginName = wp_plugin_get_name(WP_PLUGIN(p));
++ spdlog::debug("[{}]: onPluginActivated: {}", self->name_, pluginName);
++ g_autoptr(GError) error = nullptr;
+
+- if (!wp_object_activate_finish(p, res, &error)) {
++ if (wp_object_activate_finish(p, res, &error) == 0) {
+ spdlog::error("[{}]: error activating plugin: {}", self->name_, error->message);
+ throw std::runtime_error(error->message);
+ }
+@@ -233,7 +237,7 @@ void waybar::modules::Wireplumber::activatePlugins() {
+ for (uint16_t i = 0; i < apis_->len; i++) {
+ WpPlugin* plugin = static_cast<WpPlugin*>(g_ptr_array_index(apis_, i));
+ pending_plugins_++;
+- wp_object_activate(WP_OBJECT(plugin), WP_PLUGIN_FEATURE_ENABLED, NULL,
++ wp_object_activate(WP_OBJECT(plugin), WP_PLUGIN_FEATURE_ENABLED, nullptr,
+ (GAsyncReadyCallback)onPluginActivated, this);
+ }
+ }
+@@ -241,7 +245,7 @@ void waybar::modules::Wireplumber::activatePlugins() {
+ void waybar::modules::Wireplumber::prepare() {
+ spdlog::debug("[{}]: preparing object manager", name_);
+ wp_object_manager_add_interest(om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, "media.class",
+- "=s", "Audio/Sink", NULL);
++ "=s", "Audio/Sink", nullptr);
+ }
+
+ void waybar::modules::Wireplumber::onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res,
+@@ -251,7 +255,6 @@ void waybar::modules::Wireplumber::onDefaultNodesApiLoaded(WpObject* p, GAsyncRe
+
+ spdlog::debug("[{}]: callback loading default node api module", self->name_);
+
+-
+ success = wp_core_load_component_finish(self->wp_core_, res, &error);
+
+ if (success == FALSE) {
+@@ -263,7 +266,7 @@ void waybar::modules::Wireplumber::onDefaultNodesApiLoaded(WpObject* p, GAsyncRe
+
+ spdlog::debug("[{}]: loading mixer api module", self->name_);
+ wp_core_load_component(self->wp_core_, "libwireplumber-module-mixer-api", "module", nullptr,
+- "mixer-api", nullptr, (GAsyncReadyCallback)onMixerApiLoaded, self);
++ "mixer-api", nullptr, (GAsyncReadyCallback)onMixerApiLoaded, self);
+ }
+
+ void waybar::modules::Wireplumber::onMixerApiLoaded(WpObject* p, GAsyncResult* res,
+@@ -280,10 +283,10 @@ void waybar::modules::Wireplumber::onMixerApiLoaded(WpObject* p, GAsyncResult* r
+
+ spdlog::debug("[{}]: loaded mixer API", self->name_);
+ g_ptr_array_add(self->apis_, ({
+- WpPlugin* p = wp_plugin_find(self->wp_core_, "mixer-api");
+- g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, nullptr);
+- p;
+- }));
++ WpPlugin* p = wp_plugin_find(self->wp_core_, "mixer-api");
++ g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, nullptr);
++ p;
++ }));
+
+ self->activatePlugins();
+
+@@ -296,12 +299,13 @@ void waybar::modules::Wireplumber::onMixerApiLoaded(WpObject* p, GAsyncResult* r
+ void waybar::modules::Wireplumber::asyncLoadRequiredApiModules() {
+ spdlog::debug("[{}]: loading default nodes api module", name_);
+ wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", nullptr,
+- "default-nodes-api", nullptr, (GAsyncReadyCallback)onDefaultNodesApiLoaded, this);
++ "default-nodes-api", nullptr, (GAsyncReadyCallback)onDefaultNodesApiLoaded,
++ this);
+ }
+
+ auto waybar::modules::Wireplumber::update() -> void {
+ auto format = format_;
+- std::string tooltip_format;
++ std::string tooltipFormat;
+
+ if (muted_) {
+ format = config_["format-muted"].isString() ? config_["format-muted"].asString() : format;
+@@ -318,12 +322,12 @@ auto waybar::modules::Wireplumber::update() -> void {
+ getState(vol);
+
+ if (tooltipEnabled()) {
+- if (tooltip_format.empty() && config_["tooltip-format"].isString()) {
+- tooltip_format = config_["tooltip-format"].asString();
++ if (tooltipFormat.empty() && config_["tooltip-format"].isString()) {
++ tooltipFormat = config_["tooltip-format"].asString();
+ }
+
+- if (!tooltip_format.empty()) {
+- label_.set_tooltip_text(fmt::format(fmt::runtime(tooltip_format),
++ if (!tooltipFormat.empty()) {
++ label_.set_tooltip_text(fmt::format(fmt::runtime(tooltipFormat),
+ fmt::arg("node_name", node_name_),
+ fmt::arg("volume", vol), fmt::arg("icon", getIcon(vol))));
+ } else {
+@@ -343,31 +347,31 @@ bool waybar::modules::Wireplumber::handleScroll(GdkEventScroll* e) {
+ if (dir == SCROLL_DIR::NONE) {
+ return true;
+ }
+- double max_volume = 1;
++ double maxVolume = 1;
+ double step = 1.0 / 100.0;
+ if (config_["scroll-step"].isDouble()) {
+ step = config_["scroll-step"].asDouble() / 100.0;
+ }
+ if (config_["max-volume"].isDouble()) {
+- max_volume = config_["max-volume"].asDouble() / 100.0;
++ maxVolume = config_["max-volume"].asDouble() / 100.0;
+ }
+
+ if (step < min_step_) step = min_step_;
+
+- double new_vol = volume_;
++ double newVol = volume_;
+ if (dir == SCROLL_DIR::UP) {
+- if (volume_ < max_volume) {
+- new_vol = volume_ + step;
+- if (new_vol > max_volume) new_vol = max_volume;
++ if (volume_ < maxVolume) {
++ newVol = volume_ + step;
++ if (newVol > maxVolume) newVol = maxVolume;
+ }
+ } else if (dir == SCROLL_DIR::DOWN) {
+ if (volume_ > 0) {
+- new_vol = volume_ - step;
+- if (new_vol < 0) new_vol = 0;
++ newVol = volume_ - step;
++ if (newVol < 0) newVol = 0;
+ }
+ }
+- if (new_vol != volume_) {
+- GVariant* variant = g_variant_new_double(new_vol);
++ if (newVol != volume_) {
++ GVariant* variant = g_variant_new_double(newVol);
+ gboolean ret;
+ g_signal_emit_by_name(mixer_api_, "set-volume", node_id_, variant, &ret);
+ }