3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-12 22:27:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix client latency

Browse source
This commit is contained in:
badaix 2020-04-19 14:27:41 +02:00
parent 4bdbc24c52
commit 827cfb7985
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/controller.cpp
View file

@ -88,7 +88,7 @@ void Controller::onMessageReceived(ClientConnection* /*connection*/, const msg::
{ {
player_->setVolume(serverSettings_->getVolume() / 100.); player_->setVolume(serverSettings_->getVolume() / 100.);
player_->setMute(serverSettings_->isMuted()); player_->setMute(serverSettings_->isMuted());
stream_->setBufferLen(serverSettings_->getBufferMs() - serverSettings_->getLatency()); stream_->setBufferLen(std::max(0, serverSettings_->getBufferMs() - serverSettings_->getLatency() - settings_.player.latency));
} }
} }
else if (baseMessage.type == message_type::kCodecHeader) else if (baseMessage.type == message_type::kCodecHeader)
@ -122,7 +122,7 @@ void Controller::onMessageReceived(ClientConnection* /*connection*/, const msg::
LOG(NOTICE) << TAG("state") << "sampleformat: " << sampleFormat_.getFormat() << "\n"; LOG(NOTICE) << TAG("state") << "sampleformat: " << sampleFormat_.getFormat() << "\n";
stream_ = make_shared<Stream>(sampleFormat_, settings_.player.sample_format); stream_ = make_shared<Stream>(sampleFormat_, settings_.player.sample_format);
stream_->setBufferLen(serverSettings_->getBufferMs() - settings_.player.latency); stream_->setBufferLen(std::max(0, serverSettings_->getBufferMs() - serverSettings_->getLatency() - settings_.player.latency));
const auto& pcm_device = settings_.player.pcm_device; const auto& pcm_device = settings_.player.pcm_device;
const auto& player_name = settings_.player.player_name; const auto& player_name = settings_.player.player_name;