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

Replace some shared_ptr with unique_ptr

Browse source
This commit is contained in:
badaix 2019-12-11 22:48:21 +01:00
parent d8a6e63691
commit 6b793dfb76
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/controller.cpp
View file

@ -82,7 +82,7 @@ void Controller::onMessageReceived(ClientConnection* /*connection*/, const msg::
}
else if (baseMessage.type == message_type::kServerSettings)
{
serverSettings_.reset(new msg::ServerSettings());
serverSettings_ = make_unique<msg::ServerSettings>();
serverSettings_->deserialize(baseMessage, buffer);
LOG(INFO) << "ServerSettings - buffer: " << serverSettings_->getBufferMs() << ", latency: " << serverSettings_->getLatency()
<< ", volume: " << serverSettings_->getVolume() << ", muted: " << serverSettings_->isMuted() << "\n";
@ -95,7 +95,7 @@ void Controller::onMessageReceived(ClientConnection* /*connection*/, const msg::
}
else if (baseMessage.type == message_type::kCodecHeader)
{
headerChunk_.reset(new msg::CodecHeader());
headerChunk_ = make_unique<msg::CodecHeader>();
headerChunk_->deserialize(baseMessage, buffer);
LOG(INFO) << "Codec: " << headerChunk_->codec << "\n";
@ -141,11 +141,12 @@ void Controller::onMessageReceived(ClientConnection* /*connection*/, const msg::
}
else if (baseMessage.type == message_type::kStreamTags)
{
streamTags_.reset(new msg::StreamTags());
streamTags_->deserialize(baseMessage, buffer);
if (meta_)
meta_->push(streamTags_->msg);
{
msg::StreamTags streamTags_;
streamTags_.deserialize(baseMessage, buffer);
meta_->push(streamTags_.msg);
}
}
if (baseMessage.type != message_type::kTime)
@ -214,7 +215,7 @@ void Controller::worker()
throw SnapException(async_exception_->what());
}
shared_ptr<msg::Time> reply = clientConnection_->sendReq<msg::Time>(&timeReq, chronos::msec(2000));
auto reply = clientConnection_->sendReq<msg::Time>(&timeReq, chronos::msec(2000));
if (reply)
{
TimeProvider::getInstance().setDiff(reply->latency, reply->received - reply->sent);