Merge pull request #2925 from LukashonakV/bump_cava

libcava bump 0.10.1

meson.build

@@ -390,7 +390,7 @@ if get_option('experimental')
 endif
 
 cava = dependency('cava',
-                  version : '>=0.9.1',
+                  version : '>=0.10.1',
                   required: get_option('cava'),
                   fallback : ['cava', 'cava_dep'],
                   not_found_message: 'cava is not found. Building waybar without cava')

src/group.cpp

@@ -75,8 +75,7 @@ Group::Group(const std::string& name, const std::string& id, const Json::Value&
 
     if (left_to_right) {
       box.pack_end(revealer);
-    }
-    else {
+    } else {
       box.pack_start(revealer);
     }
 

src/modules/cava.cpp

@@ -53,8 +53,8 @@ waybar::modules::Cava::Cava(const std::string& id, const Json::Value& config)
   if (config_["method"].isString())
     prm_.input = cava::input_method_by_name(config_["method"].asString().c_str());
   if (config_["source"].isString()) prm_.audio_source = config_["source"].asString().data();
-  if (config_["sample_rate"].isNumeric()) prm_.fifoSample = config_["sample_rate"].asLargestInt();
-  if (config_["sample_bits"].isInt()) prm_.fifoSampleBits = config_["sample_bits"].asInt();
+  if (config_["sample_rate"].isNumeric()) prm_.samplerate = config_["sample_rate"].asLargestInt();
+  if (config_["sample_bits"].isInt()) prm_.samplebits = config_["sample_bits"].asInt();
   if (config_["stereo"].isBool()) prm_.stereo = config_["stereo"].asBool();
   if (config_["reverse"].isBool()) prm_.reverse = config_["reverse"].asBool();
   if (config_["bar_delimiter"].isInt()) prm_.bar_delim = config_["bar_delimiter"].asInt();

src/modules/hyprland/submap.cpp

@@ -54,7 +54,7 @@ void Submap::onEvent(const std::string& ev) {
   auto submapName = ev.substr(ev.find_last_of('>') + 1);
   submapName = waybar::util::sanitize_string(submapName);
 
-  if (!submap_.empty()){
+  if (!submap_.empty()) {
     label_.get_style_context()->remove_class(submap_);
   }
 
@@ -62,8 +62,6 @@ void Submap::onEvent(const std::string& ev) {
 
   label_.get_style_context()->add_class(submap_);
 
-
-
   spdlog::debug("hyprland submap onevent with {}", submap_);
 
   dp.emit();

subprojects/cava.wrap

@@ -1,7 +1,7 @@
 [wrap-file]
-directory = cava-0.9.1
-source_url = https://github.com/LukashonakV/cava/archive/0.9.1.tar.gz
-source_filename = cava-0.9.1.tar.gz
-source_hash = 4df540b7f4892f72e48772929a15bc9ad61e2bce7a084be2df01c72ca5c02333
+directory = cava-0.10.1
+source_url = https://github.com/LukashonakV/cava/archive/0.10.1.tar.gz
+source_filename = cava-0.10.1.tar.gz
+source_hash = ae8c7339908d6febeac5ab8df4576c03c9fdbca6c8e8975daf9ce68b57038bb5
 [provide]
 cava = cava_dep