dolphin-emu/dolphin
1
0
Fork 1
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-25 03:21:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon: Make InputDetector::Start take a span instead of a vector.

Browse Source
This commit is contained in:
Jordan Woyak
2025-06-07 15:28:52 -05:00
parent 11c3f7ea8d
commit 0780458069
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
View File

@ -3,6 +3,7 @@
#include "DolphinQt/Config/Mapping/IOWindow.h" #include "DolphinQt/Config/Mapping/IOWindow.h"
#include <array>
#include <optional> #include <optional>
#include <QBrush> #include <QBrush>
@ -532,7 +533,7 @@ void IOWindow::ConnectWidgets()
m_detect_button->setText(tr("[ Press Now ]")); m_detect_button->setText(tr("[ Press Now ]"));
m_input_detector = std::make_unique<ciface::Core::InputDetector>(); m_input_detector = std::make_unique<ciface::Core::InputDetector>();
const auto lock = m_controller->GetStateLock(); const auto lock = m_controller->GetStateLock();
m_input_detector->Start(g_controller_interface, {m_devq.ToString()}); m_input_detector->Start(g_controller_interface, std::array{m_devq.ToString()});
QtUtils::InstallKeyboardBlocker(m_detect_button, this, &IOWindow::DetectInputComplete); QtUtils::InstallKeyboardBlocker(m_detect_button, this, &IOWindow::DetectInputComplete);
}); });
connect(this, &IOWindow::DetectInputComplete, connect(this, &IOWindow::DetectInputComplete,

2
Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp
View File

@ -391,7 +391,7 @@ InputDetector::InputDetector() : m_start_time{}, m_state{}
} }
void InputDetector::Start(const DeviceContainer& container, void InputDetector::Start(const DeviceContainer& container,
const std::vector<std::string>& device_strings) std::span<const std::string> device_strings)
{ {
m_start_time = Clock::now(); m_start_time = Clock::now();

3
Source/Core/InputCommon/ControllerInterface/CoreDevice.h
View File

@ -8,6 +8,7 @@
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <optional> #include <optional>
#include <span>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <vector> #include <vector>
@ -255,7 +256,7 @@ public:
InputDetector(); InputDetector();
~InputDetector(); ~InputDetector();
void Start(const DeviceContainer& container, const std::vector<std::string>& device_strings); void Start(const DeviceContainer& container, std::span<const std::string> device_strings);
void Update(std::chrono::milliseconds initial_wait, std::chrono::milliseconds confirmation_wait, void Update(std::chrono::milliseconds initial_wait, std::chrono::milliseconds confirmation_wait,
std::chrono::milliseconds maximum_wait); std::chrono::milliseconds maximum_wait);
bool IsComplete() const; bool IsComplete() const;