From 92870cab2aeb4f9011fc8073edf79541e1d8ceed Mon Sep 17 00:00:00 2001
From: kennypm <kphelpsmckeown@gmail.com>
Date: Tue, 19 Jul 2022 22:30:42 -0400
Subject: [PATCH] namespace cleanup

---
 src/modules/jack.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/modules/jack.cpp b/src/modules/jack.cpp
index 484a91d..a5617df 100644
--- a/src/modules/jack.cpp
+++ b/src/modules/jack.cpp
@@ -1,6 +1,8 @@
 #include "modules/jack.hpp"
 
-waybar::modules::JACK::JACK(const std::string &id, const Json::Value &config)
+namespace waybar::modules {
+
+JACK::JACK(const std::string &id, const Json::Value &config)
     : ALabel(config, "jack", id, "{load}%", 1) {
   xruns_ = 0;
   state_ = "disconnected";
@@ -13,7 +15,7 @@ waybar::modules::JACK::JACK(const std::string &id, const Json::Value &config)
   };
 }
 
-std::string waybar::modules::JACK::JACKState() {
+std::string JACK::JACKState() {
   if (state_.compare("xrun") == 0) return "xrun";
   if (state_.compare("connected") == 0) return "connected";
 
@@ -34,7 +36,7 @@ std::string waybar::modules::JACK::JACKState() {
   return "disconnected";
 }
 
-auto waybar::modules::JACK::update() -> void {
+auto JACK::update() -> void {
   std::string format;
   float latency = 1000 * (float)bufsize_ / (float)samplerate_;
   auto state = JACKState();
@@ -85,23 +87,27 @@ auto waybar::modules::JACK::update() -> void {
   ALabel::update();
 }
 
-int waybar::modules::JACK::bufSize(unsigned int size) {
+int JACK::bufSize(unsigned int size) {
   bufsize_ = size;
   return size;
 }
 
-int waybar::modules::JACK::xrun() {
+int JACK::xrun() {
   xruns_ += 1;
   state_ = "xrun";
   return 0;
 }
 
-void waybar::modules::JACK::shutdown() {
+void JACK::shutdown() {
   client_ = NULL;
   state_ = "disconnected";
   xruns_ = 0;
 }
 
+}  // namespace waybar::modules
+
+namespace {
+
 int bufSizeCallback(unsigned int size, void *obj) {
   return static_cast<waybar::modules::JACK *>(obj)->bufSize(size);
 }
@@ -109,3 +115,5 @@ int bufSizeCallback(unsigned int size, void *obj) {
 int xrunCallback(void *obj) { return static_cast<waybar::modules::JACK *>(obj)->xrun(); }
 
 void shutdownCallback(void *obj) { return static_cast<waybar::modules::JACK *>(obj)->shutdown(); }
+
+}  // namespace