3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-08-06 10:09:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Ignore hardware volume changes when not connected.

Browse source 
This needs to be protected with a mutex to avoid races with concurrent connects/disconnects.
This commit is contained in:
Njal Karevoll 2021-10-19 21:23:21 +02:00 • committed by Johannes Pohl
parent 8a13274933
commit d9bdd1b6c0
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/player/pulse_player.cpp
View file

@ -199,6 +199,10 @@ void PulsePlayer::worker()
void PulsePlayer::setHardwareVolume(double volume, bool muted)
{
// if we're not connected to pulse, ignore the hardware volume change as the volume will be set upon reconnect
if (playstream_ == nullptr)
return;
last_change_ = std::chrono::steady_clock::now();
pa_cvolume cvolume;
if (muted)
@ -363,6 +367,7 @@ void PulsePlayer::start()
void PulsePlayer::connect()
{
std::lock_guard<std::mutex> lock(mutex_);
LOG(INFO, LOG_TAG) << "Connecting to pulse\n";
if (settings_.pcm_device.idx == -1)
@ -511,6 +516,7 @@ void PulsePlayer::stop()
void PulsePlayer::disconnect()
{
std::lock_guard<std::mutex> lock(mutex_);
LOG(INFO, LOG_TAG) << "Disconnecting from pulse\n";
if (pa_ml_ != nullptr)