pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(pulseaudio) Add max volume configuration

Browse Source
This commit is contained in:
Kajzer 2018-04-10 01:13:04 +02:00 committed by NBonaparte
parent 3f9ce4bb99
commit 688658c306
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/adapters/pulseaudio.hpp
View File

@ -26,7 +26,7 @@ class pulseaudio {
using queue = std::queue<evtype>; using queue = std::queue<evtype>;
public: public:
explicit pulseaudio(const logger& logger, string&& sink_name); explicit pulseaudio(const logger& logger, string&& sink_name, bool m_max_volume);
~pulseaudio(); ~pulseaudio();
pulseaudio(const pulseaudio& o) = delete; pulseaudio(const pulseaudio& o) = delete;
@ -74,6 +74,8 @@ class pulseaudio {
string spec_s_name; string spec_s_name;
string s_name; string s_name;
uint32_t m_index{0}; uint32_t m_index{0};
pa_volume_t max_volume{PA_VOLUME_UI_MAX};
}; };
POLYBAR_NS_END POLYBAR_NS_END

6
src/adapters/pulseaudio.cpp
View File

@ -6,7 +6,7 @@ POLYBAR_NS
/** /**
* Construct pulseaudio object * Construct pulseaudio object
*/ */
pulseaudio::pulseaudio(const logger& logger, string&& sink_name) : m_log(logger), spec_s_name(sink_name) { pulseaudio::pulseaudio(const logger& logger, string&& sink_name, bool m_max_volume) : m_log(logger), spec_s_name(sink_name) {
m_mainloop = pa_threaded_mainloop_new(); m_mainloop = pa_threaded_mainloop_new();
if (!m_mainloop) { if (!m_mainloop) {
throw pulseaudio_error("Could not create pulseaudio threaded mainloop."); throw pulseaudio_error("Could not create pulseaudio threaded mainloop.");
@ -71,6 +71,8 @@ pulseaudio::pulseaudio(const logger& logger, string&& sink_name) : m_log(logger)
m_log.trace("pulseaudio: using sink %s", s_name); m_log.trace("pulseaudio: using sink %s", s_name);
} }
max_volume = m_max_volume ? PA_VOLUME_UI_MAX : PA_VOLUME_NORM;
op = pa_context_subscribe(m_context, PA_SUBSCRIPTION_MASK_SINK, simple_callback, this); op = pa_context_subscribe(m_context, PA_SUBSCRIPTION_MASK_SINK, simple_callback, this);
wait_loop(op, m_mainloop); wait_loop(op, m_mainloop);
if (!success) if (!success)
@ -177,7 +179,7 @@ void pulseaudio::inc_volume(int delta_perc) {
pa_threaded_mainloop_lock(m_mainloop); pa_threaded_mainloop_lock(m_mainloop);
pa_volume_t vol = math_util::percentage_to_value<pa_volume_t>(abs(delta_perc), PA_VOLUME_NORM); pa_volume_t vol = math_util::percentage_to_value<pa_volume_t>(abs(delta_perc), PA_VOLUME_NORM);
if (delta_perc > 0) { if (delta_perc > 0) {
if (pa_cvolume_max(&cv) + vol <= PA_VOLUME_UI_MAX) { if (pa_cvolume_max(&cv) + vol <= max_volume) {
pa_cvolume_inc(&cv, vol); pa_cvolume_inc(&cv, vol);
} else { } else {
m_log.warn("pulseaudio: maximum volume reached"); m_log.warn("pulseaudio: maximum volume reached");

4
src/modules/pulseaudio.cpp
View File

@ -17,8 +17,10 @@ namespace modules {
pulseaudio_module::pulseaudio_module(const bar_settings& bar, string name_) : event_module<pulseaudio_module>(bar, move(name_)) { pulseaudio_module::pulseaudio_module(const bar_settings& bar, string name_) : event_module<pulseaudio_module>(bar, move(name_)) {
// Load configuration values // Load configuration values
auto sink_name = m_conf.get(name(), "sink", ""s); auto sink_name = m_conf.get(name(), "sink", ""s);
bool m_max_volume = m_conf.get(name(), "use-ui-max", true);
try { try {
m_pulseaudio = factory_util::unique<pulseaudio>(m_log, move(sink_name)); m_pulseaudio = factory_util::unique<pulseaudio>(m_log, move(sink_name), m_max_volume);
} catch (const pulseaudio_error& err) { } catch (const pulseaudio_error& err) {
throw module_error(err.what()); throw module_error(err.what());
} }