Skip to content

Commit

Permalink
Fixed the initial displayed volume with PulseAudio (#1929)
Browse files Browse the repository at this point in the history
1. The initial displayed volume (immediately after Panel's startup) is fixed when volumes beyond 100% are not allowed (the default).
 2. The previous behavior is kept when volumes beyond 100% are allowed.
 3. The displayed volume is updated when the option about volumes beyond 100% is toggled.

Fixes #1928
  • Loading branch information
tsujan authored Aug 27, 2023
1 parent 9918a0e commit 09a6439
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions plugin-volume/pulseaudioengine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ PulseAudioEngine::PulseAudioEngine(QObject *parent) :
m_context(nullptr),
m_contextState(PA_CONTEXT_UNCONNECTED),
m_ready(false),
m_maximumVolume(PA_VOLUME_UI_MAX)
m_maximumVolume(PA_VOLUME_NORM)
{
qRegisterMetaType<pa_context_state_t>("pa_context_state_t");

Expand Down Expand Up @@ -420,10 +420,13 @@ void PulseAudioEngine::setContextState(pa_context_state_t state)

void PulseAudioEngine::setIgnoreMaxVolume(bool ignore)
{
int oldMax = m_maximumVolume;
if (ignore)
m_maximumVolume = PA_VOLUME_UI_MAX;
else
m_maximumVolume = pa_sw_volume_from_dB(0);
m_maximumVolume = PA_VOLUME_NORM;
if (oldMax != m_maximumVolume)
retrieveSinks();
}


Expand Down

0 comments on commit 09a6439

Please sign in to comment.