diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-03-17 01:25:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-03-22 13:29:58 +0100 |
| commit | 9dd72fc481349f0b5ce985164441eecfa6485c19 (patch) | |
| tree | d8136ef6d6b660a5a411722a128d0e309333ff3d /src/lib/encode_server_finder.cc | |
| parent | 169c47ede14b6e86e054871a56ffa048357b4463 (diff) | |
Add abstraction of io_{context,service} and use it as appropriate.
Diffstat (limited to 'src/lib/encode_server_finder.cc')
| -rw-r--r-- | src/lib/encode_server_finder.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc index 22c1d37dd..e9636620c 100644 --- a/src/lib/encode_server_finder.cc +++ b/src/lib/encode_server_finder.cc @@ -91,7 +91,7 @@ EncodeServerFinder::stop () _search_thread.join(); } catch (...) {} - _listen_io_service.stop (); + _listen_io_context.stop(); try { _listen_thread.join (); } catch (...) {} @@ -108,8 +108,8 @@ try start_of_thread ("EncodeServerFinder-search"); boost::system::error_code error; - boost::asio::io_service io_service; - boost::asio::ip::udp::socket socket (io_service); + dcpomatic::io_context io_context; + boost::asio::ip::udp::socket socket(io_context); socket.open (boost::asio::ip::udp::v4(), error); if (error) { throw NetworkError ("failed to set up broadcast socket"); @@ -135,7 +135,7 @@ try /* Query our `definite' servers (if there are any) */ for (auto const& i: Config::instance()->servers()) { try { - boost::asio::ip::udp::resolver resolver (io_service); + boost::asio::ip::udp::resolver resolver(io_context); boost::asio::ip::udp::resolver::query query(i, fmt::to_string(HELLO_PORT)); boost::asio::ip::udp::endpoint end_point (*resolver.resolve(query)); socket.send_to (boost::asio::buffer(data.c_str(), data.size() + 1), end_point); @@ -186,14 +186,14 @@ try { try { _listen_acceptor.reset ( - new tcp::acceptor (_listen_io_service, tcp::endpoint(tcp::v4(), is_batch_converter ? BATCH_SERVER_PRESENCE_PORT : MAIN_SERVER_PRESENCE_PORT)) + new tcp::acceptor(_listen_io_context, tcp::endpoint(tcp::v4(), is_batch_converter ? BATCH_SERVER_PRESENCE_PORT : MAIN_SERVER_PRESENCE_PORT)) ); } catch (...) { boost::throw_exception(NetworkError(variant::insert_dcpomatic(_("Could not listen for remote encode servers. Perhaps another instance of %1 is running.")))); } start_accept (); - _listen_io_service.run (); + _listen_io_context.run(); } catch (...) { |