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

switched to standalone asio

Browse source
This commit is contained in:
badaix 2015-12-03 22:23:43 +01:00
parent 75179cc936
commit 5cc7285a87
14 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/streamSession.cpp
View file

@ -54,10 +54,10 @@ void StreamSession::stop()
setActive(false);
try
{
boost::system::error_code ec;
std::error_code ec;
if (socket_)
{
socket_->shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
socket_->shutdown(asio::ip::tcp::socket::shutdown_both, ec);
if (ec) logE << "Error in socket shutdown: " << ec << "\n";
socket_->close(ec);
if (ec) logE << "Error in socket close: " << ec << "\n";
@ -90,8 +90,8 @@ void StreamSession::socketRead(void* _to, size_t _bytes)
size_t read = 0;
do
{
boost::system::error_code error;
read += socket_->read_some(boost::asio::buffer((char*)_to + read, _bytes - read));
std::error_code error;
read += socket_->read_some(asio::buffer((char*)_to + read, _bytes - read));
}
while (active_ && (read < _bytes));
}
@ -114,12 +114,12 @@ bool StreamSession::send(const msg::BaseMessage* message) const
std::unique_lock<std::mutex> mlock(mutex_);
if (!socket_ || !active_)
return false;
boost::asio::streambuf streambuf;
asio::streambuf streambuf;
std::ostream stream(&streambuf);
tv t;
message->sent = t;
message->serialize(stream);
boost::asio::write(*socket_.get(), streambuf);
asio::write(*socket_.get(), streambuf);
// logO << "done: " << message->type << ", size: " << message->size << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
return true;
}
@ -165,7 +165,7 @@ void StreamSession::writer()
{
try
{
boost::asio::streambuf streambuf;
asio::streambuf streambuf;
std::ostream stream(&streambuf);
shared_ptr<const msg::BaseMessage> message;
while (active_)