From dcfe0a5febb252e3a4f40c1b25765740a269467f Mon Sep 17 00:00:00 2001
From: FearlessTobi
Date: Wed, 6 Jul 2022 02:20:39 +0200
Subject: network: Add initial files and enet dependency

---
 src/network/network.h | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 src/network/network.h

(limited to 'src/network/network.h')

diff --git a/src/network/network.h b/src/network/network.h
new file mode 100644
index 000000000..6d002d693
--- /dev/null
+++ b/src/network/network.h
@@ -0,0 +1,25 @@
+// Copyright 2017 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include "network/room.h"
+#include "network/room_member.h"
+
+namespace Network {
+
+/// Initializes and registers the network device, the room, and the room member.
+bool Init();
+
+/// Returns a pointer to the room handle
+std::weak_ptr<Room> GetRoom();
+
+/// Returns a pointer to the room member handle
+std::weak_ptr<RoomMember> GetRoomMember();
+
+/// Unregisters the network device, the room, and the room member and shut them down.
+void Shutdown();
+
+} // namespace Network
-- 
cgit v1.2.3


From 7d82e57b91dee30e0fe6fed36550ea7cc9eb778e Mon Sep 17 00:00:00 2001
From: FearlessTobi
Date: Fri, 22 Jul 2022 16:31:13 +0200
Subject: network: Move global state into a seperate class

Co-Authored-By: Narr the Reg <5944268+german77@users.noreply.github.com>
---
 src/network/network.h | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/network/network.h')

diff --git a/src/network/network.h b/src/network/network.h
index 6d002d693..74eb42bf5 100644
--- a/src/network/network.h
+++ b/src/network/network.h
@@ -10,16 +10,25 @@
 
 namespace Network {
 
-/// Initializes and registers the network device, the room, and the room member.
-bool Init();
+class RoomNetwork {
+public:
+    RoomNetwork();
 
-/// Returns a pointer to the room handle
-std::weak_ptr<Room> GetRoom();
+    /// Initializes and registers the network device, the room, and the room member.
+    bool Init();
 
-/// Returns a pointer to the room member handle
-std::weak_ptr<RoomMember> GetRoomMember();
+    /// Returns a pointer to the room handle
+    std::weak_ptr<Room> GetRoom();
 
-/// Unregisters the network device, the room, and the room member and shut them down.
-void Shutdown();
+    /// Returns a pointer to the room member handle
+    std::weak_ptr<RoomMember> GetRoomMember();
+
+    /// Unregisters the network device, the room, and the room member and shut them down.
+    void Shutdown();
+
+private:
+    std::shared_ptr<RoomMember> g_room_member; ///< RoomMember (Client) for network games
+    std::shared_ptr<Room> g_room;              ///< Room (Server) for network games
+};
 
 } // namespace Network
-- 
cgit v1.2.3


From 6a2dcc8b3d4ed0940e33d60fee701bcdb063eb6b Mon Sep 17 00:00:00 2001
From: FearlessTobi
Date: Mon, 25 Jul 2022 17:08:20 +0200
Subject: network, yuzu: Improve variable naming and style consistency

---
 src/network/network.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/network/network.h')

diff --git a/src/network/network.h b/src/network/network.h
index 74eb42bf5..a38f04029 100644
--- a/src/network/network.h
+++ b/src/network/network.h
@@ -27,8 +27,8 @@ public:
     void Shutdown();
 
 private:
-    std::shared_ptr<RoomMember> g_room_member; ///< RoomMember (Client) for network games
-    std::shared_ptr<Room> g_room;              ///< Room (Server) for network games
+    std::shared_ptr<RoomMember> m_room_member; ///< RoomMember (Client) for network games
+    std::shared_ptr<Room> m_room;              ///< Room (Server) for network games
 };
 
 } // namespace Network
-- 
cgit v1.2.3


From 61ce57b5242984c297283de5868ea4938391a911 Mon Sep 17 00:00:00 2001
From: FearlessTobi
Date: Mon, 25 Jul 2022 17:18:30 +0200
Subject: network, yuzu: Make copyright headers SPDX-compliant

---
 src/network/network.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/network/network.h')

diff --git a/src/network/network.h b/src/network/network.h
index a38f04029..e4de207b2 100644
--- a/src/network/network.h
+++ b/src/network/network.h
@@ -1,6 +1,5 @@
-// Copyright 2017 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
+// SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
-- 
cgit v1.2.3