Rooba
/
polybar
mirror of https://github.com/polybar/polybar.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(volume): Warn instead of throw

This commit is contained in:
NBonaparte 2018-01-20 13:58:19 -08:00 committed by Patrick Ziegler
parent 83e523518e
commit 06dee3dedd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/modules/meta/factory.hpp
View File

@ -52,7 +52,7 @@ POLYBAR_NS
using namespace modules; using namespace modules;
namespace { namespace {
module_interface* make_module(string&& name, const bar_settings& bar, string module_name) { module_interface* make_module(string&& name, const bar_settings& bar, string module_name, const logger& m_log) {
if (name == "internal/counter") { if (name == "internal/counter") {
return new counter_module(bar, move(module_name)); return new counter_module(bar, move(module_name));
} else if (name == "internal/backlight") { } else if (name == "internal/backlight") {
@ -76,7 +76,8 @@ namespace {
} else if (name == "internal/mpd") { } else if (name == "internal/mpd") {
return new mpd_module(bar, move(module_name)); return new mpd_module(bar, move(module_name));
} else if (name == "internal/volume") { } else if (name == "internal/volume") {
throw application_error("internal/volume is deprecated, use internal/alsa instead"); m_log.warn("internal/volume is deprecated, use internal/alsa instead");
return new alsa_module(bar, move("internal/alsa"));
} else if (name == "internal/alsa") { } else if (name == "internal/alsa") {
return new alsa_module(bar, move(module_name)); return new alsa_module(bar, move(module_name));
} else if (name == "internal/pulseaudio") { } else if (name == "internal/pulseaudio") {

2
src/components/controller.cpp
View File

@ -103,7 +103,7 @@ controller::controller(connection& conn, signal_emitter& emitter, const logger&
throw application_error("Inter-process messaging needs to be enabled"); throw application_error("Inter-process messaging needs to be enabled");
} }
m_modules[align].emplace_back(make_module(move(type), m_bar->settings(), module_name)); m_modules[align].emplace_back(make_module(move(type), m_bar->settings(), module_name, m_log));
created_modules++; created_modules++;
} catch (const runtime_error& err) { } catch (const runtime_error& err) {
m_log.err("Disabling module \"%s\" (reason: %s)", module_name, err.what()); m_log.err("Disabling module \"%s\" (reason: %s)", module_name, err.what());