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

Clean up asio includes

Browse source
This commit is contained in:
badaix 2022-01-31 21:07:34 +01:00
parent 4f29f000de
commit caef2b7b87
25 changed files with 120 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

3
server/control_server.hpp
View file

@ -29,7 +29,8 @@
#include "server_settings.hpp"
// 3rd party headers
#include <boost/asio.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/asio/ip/tcp.hpp>
// standard headers
#include <memory>

1
server/control_session.hpp
View file

@ -25,7 +25,6 @@
#include "server_settings.hpp"
// 3rd party headers
#include <boost/asio.hpp>
// standard headers
#include <atomic>

4
server/control_session_tcp.cpp
View file

@ -19,6 +19,10 @@
// prototype/interface header file
#include "control_session_tcp.hpp"
// 3rd party headers
#include <boost/asio/read_until.hpp>
#include <boost/asio/write.hpp>
// local headers
#include "common/aixlog.hpp"
#include "message/pcm_chunk.hpp"

5
server/control_session_tcp.hpp
View file

@ -23,7 +23,10 @@
#include "control_session.hpp"
// 3rd party headers
#include <boost/asio.hpp>
#include <boost/asio/any_io_executor.hpp>
#include <boost/asio/ip/tcp.hpp>
#include <boost/asio/strand.hpp>
#include <boost/asio/streambuf.hpp>
// standard headers
#include <deque>

4
server/control_session_ws.cpp
View file

@ -16,8 +16,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
// local headers
// prototype/interface header file
#include "control_session_ws.hpp"
// local headers
#include "common/aixlog.hpp"
#include "message/pcm_chunk.hpp"

1
server/control_session_ws.hpp
View file

@ -23,6 +23,7 @@
#include "control_session.hpp"
// 3rd party headers
#include <boost/asio/strand.hpp>
#include <boost/beast/core.hpp>
#include <boost/beast/websocket.hpp>

1
server/publishZeroConf/publish_avahi.hpp
View file

@ -30,6 +30,7 @@
#include <avahi-common/malloc.h>
#include <avahi-common/simple-watch.h>
#include <avahi-common/timeval.h>
#include <boost/asio/steady_timer.hpp>
// standard headers
#include <atomic>

2
server/publishZeroConf/publish_mdns.hpp
View file

@ -20,7 +20,7 @@
#define PUBLISH_MDNS_HPP
// 3rd party headers
#include <boost/asio.hpp>
#include <boost/asio/io_context.hpp>
// standard headers
#include <string>

5
server/server.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
@ -33,7 +33,8 @@
#include "streamreader/stream_manager.hpp"
// 3rd party headers
#include <boost/asio.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/asio/steady_timer.hpp>
// standard headers
#include <memory>

3
server/stream_server.hpp
View file

@ -32,7 +32,8 @@
#include "streamreader/stream_manager.hpp"
// 3rd party headers
#include <boost/asio.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/asio/steady_timer.hpp>
// standard headers
#include <memory>

6
server/stream_session.hpp
View file

@ -25,7 +25,9 @@
#include "streamreader/stream_manager.hpp"
// 3rd party headers
#include <boost/asio.hpp>
#include <boost/asio/any_io_executor.hpp>
#include <boost/asio/buffer.hpp>
#include <boost/asio/strand.hpp>
// standard headers
#include <atomic>
@ -39,8 +41,6 @@
#include <vector>
namespace net = boost::asio;
class StreamSession;

1
server/stream_session_tcp.hpp
View file

@ -23,6 +23,7 @@
#include "stream_session.hpp"
// 3rd party headers
#include <boost/asio/ip/tcp.hpp>
// standard headers

7
server/stream_session_ws.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
@ -24,10 +24,9 @@
#include <boost/beast/websocket.hpp>
#include <deque>
namespace beast = boost::beast; // from <boost/beast.hpp>
namespace http = beast::http; // from <boost/beast/http.hpp>
namespace beast = boost::beast; // from <boost/beast.hpp>
// namespace http = beast::http; // from <boost/beast/http.hpp>
namespace websocket = beast::websocket; // from <boost/beast/websocket.hpp>
namespace net = boost::asio; // from <boost/asio.hpp>
/// Endpoint for a connected control client.

6
server/streamreader/alsa_stream.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
@ -24,7 +24,9 @@
// 3rd party headers
#include <alsa/asoundlib.h>
#include <boost/asio.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/asio/steady_timer.hpp>
namespace streamreader
{

6
server/streamreader/asio_stream.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
@ -25,7 +25,9 @@
#include "pcm_stream.hpp"
// 3rd party headers
#include <boost/asio.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/asio/read.hpp>
#include <boost/asio/steady_timer.hpp>
// standard headers
#include <atomic>

5
server/streamreader/pcm_stream.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
@ -43,7 +43,6 @@
#include <vector>
namespace net = boost::asio;
using json = nlohmann::json;
@ -180,7 +179,7 @@ protected:
/// Send request to stream control script
void sendRequest(const std::string& method, const jsonrpcpp::Parameter& params, ResultHandler handler);
net::strand<net::any_io_executor> strand_;
boost::asio::strand<boost::asio::any_io_executor> strand_;
std::chrono::time_point<std::chrono::steady_clock> tvEncodedChunk_;
std::vector<PcmStream::Listener*> pcmListeners_;
StreamUri uri_;

3
server/streamreader/stream_control.cpp
View file

@ -27,6 +27,9 @@
#include "common/utils/string_utils.hpp"
#include "encoder/encoder_factory.hpp"
// 3rd party headers
#include <boost/asio/read_until.hpp>
// standard headers
#include <memory>

3
server/streamreader/stream_control.hpp
View file

@ -33,7 +33,7 @@
#pragma GCC diagnostic ignored "-Wc++11-narrowing"
#include <boost/process.hpp>
#pragma GCC diagnostic pop
#include <boost/asio.hpp>
#include <boost/asio/any_io_executor.hpp>
// standard headers
#include <map>
@ -41,7 +41,6 @@
namespace bp = boost::process;
namespace net = boost::asio;
using json = nlohmann::json;

5
server/streamreader/tcp_stream.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
@ -22,6 +22,9 @@
// local headers
#include "asio_stream.hpp"
// 3rd party headers
#include <boost/asio/ip/tcp.hpp>
using boost::asio::ip::tcp;
namespace streamreader

4
server/streamreader/watchdog.hpp
View file

@ -20,12 +20,12 @@
#define WATCH_DOG_HPP
// 3rd party headers
#include <boost/asio.hpp>
#include <boost/asio/any_io_executor.hpp>
#include <boost/asio/steady_timer.hpp>
// standard headers
#include <memory>
namespace net = boost::asio;
namespace streamreader
{