From e03119fe9414b8a83a4a87cadbbf6d0429b878c9 Mon Sep 17 00:00:00 2001 From: Viktar Lukashonak Date: Tue, 9 Dec 2025 18:13:45 +0300 Subject: [PATCH] Factory. cava_frontend --- .../modules/cava/{cava.hpp => cavaRaw.hpp} | 0 include/modules/cava/cava_frontend.hpp | 30 +++++++++++++++++++ meson.build | 2 +- src/factory.cpp | 15 ++-------- src/modules/cava/{cava.cpp => cavaRaw.cpp} | 2 +- src/modules/cava/cava_backend.cpp | 19 ++++++++---- 6 files changed, 48 insertions(+), 20 deletions(-) rename include/modules/cava/{cava.hpp => cavaRaw.hpp} (100%) create mode 100644 include/modules/cava/cava_frontend.hpp rename src/modules/cava/{cava.cpp => cavaRaw.cpp} (98%) diff --git a/include/modules/cava/cava.hpp b/include/modules/cava/cavaRaw.hpp similarity index 100% rename from include/modules/cava/cava.hpp rename to include/modules/cava/cavaRaw.hpp diff --git a/include/modules/cava/cava_frontend.hpp b/include/modules/cava/cava_frontend.hpp new file mode 100644 index 00000000..5a73f62f --- /dev/null +++ b/include/modules/cava/cava_frontend.hpp @@ -0,0 +1,30 @@ +#pragma once + +#ifdef HAVE_LIBCAVA +#include "cavaRaw.hpp" +#include "cava_backend.hpp" +#ifdef HAVE_LIBCAVAGLSL +#include "cavaGLSL.hpp" +#endif +#endif + +namespace waybar::modules::cava { +AModule* getModule(const std::string& id, const Json::Value& config) { +#ifdef HAVE_LIBCAVA + const std::shared_ptr backend_{waybar::modules::cava::CavaBackend::inst(config)}; + switch (backend_->getPrm()->output) { + case ::cava::output_method::OUTPUT_RAW: + return new waybar::modules::cava::Cava(id, config); + break; +#ifdef HAVE_LIBCAVAGLSL + case ::cava::output_method::OUTPUT_SDL_GLSL: + return new waybar::modules::cava::CavaGLSL(id, config); + break; +#endif + default: + break; + } +#endif + throw std::runtime_error("Unknown module"); +}; +} // namespace waybar::modules::cava diff --git a/meson.build b/meson.build index 17818a09..c6b7f90a 100644 --- a/meson.build +++ b/meson.build @@ -507,7 +507,7 @@ eproxy = dependency('epoxy', required: false) if cava.found() add_project_arguments('-DHAVE_LIBCAVA', language: 'cpp') - src_files += files('src/modules/cava/cava.cpp', + src_files += files('src/modules/cava/cavaRaw.cpp', 'src/modules/cava/cava_backend.cpp') man_files += files('man/waybar-cava.5.scd') diff --git a/src/factory.cpp b/src/factory.cpp index 94ca8e61..2fd3e3b8 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -108,18 +108,13 @@ #ifdef HAVE_LIBWIREPLUMBER #include "modules/wireplumber.hpp" #endif -#ifdef HAVE_LIBCAVA -#include "modules/cava/cava.hpp" -#ifdef HAVE_LIBCAVAGLSL -#include "modules/cava/cavaGLSL.hpp" -#endif -#endif #ifdef HAVE_SYSTEMD_MONITOR #include "modules/systemd_failed_units.hpp" #endif #ifdef HAVE_LIBGPS #include "modules/gps.hpp" #endif +#include "modules/cava/cava_frontend.hpp" #include "modules/cffi.hpp" #include "modules/custom.hpp" #include "modules/image.hpp" @@ -344,15 +339,9 @@ waybar::AModule* waybar::Factory::makeModule(const std::string& name, return new waybar::modules::Wireplumber(id, config_[name]); } #endif -#ifdef HAVE_LIBCAVA if (ref == "cava") { - return new waybar::modules::cava::Cava(id, config_[name]); -#ifdef HAVE_LIBCAVAGLSL - } else if (ref == "cavaGLSL") { - return new waybar::modules::cava::CavaGLSL(id, config_[name]); -#endif + return waybar::modules::cava::getModule(id, config_[name]); } -#endif #ifdef HAVE_SYSTEMD_MONITOR if (ref == "systemd-failed-units") { return new waybar::modules::SystemdFailedUnits(id, config_[name]); diff --git a/src/modules/cava/cava.cpp b/src/modules/cava/cavaRaw.cpp similarity index 98% rename from src/modules/cava/cava.cpp rename to src/modules/cava/cavaRaw.cpp index 2ea4e694..edec902b 100644 --- a/src/modules/cava/cava.cpp +++ b/src/modules/cava/cavaRaw.cpp @@ -1,4 +1,4 @@ -#include "modules/cava/cava.hpp" +#include "modules/cava/cavaRaw.hpp" #include diff --git a/src/modules/cava/cava_backend.cpp b/src/modules/cava/cava_backend.cpp index c2563272..917e165f 100644 --- a/src/modules/cava/cava_backend.cpp +++ b/src/modules/cava/cava_backend.cpp @@ -181,11 +181,16 @@ void waybar::modules::cava::CavaBackend::loadConfig() { // Override cava parameters by the user config prm_.inAtty = 0; - prm_.output = ::cava::output_method::OUTPUT_RAW; - if (prm_.data_format) free(prm_.data_format); - prm_.data_format = strdup("ascii"); - if (prm_.raw_target) free(prm_.raw_target); - prm_.raw_target = strdup("/dev/stdout"); + auto const output{prm_.output}; + // prm_.output = ::cava::output_method::OUTPUT_RAW; + if (config_["data_format"].isString()) { + if (prm_.data_format) free(prm_.data_format); + prm_.data_format = strdup(config_["data_format"].asString().c_str()); + } + if (config_["raw_target"].isString()) { + if (prm_.raw_target) free(prm_.raw_target); + prm_.raw_target = strdup(config_["raw_target"].asString().c_str()); + } prm_.ascii_range = config_["format-icons"].size() - 1; if (config_["bar_spacing"].isInt()) prm_.bar_spacing = config_["bar_spacing"].asInt(); @@ -251,11 +256,15 @@ void waybar::modules::cava::CavaBackend::loadConfig() { exit(EXIT_FAILURE); } + prm_.output = ::cava::output_method::OUTPUT_RAW; + // Make cava parameters configuration // Init cava plan, audio_raw structure audio_raw_init(&audio_data_, &audio_raw_, &prm_, &plan_); if (!plan_) spdlog::error("cava backend plan is not provided"); audio_raw_.previous_frame[0] = -1; // For first Update() call need to rePaint text message + + prm_.output = output; } const struct ::cava::config_params* waybar::modules::cava::CavaBackend::getPrm() { return &prm_; }