diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt index 23506b3d..97d4fe37 100644 --- a/src/input/CMakeLists.txt +++ b/src/input/CMakeLists.txt @@ -43,7 +43,7 @@ target_sources(CemuInput PRIVATE api/DSU/DSUControllerProvider.h api/DSU/DSUMessages.h api/DSU/DSUMessages.cpp - api/DSU/TimeoutSocketOption.h + api/DSU/ReceiveTimeoutSocketOption.h ) # Keyboard controller diff --git a/src/input/api/DSU/DSUControllerProvider.cpp b/src/input/api/DSU/DSUControllerProvider.cpp index 066b202a..216ce93c 100644 --- a/src/input/api/DSU/DSUControllerProvider.cpp +++ b/src/input/api/DSU/DSUControllerProvider.cpp @@ -1,6 +1,6 @@ #include "input/api/DSU/DSUControllerProvider.h" #include "input/api/DSU/DSUController.h" -#include "input/api/DSU/TimeoutSocketOption.h" +#include "input/api/DSU/ReceiveTimeoutSocketOption.h" DSUControllerProvider::DSUControllerProvider() : base_type(), m_uid(rand()), m_socket(m_io_service) @@ -80,7 +80,7 @@ bool DSUControllerProvider::connect() m_socket.open(ip::udp::v4()); // set timeout for our threads to give a chance to exit - m_socket.set_option(TimeoutSocketOption{200}); + m_socket.set_option(ReceiveTimeoutSocketOption{200}); // reset data m_state = {}; diff --git a/src/input/api/DSU/TimeoutSocketOption.h b/src/input/api/DSU/ReceiveTimeoutSocketOption.h similarity index 68% rename from src/input/api/DSU/TimeoutSocketOption.h rename to src/input/api/DSU/ReceiveTimeoutSocketOption.h index c0ae8ceb..41c72ea1 100644 --- a/src/input/api/DSU/TimeoutSocketOption.h +++ b/src/input/api/DSU/ReceiveTimeoutSocketOption.h @@ -3,17 +3,16 @@ #if BOOST_OS_WINDOWS #include #include // For SOL_SOCKET, SO_RCVTIMEO -using TimeoutSocketOption = boost::asio::detail::socket_option::integer; +using ReceiveTimeoutSocketOption = boost::asio::detail::socket_option::integer; #elif BOOST_OS_LINUX || BOOST_OS_MACOS -// For making RCVTIME0 work on Linux and probably Mac too -class TimeoutSocketOption { - timeval m_data; +class ReceiveTimeoutSocketOption { + timeval m_data; // POSIX only allows timeeval to be parameter to option SO_RCVTIMEO public: - constexpr explicit TimeoutSocketOption(int time_ms) + constexpr explicit ReceiveTimeoutSocketOption(int time_ms) : m_data(timeval{.tv_usec = time_ms * 1000}){ } - TimeoutSocketOption& operator=(int time_ms){ + ReceiveTimeoutSocketOption& operator=(int time_ms){ m_data = timeval{.tv_usec = time_ms * 1000}; return *this; }