Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-14 15:06:57 +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 a07c276fe1
commit ec5ba51d91
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( 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::function<void(u16, u16, u16, u16)> data_callback) {
std::thread([=, this] { std::thread([=, this] {
@ -600,14 +600,14 @@ CalibrationConfigurationJob::CalibrationConfigurationJob(
u16 max_x{}; u16 max_x{};
u16 max_y{}; u16 max_y{};
Status current_status{Status::Initialized}; CalibrationStatus current_status{CalibrationStatus::Initialized};
SocketCallback callback{[](Response::Version) {}, [](Response::PortInfo) {}, SocketCallback callback{[](Response::Version) {}, [](Response::PortInfo) {},
[&](Response::PadData data) { [&](Response::PadData data) {
constexpr u16 CALIBRATION_THRESHOLD = 100; constexpr u16 CALIBRATION_THRESHOLD = 100;
if (current_status == Status::Initialized) { if (current_status == CalibrationStatus::Initialized) {
// Receiving data means the communication is ready now // Receiving data means the communication is ready now
current_status = Status::Ready; current_status = CalibrationStatus::Ready;
status_callback(current_status); status_callback(current_status);
} }
if (data.touch[0].is_active == 0) { if (data.touch[0].is_active == 0) {
@ -617,9 +617,9 @@ CalibrationConfigurationJob::CalibrationConfigurationJob(
data.touch[0].y); data.touch[0].y);
min_x = (std::min)(min_x, static_cast<u16>(data.touch[0].x)); 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)); 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) // First touch - min data (min_x/min_y)
current_status = Status::Stage1Completed; current_status = CalibrationStatus::Stage1Completed;
status_callback(current_status); status_callback(current_status);
} }
if (data.touch[0].x - min_x > CALIBRATION_THRESHOLD && if (data.touch[0].x - min_x > CALIBRATION_THRESHOLD &&
@ -628,7 +628,7 @@ CalibrationConfigurationJob::CalibrationConfigurationJob(
// configuration // configuration
max_x = data.touch[0].x; max_x = data.touch[0].x;
max_y = data.touch[0].y; max_y = data.touch[0].y;
current_status = Status::Completed; current_status = CalibrationStatus::Completed;
data_callback(min_x, min_y, max_x, max_y); data_callback(min_x, min_y, max_x, max_y);
status_callback(current_status); 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. /// An async job allowing configuration of the touchpad calibration.
class CalibrationConfigurationJob { class CalibrationConfigurationJob {
public: public:
enum class Status { enum class CalibrationStatus {
Initialized, Initialized,
Ready, Ready,
Stage1Completed, Stage1Completed,
@ -176,7 +176,7 @@ public:
* @param data_callback Called when calibration data is ready * @param data_callback Called when calibration data is ready
*/ */
explicit CalibrationConfigurationJob(const std::string& host, u16 port, 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); std::function<void(u16, u16, u16, u16)> data_callback);
~CalibrationConfigurationJob(); ~CalibrationConfigurationJob();
void Stop(); void Stop();

15
src/network/packet.h
View file

@ -119,26 +119,21 @@ private:
template <typename T> template <typename T>
Packet& Packet::Read(std::vector<T>& out_data) { Packet& Packet::Read(std::vector<T>& out_data) {
// First extract the size
u32 size = 0; u32 size = 0;
Read(size); Read(size);
out_data.resize(size); out_data.resize(size);
// Then extract the data for (auto& elem : out_data) {
for (std::size_t i = 0; i < out_data.size(); ++i) { Read(elem);
T character;
Read(character);
out_data[i] = character;
} }
return *this; return *this;
} }
template <typename T, std::size_t S> template <typename T, std::size_t S>
Packet& Packet::Read(std::array<T, S>& out_data) { Packet& Packet::Read(std::array<T, S>& out_data) {
for (std::size_t i = 0; i < out_data.size(); ++i) { for (auto& elem : out_data) {
T character; Read(elem);
Read(character);
out_data[i] = character;
} }
return *this; return *this;
} }

4
src/network/room.cpp
View file

@ -832,7 +832,7 @@ void Room::RoomImpl::HandleProxyPacket(const ENetEvent* event) {
in_packet.IgnoreBytes(sizeof(u8)); // Protocol in_packet.IgnoreBytes(sizeof(u8)); // Protocol
bool broadcast; bool broadcast = false;
in_packet.Read(broadcast); // Broadcast in_packet.Read(broadcast); // Broadcast
Packet out_packet; Packet out_packet;
@ -886,7 +886,7 @@ void Room::RoomImpl::HandleLdnPacket(const ENetEvent* event) {
IPv4Address remote_ip; IPv4Address remote_ip;
in_packet.Read(remote_ip); // Remote IP in_packet.Read(remote_ip); // Remote IP
bool broadcast; bool broadcast = false;
in_packet.Read(broadcast); // Broadcast in_packet.Read(broadcast); // Broadcast
Packet out_packet; Packet out_packet;

8
src/tests/input_common/calibration_configuration_job.cpp
View file

@ -103,7 +103,7 @@ TEST_CASE("CalibrationConfigurationJob completed", "[input_common]") {
.y = 200, .y = 200,
}}); }});
InputCommon::CemuhookUDP::CalibrationConfigurationJob::Status status{}; InputCommon::CemuhookUDP::CalibrationConfigurationJob::CalibrationStatus status{};
u16 min_x{}; u16 min_x{};
u16 min_y{}; u16 min_y{};
u16 max_x{}; u16 max_x{};
@ -111,10 +111,10 @@ TEST_CASE("CalibrationConfigurationJob completed", "[input_common]") {
InputCommon::CemuhookUDP::CalibrationConfigurationJob job( InputCommon::CemuhookUDP::CalibrationConfigurationJob job(
server.GetHost(), server.GetPort(), server.GetHost(), server.GetPort(),
[&status, [&status,
&complete_event](InputCommon::CemuhookUDP::CalibrationConfigurationJob::Status status_) { &complete_event](InputCommon::CemuhookUDP::CalibrationConfigurationJob::CalibrationStatus status_) {
status = status_; status = status_;
if (status == if (status ==
InputCommon::CemuhookUDP::CalibrationConfigurationJob::Status::Completed) { InputCommon::CemuhookUDP::CalibrationConfigurationJob::CalibrationStatus::Completed) {
complete_event.Set(); complete_event.Set();
} }
}, },
@ -126,7 +126,7 @@ TEST_CASE("CalibrationConfigurationJob completed", "[input_common]") {
}); });
complete_event.WaitUntil(std::chrono::system_clock::now() + std::chrono::seconds(10)); complete_event.WaitUntil(std::chrono::system_clock::now() + std::chrono::seconds(10));
REQUIRE(status == InputCommon::CemuhookUDP::CalibrationConfigurationJob::Status::Completed); REQUIRE(status == InputCommon::CemuhookUDP::CalibrationConfigurationJob::CalibrationStatus::Completed);
REQUIRE(min_x == 0); REQUIRE(min_x == 0);
REQUIRE(min_y == 0); REQUIRE(min_y == 0);
REQUIRE(max_x == 200); REQUIRE(max_x == 200);

10
src/yuzu/configuration/configure_motion_touch.cpp
View file

@ -37,17 +37,17 @@ CalibrationConfigurationDialog::CalibrationConfigurationDialog(QWidget* parent,
using namespace InputCommon::CemuhookUDP; using namespace InputCommon::CemuhookUDP;
job = std::make_unique<CalibrationConfigurationJob>( job = std::make_unique<CalibrationConfigurationJob>(
host, port, host, port,
[this](CalibrationConfigurationJob::Status status) { [this](CalibrationConfigurationJob::CalibrationStatus status) {
QMetaObject::invokeMethod(this, [status, this] { QMetaObject::invokeMethod(this, [status, this] {
QString text; QString text;
switch (status) { switch (status) {
case CalibrationConfigurationJob::Status::Ready: case CalibrationConfigurationJob::CalibrationStatus::Ready:
text = tr("Touch the top left corner <br>of your touchpad."); text = tr("Touch the top left corner <br>of your touchpad.");
break; break;
case CalibrationConfigurationJob::Status::Stage1Completed: case CalibrationConfigurationJob::CalibrationStatus::Stage1Completed:
text = tr("Now touch the bottom right corner <br>of your touchpad."); text = tr("Now touch the bottom right corner <br>of your touchpad.");
break; break;
case CalibrationConfigurationJob::Status::Completed: case CalibrationConfigurationJob::CalibrationStatus::Completed:
text = tr("Configuration completed!"); text = tr("Configuration completed!");
break; break;
default: default:
@ -55,7 +55,7 @@ CalibrationConfigurationDialog::CalibrationConfigurationDialog(QWidget* parent,
} }
UpdateLabelText(text); UpdateLabelText(text);
}); });
if (status == CalibrationConfigurationJob::Status::Completed) { if (status == CalibrationConfigurationJob::CalibrationStatus::Completed) {
QMetaObject::invokeMethod(this, [this] { UpdateButtonText(tr("OK")); }); QMetaObject::invokeMethod(this, [this] { UpdateButtonText(tr("OK")); });
} }
}, },