Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-19 17:08:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Some build fixes

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2026-04-01 02:01:09 -04:00
parent 674e97e383
commit 055e619475
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
6 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/input_common/drivers/udp_client.cpp
View file

@ -591,7 +591,7 @@ void TestCommunication(const std::string& host, u16 port,
}
CalibrationConfigurationJob::CalibrationConfigurationJob(
const std::string& host, u16 port, std::function<void(Status)> status_callback,
const std::string& host, u16 port, std::function<void(CalibrationStatus)> status_callback,
std::function<void(u16, u16, u16, u16)> data_callback) {
std::thread([=, this] {
@ -600,14 +600,14 @@ CalibrationConfigurationJob::CalibrationConfigurationJob(
u16 max_x{};
u16 max_y{};
Status current_status{Status::Initialized};
CalibrationStatus current_status{CalibrationStatus::Initialized};
SocketCallback callback{[](Response::Version) {}, [](Response::PortInfo) {},
[&](Response::PadData data) {
constexpr u16 CALIBRATION_THRESHOLD = 100;
if (current_status == Status::Initialized) {
if (current_status == CalibrationStatus::Initialized) {
// Receiving data means the communication is ready now
current_status = Status::Ready;
current_status = CalibrationStatus::Ready;
status_callback(current_status);
}
if (data.touch[0].is_active == 0) {
@ -617,9 +617,9 @@ CalibrationConfigurationJob::CalibrationConfigurationJob(
data.touch[0].y);
min_x = (std::min)(min_x, static_cast<u16>(data.touch[0].x));
min_y = (std::min)(min_y, static_cast<u16>(data.touch[0].y));
if (current_status == Status::Ready) {
if (current_status == CalibrationStatus::Ready) {
// First touch - min data (min_x/min_y)
current_status = Status::Stage1Completed;
current_status = CalibrationStatus::Stage1Completed;
status_callback(current_status);
}
if (data.touch[0].x - min_x > CALIBRATION_THRESHOLD &&
@ -628,7 +628,7 @@ CalibrationConfigurationJob::CalibrationConfigurationJob(
// configuration
max_x = data.touch[0].x;
max_y = data.touch[0].y;
current_status = Status::Completed;
current_status = CalibrationStatus::Completed;
data_callback(min_x, min_y, max_x, max_y);
status_callback(current_status);

4
src/input_common/drivers/udp_client.h
View file

@ -163,7 +163,7 @@ private:
/// An async job allowing configuration of the touchpad calibration.
class CalibrationConfigurationJob {
public:
enum class Status {
enum class CalibrationStatus {
Initialized,
Ready,
Stage1Completed,
@ -176,7 +176,7 @@ public:
* @param data_callback Called when calibration data is ready
*/
explicit CalibrationConfigurationJob(const std::string& host, u16 port,
std::function<void(Status)> status_callback,
std::function<void(CalibrationStatus)> status_callback,
std::function<void(u16, u16, u16, u16)> data_callback);
~CalibrationConfigurationJob();
void Stop();