Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

general: Rename NewUUID to UUID, and remove the previous UUID impl

Browse source 
This completes the removal of the old UUID implementation.
This commit is contained in:
Morph 2022-02-05 12:35:39 -05:00
parent dfe11d72e3
commit 25db62ce15
41 changed files with 415 additions and 598 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/input_common/drivers/gc_adapter.cpp
View file

@ -248,7 +248,7 @@ bool GCAdapter::Setup() {
std::size_t port = 0;
for (GCController& pad : pads) {
pad.identifier = {
.guid = Common::NewUUID{},
.guid = Common::UUID{},
.port = port++,
.pad = 0,
};

6
src/input_common/drivers/keyboard.cpp
View file

@ -9,17 +9,17 @@
namespace InputCommon {
constexpr PadIdentifier key_identifier = {
.guid = Common::NewUUID{},
.guid = Common::UUID{},
.port = 0,
.pad = 0,
};
constexpr PadIdentifier keyboard_key_identifier = {
.guid = Common::NewUUID{},
.guid = Common::UUID{},
.port = 1,
.pad = 0,
};
constexpr PadIdentifier keyboard_modifier_identifier = {
.guid = Common::NewUUID{},
.guid = Common::UUID{},
.port = 1,
.pad = 1,
};

2
src/input_common/drivers/mouse.cpp
View file

@ -20,7 +20,7 @@ constexpr int motion_wheel_y = 4;
constexpr int touch_axis_x = 10;
constexpr int touch_axis_y = 11;
constexpr PadIdentifier identifier = {
.guid = Common::NewUUID{},
.guid = Common::UUID{},
.port = 0,
.pad = 0,
};

2
src/input_common/drivers/sdl_driver.cpp
View file

@ -120,7 +120,7 @@ public:
*/
const PadIdentifier GetPadIdentifier() const {
return {
.guid = Common::NewUUID{guid},
.guid = Common::UUID{guid},
.port = static_cast<std::size_t>(port),
.pad = 0,
};

4
src/input_common/drivers/tas_input.cpp
View file

@ -50,7 +50,7 @@ constexpr std::array<std::pair<std::string_view, TasButton>, 18> text_to_tas_but
Tas::Tas(std::string input_engine_) : InputEngine(std::move(input_engine_)) {
for (size_t player_index = 0; player_index < PLAYER_NUMBER; player_index++) {
PadIdentifier identifier{
.guid = Common::NewUUID{},
.guid = Common::UUID{},
.port = player_index,
.pad = 0,
};
@ -203,7 +203,7 @@ void Tas::UpdateThread() {
}
PadIdentifier identifier{
.guid = Common::NewUUID{},
.guid = Common::UUID{},
.port = player_index,
.pad = 0,
};

2
src/input_common/drivers/touch_screen.cpp
View file

@ -8,7 +8,7 @@
namespace InputCommon {
constexpr PadIdentifier identifier = {
.guid = Common::NewUUID{},
.guid = Common::UUID{},
.port = 0,
.pad = 0,
};

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

@ -351,10 +351,10 @@ PadIdentifier UDPClient::GetPadIdentifier(std::size_t pad_index) const {
};
}
Common::NewUUID UDPClient::GetHostUUID(const std::string& host) const {
Common::UUID UDPClient::GetHostUUID(const std::string& host) const {
const auto ip = boost::asio::ip::make_address_v4(host);
const auto hex_host = fmt::format("00000000-0000-0000-0000-0000{:06x}", ip.to_uint());
return Common::NewUUID{hex_host};
return Common::UUID{hex_host};
}
void UDPClient::Reset() {

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

@ -126,7 +126,7 @@ private:
struct ClientConnection {
ClientConnection();
~ClientConnection();
Common::NewUUID uuid{"00000000-0000-0000-0000-00007F000001"};
Common::UUID uuid{"00000000-0000-0000-0000-00007F000001"};
std::string host{"127.0.0.1"};
u16 port{26760};
s8 active{-1};
@ -148,7 +148,7 @@ private:
void OnPadData(Response::PadData, std::size_t client);
void StartCommunication(std::size_t client, const std::string& host, u16 port);
PadIdentifier GetPadIdentifier(std::size_t pad_index) const;
Common::NewUUID GetHostUUID(const std::string& host) const;
Common::UUID GetHostUUID(const std::string& host) const;
Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const;