Skip to content

Commit d30c642

Browse files
committed
Happy linter
1 parent cddee21 commit d30c642

File tree

4 files changed

+22
-25
lines changed

4 files changed

+22
-25
lines changed

include/modules/cava/cava.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Cava final : public ALabel, public sigc::trackable {
2424
// Cava method
2525
void pause_resume();
2626
// ModuleActionMap
27-
static inline std::map<const std::string, void (waybar::modules::cava::Cava::* const)()> actionMap_{
28-
{"mode", &waybar::modules::cava::Cava::pause_resume}};
27+
static inline std::map<const std::string, void (waybar::modules::cava::Cava::* const)()>
28+
actionMap_{{"mode", &waybar::modules::cava::Cava::pause_resume}};
2929
};
3030
} // namespace waybar::modules

include/modules/cava/cava_backend.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#include "util/sleeper_thread.hpp"
4-
53
#include <json/json.h>
64
#include <sigc++/sigc++.h>
75

6+
#include "util/sleeper_thread.hpp"
7+
88
namespace cava {
99
extern "C" {
1010
// Need sdl_glsl output feature to be enabled on libcava
@@ -31,7 +31,7 @@ class CavaBackend final {
3131
// Methods
3232
int getAsciiRange();
3333
void doPauseResume();
34-
//Signal accessor
34+
// Signal accessor
3535
using type_signal_update = sigc::signal<void(const std::string&)>;
3636
type_signal_update signal_update();
3737
using type_signal_silence = sigc::signal<void()>;

src/modules/cava/cava.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ auto waybar::modules::cava::Cava::doAction(const std::string& name) -> void {
2121
}
2222

2323
// Cava actions
24-
void waybar::modules::cava::Cava::pause_resume() {
25-
backend_->doPauseResume();
26-
}
24+
void waybar::modules::cava::Cava::pause_resume() { backend_->doPauseResume(); }
2725

2826
auto waybar::modules::cava::Cava::onUpdate(const std::string& input) -> void {
2927
label_text_.clear();
30-
for (auto &ch : input)
28+
for (auto& ch : input)
3129
label_text_.append(getIcon((ch > ascii_range_) ? ascii_range_ : ch, "", ascii_range_ + 1));
3230

3331
label_.set_markup(label_text_);

src/modules/cava/cava_backend.cpp

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
#include <spdlog/spdlog.h>
44

5-
std::shared_ptr<waybar::modules::cava::CavaBackend> waybar::modules::cava::CavaBackend::inst(const Json::Value& config) {
6-
static auto *backend = new CavaBackend(config);
5+
std::shared_ptr<waybar::modules::cava::CavaBackend> waybar::modules::cava::CavaBackend::inst(
6+
const Json::Value& config) {
7+
static auto* backend = new CavaBackend(config);
78
static std::shared_ptr<CavaBackend> backend_ptr{backend};
89
return backend_ptr;
910
}
@@ -141,17 +142,15 @@ bool waybar::modules::cava::CavaBackend::isSilence() {
141142
return true;
142143
}
143144

144-
int waybar::modules::cava::CavaBackend::getAsciiRange() {
145-
return prm_.ascii_range;
146-
}
145+
int waybar::modules::cava::CavaBackend::getAsciiRange() { return prm_.ascii_range; }
147146

148147
// Process: execute cava
149148
void waybar::modules::cava::CavaBackend::invoke() {
150-
pthread_mutex_lock(&audio_data_.lock);
151-
::cava::cava_execute(audio_data_.cava_in, audio_data_.samples_counter, audio_raw_.cava_out,
152-
plan_);
153-
if (audio_data_.samples_counter > 0) audio_data_.samples_counter = 0;
154-
pthread_mutex_unlock(&audio_data_.lock);
149+
pthread_mutex_lock(&audio_data_.lock);
150+
::cava::cava_execute(audio_data_.cava_in, audio_data_.samples_counter, audio_raw_.cava_out,
151+
plan_);
152+
if (audio_data_.samples_counter > 0) audio_data_.samples_counter = 0;
153+
pthread_mutex_unlock(&audio_data_.lock);
155154
}
156155

157156
// Do transformation under raw data
@@ -182,20 +181,21 @@ void waybar::modules::cava::CavaBackend::doPauseResume() {
182181
pthread_mutex_unlock(&audio_data_.lock);
183182
}
184183

185-
waybar::modules::cava::CavaBackend::type_signal_update waybar::modules::cava::CavaBackend::signal_update() {
184+
waybar::modules::cava::CavaBackend::type_signal_update
185+
waybar::modules::cava::CavaBackend::signal_update() {
186186
return m_signal_update_;
187187
}
188188

189-
waybar::modules::cava::CavaBackend::type_signal_silence waybar::modules::cava::CavaBackend::signal_silence() {
189+
waybar::modules::cava::CavaBackend::type_signal_silence
190+
waybar::modules::cava::CavaBackend::signal_silence() {
190191
return m_signal_silence_;
191192
}
192193

193194
void waybar::modules::cava::CavaBackend::doUpdate() {
194195
if (audio_data_.suspendFlag) return;
195196

196197
silence_ = isSilence();
197-
if (!silence_)
198-
sleep_counter_ = 0;
198+
if (!silence_) sleep_counter_ = 0;
199199

200200
if (silence_ && prm_.sleep_timer != 0) {
201201
if (sleep_counter_ <=
@@ -208,8 +208,7 @@ void waybar::modules::cava::CavaBackend::doUpdate() {
208208
if (!silence_ || prm_.sleep_timer == 0) {
209209
downThreadDelay(frame_time_milsec_, suspend_silence_delay_);
210210
execute();
211-
if (re_paint_ == 1)
212-
m_signal_update_.emit(output_);
211+
if (re_paint_ == 1) m_signal_update_.emit(output_);
213212
} else {
214213
upThreadDelay(frame_time_milsec_, suspend_silence_delay_);
215214
m_signal_silence_.emit();

0 commit comments

Comments
 (0)