From 76fa5255926da8f6339e7be5bf106646acedf78a Mon Sep 17 00:00:00 2001 From: Aleksandr Popovich Date: Thu, 5 Jun 2025 18:59:47 +0000 Subject: Added the public lobby to android. (#125) This is adapted from kleidis old PR to Azahar. Changes from it: - Fixed inconsistent button styling in the dialog for connection - Allowed to hide both empty and full rooms. - Proper serving of preferred games - Enables web service for android by default - Better implementation of multiplayer.cpp that works with oop Also fixes the room network class and turns it into a static namespace in network Signed-off-by: Aleksandr Popovich Co-authored-by: swurl Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/125 Co-authored-by: Aleksandr Popovich Co-committed-by: Aleksandr Popovich --- src/core/core.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/core/core.cpp') diff --git a/src/core/core.cpp b/src/core/core.cpp index 61b8182c08..0058c09b6e 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright yuzu/Citra Emulator Project / Eden Emulator Project +// SPDX-FileCopyrightText: 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #include @@ -111,7 +111,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, struct System::Impl { explicit Impl(System& system) - : kernel{system}, fs_controller{system}, hid_core{}, room_network{}, cpu_manager{system}, + : kernel{system}, fs_controller{system}, hid_core{}, cpu_manager{system}, reporter{system}, applet_manager{system}, frontend_applets{system}, profile_manager{} {} u64 program_id; @@ -421,7 +421,7 @@ struct System::Impl { } LoadOverrides(program_id); - if (auto room_member = room_network.GetRoomMember().lock()) { + if (auto room_member = Network::GetRoomMember().lock()) { Network::GameInfo game_info; game_info.name = name; game_info.id = params.program_id; @@ -466,7 +466,7 @@ struct System::Impl { stop_event = {}; Network::RestartSocketOperations(); - if (auto room_member = room_network.GetRoomMember().lock()) { + if (auto room_member = Network::GetRoomMember().lock()) { Network::GameInfo game_info{}; room_member->SendGameInfo(game_info); } @@ -520,7 +520,6 @@ struct System::Impl { std::unique_ptr device_memory; std::unique_ptr audio_core; Core::HID::HIDCore hid_core; - Network::RoomNetwork room_network; CpuManager cpu_manager; std::atomic_bool is_powered_on{}; @@ -979,14 +978,6 @@ const Core::Debugger& System::GetDebugger() const { return *impl->debugger; } -Network::RoomNetwork& System::GetRoomNetwork() { - return impl->room_network; -} - -const Network::RoomNetwork& System::GetRoomNetwork() const { - return impl->room_network; -} - Tools::RenderdocAPI& System::GetRenderdocAPI() { return *impl->renderdoc_api; } -- cgit v1.2.3