3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-16 10:36:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Small code cleanup

Browse source
This commit is contained in:
badaix 2020-06-06 13:44:22 +02:00
parent 8238f7a147
commit 0af19ca0cb
2 changed files with 102 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/client_connection.cpp
View file

@ -155,6 +155,7 @@ void ClientConnection::sendNext()
})); }));
} }
void ClientConnection::send(const msg::message_ptr& message, const ResultHandler& handler) void ClientConnection::send(const msg::message_ptr& message, const ResultHandler& handler)
{ {
strand_.post([this, message, handler]() { strand_.post([this, message, handler]() {

14
client/controller.cpp
View file

@ -65,6 +65,7 @@
using namespace std; using namespace std;
static constexpr auto LOG_TAG = "Controller"; static constexpr auto LOG_TAG = "Controller";
static constexpr auto TIME_SYNC_INTERVAL = 1s;
Controller::Controller(boost::asio::io_context& io_context, const ClientSettings& settings, std::unique_ptr<MetadataAdapter> meta) Controller::Controller(boost::asio::io_context& io_context, const ClientSettings& settings, std::unique_ptr<MetadataAdapter> meta)
: io_context_(io_context), timer_(io_context), settings_(settings), stream_(nullptr), decoder_(nullptr), player_(nullptr), meta_(std::move(meta)), : io_context_(io_context), timer_(io_context), settings_(settings), stream_(nullptr), decoder_(nullptr), player_(nullptr), meta_(std::move(meta)),
@ -88,8 +89,12 @@ std::unique_ptr<Player> Controller::createPlayer(ClientSettings::Player& setting
void Controller::getNextMessage() void Controller::getNextMessage()
{ {
clientConnection_->getNextMessage([this](const boost::system::error_code& ec, std::unique_ptr<msg::BaseMessage> response) { clientConnection_->getNextMessage([this](const boost::system::error_code& ec, std::unique_ptr<msg::BaseMessage> response) {
if (!ec) if (ec)
{ {
reconnect();
return;
}
if (response->type == message_type::kWireChunk) if (response->type == message_type::kWireChunk)
{ {
if (stream_ && decoder_) if (stream_ && decoder_)
@ -216,11 +221,6 @@ void Controller::getNextMessage()
LOG(WARNING, LOG_TAG) << "Unexpected message received, type: " << response->type << "\n"; LOG(WARNING, LOG_TAG) << "Unexpected message received, type: " << response->type << "\n";
} }
getNextMessage(); getNextMessage();
}
else
{
reconnect();
}
}); });
} }
@ -241,7 +241,7 @@ void Controller::sendTimeSyncMessage(int quick_syncs)
TimeProvider::getInstance().setDiff(response->latency, response->received - response->sent); TimeProvider::getInstance().setDiff(response->latency, response->received - response->sent);
} }
std::chrono::microseconds next = 1s; std::chrono::microseconds next = TIME_SYNC_INTERVAL;
if (quick_syncs > 0) if (quick_syncs > 0)
{ {
if (--quick_syncs == 0) if (--quick_syncs == 0)