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

pulse: Set volume to max when the increase was too huge (#1765)

Browse Source 
Previously, when volume was in close proximity to n_max_volume, a larger
increase would not do anything. After this patch, volume is set to
m_max_volume in such scenarios. If the volume already is at
n_max_volume, we mirror the old behavior and emit a warning.

So, for example, consider m_max_volume was 100%, but the volume prior
to the increase was 96%. An increase of 5% would do nothing (emit a
warning, even) instead of setting the volume to 100%.

Note that this might happen even if the volume is at 95% according to
%percentage% due to rounding errors.
This commit is contained in:
Sebastian Graf 2019-05-14 22:06:15 +02:00 committed by Patrick Ziegler
parent b2b73b5d91
commit cb75857ff6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/adapters/pulseaudio.cpp
View File

@ -175,8 +175,12 @@ 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 <= m_max_volume) { pa_volume_t current = pa_cvolume_max(&cv);
if (current + vol <= m_max_volume) {
pa_cvolume_inc(&cv, vol); pa_cvolume_inc(&cv, vol);
} else if (current < m_max_volume) {
// avoid rounding errors and set to m_max_volume directly
pa_cvolume_scale(&cv, m_max_volume);
} else { } else {
m_log.warn("pulseaudio: maximum volume reached"); m_log.warn("pulseaudio: maximum volume reached");
} }