RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2925 from LukashonakV/bump_cava 

libcava bump 0.10.1
pull/1899/merge
Alexis Rouillard 2024-02-19 22:47:04 +01:00 committed by GitHub
parent c553e3028e d7d4dca6ba
commit a18b6dcc29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

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

3
src/group.cpp
View File

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

4
src/modules/cava.cpp
View File

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

2
src/modules/hyprland/submap.cpp
View File

@ -62,8 +62,6 @@ void Submap::onEvent(const std::string& ev) {
label_.get_style_context()->add_class(submap_); label_.get_style_context()->add_class(submap_);
spdlog::debug("hyprland submap onevent with {}", submap_); spdlog::debug("hyprland submap onevent with {}", submap_);
dp.emit(); dp.emit();

8
subprojects/cava.wrap
View File

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