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

io_context cleanups

Browse source
This commit is contained in:
badaix 2022-04-03 15:27:28 +02:00
parent 945e19a4eb
commit bdc6299523
11 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/streamreader/pcm_stream.cpp
View file

@ -46,7 +46,7 @@ static constexpr auto LOG_TAG = "PcmStream";
PcmStream::PcmStream(PcmStream::Listener* pcmListener, boost::asio::io_context& ioc, const ServerSettings& server_settings, const StreamUri& uri)
: active_(false), strand_(boost::asio::make_strand(ioc.get_executor())), pcmListeners_{pcmListener}, uri_(uri), chunk_ms_(20), state_(ReaderState::kIdle),
ioc_(ioc), server_settings_(server_settings), req_id_(0), property_timer_(strand_)
server_settings_(server_settings), req_id_(0), property_timer_(strand_)
{
encoder::EncoderFactory encoderFactory;
if (uri_.query.find(kUriCodec) == uri_.query.end())

1
server/streamreader/pcm_stream.hpp
View file

@ -189,7 +189,6 @@ protected:
std::string name_;
std::atomic<ReaderState> state_;
Properties properties_;
boost::asio::io_context& ioc_;
ServerSettings server_settings_;
std::unique_ptr<StreamControl> stream_ctrl_;
std::atomic<int> req_id_;

20
server/streamreader/stream_manager.cpp
View file

@ -1,6 +1,6 @@
/***
This file is part of snapcast
Copyright (C) 2014-2021 Johannes Pohl
Copyright (C) 2014-2022 Johannes Pohl
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -47,7 +47,7 @@ namespace streamreader
StreamManager::StreamManager(PcmStream::Listener* pcmListener, boost::asio::io_context& ioc, const ServerSettings& settings)
// const std::string& defaultSampleFormat, const std::string& defaultCodec, size_t defaultChunkBufferMs)
: pcmListener_(pcmListener), settings_(settings), ioc_(ioc)
: pcmListener_(pcmListener), settings_(settings), io_context_(ioc)
{
}
@ -79,20 +79,20 @@ PcmStreamPtr StreamManager::addStream(StreamUri& streamUri)
if (streamUri.scheme == "pipe")
{
stream = make_shared<PipeStream>(pcmListener_, ioc_, settings_, streamUri);
stream = make_shared<PipeStream>(pcmListener_, io_context_, settings_, streamUri);
}
else if (streamUri.scheme == "file")
{
stream = make_shared<FileStream>(pcmListener_, ioc_, settings_, streamUri);
stream = make_shared<FileStream>(pcmListener_, io_context_, settings_, streamUri);
}
else if (streamUri.scheme == "process")
{
stream = make_shared<ProcessStream>(pcmListener_, ioc_, settings_, streamUri);
stream = make_shared<ProcessStream>(pcmListener_, io_context_, settings_, streamUri);
}
#ifdef HAS_ALSA
else if (streamUri.scheme == "alsa")
{
stream = make_shared<AlsaStream>(pcmListener_, ioc_, settings_, streamUri);
stream = make_shared<AlsaStream>(pcmListener_, io_context_, settings_, streamUri);
}
#endif
else if ((streamUri.scheme == "spotify") || (streamUri.scheme == "librespot"))
@ -101,7 +101,7 @@ PcmStreamPtr StreamManager::addStream(StreamUri& streamUri)
// that all constructors of all parent classes also use the overwritten sample
// format.
streamUri.query[kUriSampleFormat] = "44100:16:2";
stream = make_shared<LibrespotStream>(pcmListener_, ioc_, settings_, streamUri);
stream = make_shared<LibrespotStream>(pcmListener_, io_context_, settings_, streamUri);
}
else if (streamUri.scheme == "airplay")
{
@ -109,15 +109,15 @@ PcmStreamPtr StreamManager::addStream(StreamUri& streamUri)
// that all constructors of all parent classes also use the overwritten sample
// format.
streamUri.query[kUriSampleFormat] = "44100:16:2";
stream = make_shared<AirplayStream>(pcmListener_, ioc_, settings_, streamUri);
stream = make_shared<AirplayStream>(pcmListener_, io_context_, settings_, streamUri);
}
else if (streamUri.scheme == "tcp")
{
stream = make_shared<TcpStream>(pcmListener_, ioc_, settings_, streamUri);
stream = make_shared<TcpStream>(pcmListener_, io_context_, settings_, streamUri);
}
else if (streamUri.scheme == "meta")
{
stream = make_shared<MetaStream>(pcmListener_, streams_, ioc_, settings_, streamUri);
stream = make_shared<MetaStream>(pcmListener_, streams_, io_context_, settings_, streamUri);
}
else
{

4
server/streamreader/stream_manager.hpp
View file

@ -1,6 +1,6 @@
/***
This file is part of snapcast
Copyright (C) 2014-2021 Johannes Pohl
Copyright (C) 2014-2022 Johannes Pohl
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -55,7 +55,7 @@ private:
std::vector<PcmStreamPtr> streams_;
PcmStream::Listener* pcmListener_;
ServerSettings settings_;
boost::asio::io_context& ioc_;
boost::asio::io_context& io_context_;
};
} // namespace streamreader