ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InputCommon/DualShockUDPClient: Use an alias for the clock type 

Makes code slightly less verbose without exposing the whole chrono
header to the current source file.
This commit is contained in:
Lioncash 2019-11-22 16:49:43 -05:00
parent db9e592765
commit 334e2768f5
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
View File

@ -39,6 +39,9 @@ const Config::ConfigInfo<int> SERVER_PORT{{Config::System::DualShockUDPClient, "
DEFAULT_SERVER_PORT}; DEFAULT_SERVER_PORT};
} // namespace Settings } // namespace Settings
// Clock type used for querying timeframes
using SteadyClock = std::chrono::steady_clock;
class Device : public Core::Device class Device : public Core::Device
{ {
private: private:
@ -115,8 +118,7 @@ private:
sf::UdpSocket m_socket; sf::UdpSocket m_socket;
Common::DVec3 m_accel{}; Common::DVec3 m_accel{};
Common::DVec3 m_gyro{}; Common::DVec3 m_gyro{};
std::chrono::steady_clock::time_point m_next_reregister = SteadyClock::time_point m_next_reregister = SteadyClock::time_point::min();
std::chrono::steady_clock::time_point::min();
Proto::MessageType::PadDataResponse m_pad_data{}; Proto::MessageType::PadDataResponse m_pad_data{};
Proto::Touch m_prev_touch{}; Proto::Touch m_prev_touch{};
bool m_prev_touch_valid = false; bool m_prev_touch_valid = false;
@ -134,7 +136,7 @@ static bool s_server_enabled;
static std::string s_server_address; static std::string s_server_address;
static u16 s_server_port; static u16 s_server_port;
static u32 s_client_uid; static u32 s_client_uid;
static std::chrono::steady_clock::time_point s_next_listports; static SteadyClock::time_point s_next_listports;
static std::thread s_hotplug_thread; static std::thread s_hotplug_thread;
static Common::Flag s_hotplug_thread_running; static Common::Flag s_hotplug_thread_running;
static std::mutex s_port_info_mutex; static std::mutex s_port_info_mutex;
@ -168,7 +170,7 @@ static void HotplugThreadFunc()
while (s_hotplug_thread_running.IsSet()) while (s_hotplug_thread_running.IsSet())
{ {
const auto now = std::chrono::steady_clock::now(); const auto now = SteadyClock::now();
if (now >= s_next_listports) if (now >= s_next_listports)
{ {
s_next_listports = now + SERVER_LISTPORTS_INTERVAL; s_next_listports = now + SERVER_LISTPORTS_INTERVAL;
@ -185,16 +187,17 @@ static void HotplugThreadFunc()
} }
// Receive controller port info // Receive controller port info
using namespace std::chrono;
using namespace std::chrono_literals;
Proto::Message<Proto::MessageType::FromServer> msg; Proto::Message<Proto::MessageType::FromServer> msg;
const auto timeout = s_next_listports - std::chrono::steady_clock::now(); const auto timeout = s_next_listports - SteadyClock::now();
// ReceiveWithTimeout treats a timeout of zero as infinite timeout, which we don't want // ReceiveWithTimeout treats a timeout of zero as infinite timeout, which we don't want
auto timeout_ms = std::chrono::duration_cast<std::chrono::milliseconds>(timeout).count(); const auto timeout_ms = std::max(duration_cast<milliseconds>(timeout), 1ms);
timeout_ms = std::max<decltype(timeout_ms)>(timeout_ms, 1);
std::size_t received_bytes; std::size_t received_bytes;
sf::IpAddress sender; sf::IpAddress sender;
u16 port; u16 port;
if (ReceiveWithTimeout(s_socket, &msg, sizeof(msg), received_bytes, sender, port, if (ReceiveWithTimeout(s_socket, &msg, sizeof(msg), received_bytes, sender, port,
sf::milliseconds(timeout_ms)) == sf::Socket::Status::Done) sf::milliseconds(timeout_ms.count())) == sf::Socket::Status::Done)
{ {
if (auto port_info = msg.CheckAndCastTo<Proto::MessageType::PortInfo>()) if (auto port_info = msg.CheckAndCastTo<Proto::MessageType::PortInfo>())
{ {
@ -379,7 +382,7 @@ std::string Device::GetSource() const
void Device::UpdateInput() void Device::UpdateInput()
{ {
// Regularly tell the UDP server to feed us controller data // Regularly tell the UDP server to feed us controller data
const auto now = std::chrono::steady_clock::now(); const auto now = SteadyClock::now();
if (now >= m_next_reregister) if (now >= m_next_reregister)
{ {
m_next_reregister = now + SERVER_REREGISTER_INTERVAL; m_next_reregister = now + SERVER_REREGISTER_INTERVAL;