From 705f7db84dd85555a6aef1e136cf251725cef293 Mon Sep 17 00:00:00 2001
From: FearlessTobi <thm.frey@gmail.com>
Date: Sat, 25 Dec 2021 20:27:52 +0100
Subject: yuzu: Add ui files for multiplayer rooms

---
 src/core/announce_multiplayer_session.h | 96 +++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 src/core/announce_multiplayer_session.h

(limited to 'src/core/announce_multiplayer_session.h')

diff --git a/src/core/announce_multiplayer_session.h b/src/core/announce_multiplayer_session.h
new file mode 100644
index 000000000..2aaf55017
--- /dev/null
+++ b/src/core/announce_multiplayer_session.h
@@ -0,0 +1,96 @@
+// Copyright 2017 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <set>
+#include <thread>
+#include "common/announce_multiplayer_room.h"
+#include "common/common_types.h"
+#include "common/thread.h"
+
+namespace Network {
+class Room;
+}
+
+namespace Core {
+
+/**
+ * Instruments AnnounceMultiplayerRoom::Backend.
+ * Creates a thread that regularly updates the room information and submits them
+ * An async get of room information is also possible
+ */
+class AnnounceMultiplayerSession {
+public:
+    using CallbackHandle = std::shared_ptr<std::function<void(const WebService::WebResult&)>>;
+    AnnounceMultiplayerSession();
+    ~AnnounceMultiplayerSession();
+
+    /**
+     * Allows to bind a function that will get called if the announce encounters an error
+     * @param function The function that gets called
+     * @return A handle that can be used the unbind the function
+     */
+    CallbackHandle BindErrorCallback(std::function<void(const WebService::WebResult&)> function);
+
+    /**
+     * Unbind a function from the error callbacks
+     * @param handle The handle for the function that should get unbind
+     */
+    void UnbindErrorCallback(CallbackHandle handle);
+
+    /**
+     * Registers a room to web services
+     * @return The result of the registration attempt.
+     */
+    WebService::WebResult Register();
+
+    /**
+     * Starts the announce of a room to web services
+     */
+    void Start();
+
+    /**
+     * Stops the announce to web services
+     */
+    void Stop();
+
+    /**
+     *  Returns a list of all room information the backend got
+     * @param func A function that gets executed when the async get finished, e.g. a signal
+     * @return a list of rooms received from the web service
+     */
+    AnnounceMultiplayerRoom::RoomList GetRoomList();
+
+    /**
+     * Whether the announce session is still running
+     */
+    bool IsRunning() const;
+
+    /**
+     * Recreates the backend, updating the credentials.
+     * This can only be used when the announce session is not running.
+     */
+    void UpdateCredentials();
+
+private:
+    Common::Event shutdown_event;
+    std::mutex callback_mutex;
+    std::set<CallbackHandle> error_callbacks;
+    std::unique_ptr<std::thread> announce_multiplayer_thread;
+
+    /// Backend interface that logs fields
+    std::unique_ptr<AnnounceMultiplayerRoom::Backend> backend;
+
+    std::atomic_bool registered = false; ///< Whether the room has been registered
+
+    void UpdateBackendData(std::shared_ptr<Network::Room> room);
+    void AnnounceMultiplayerLoop();
+};
+
+} // namespace Core
-- 
cgit v1.2.3


From 7d82e57b91dee30e0fe6fed36550ea7cc9eb778e Mon Sep 17 00:00:00 2001
From: FearlessTobi <thm.frey@gmail.com>
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/core/announce_multiplayer_session.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/core/announce_multiplayer_session.h')

diff --git a/src/core/announce_multiplayer_session.h b/src/core/announce_multiplayer_session.h
index 2aaf55017..5da3c1f8d 100644
--- a/src/core/announce_multiplayer_session.h
+++ b/src/core/announce_multiplayer_session.h
@@ -16,7 +16,8 @@
 
 namespace Network {
 class Room;
-}
+class RoomNetwork;
+} // namespace Network
 
 namespace Core {
 
@@ -28,7 +29,7 @@ namespace Core {
 class AnnounceMultiplayerSession {
 public:
     using CallbackHandle = std::shared_ptr<std::function<void(const WebService::WebResult&)>>;
-    AnnounceMultiplayerSession();
+    AnnounceMultiplayerSession(Network::RoomNetwork& room_network_);
     ~AnnounceMultiplayerSession();
 
     /**
@@ -79,6 +80,9 @@ public:
     void UpdateCredentials();
 
 private:
+    void UpdateBackendData(std::shared_ptr<Network::Room> room);
+    void AnnounceMultiplayerLoop();
+
     Common::Event shutdown_event;
     std::mutex callback_mutex;
     std::set<CallbackHandle> error_callbacks;
@@ -89,8 +93,7 @@ private:
 
     std::atomic_bool registered = false; ///< Whether the room has been registered
 
-    void UpdateBackendData(std::shared_ptr<Network::Room> room);
-    void AnnounceMultiplayerLoop();
+    Network::RoomNetwork& room_network;
 };
 
 } // namespace Core
-- 
cgit v1.2.3


From 61ce57b5242984c297283de5868ea4938391a911 Mon Sep 17 00:00:00 2001
From: FearlessTobi <thm.frey@gmail.com>
Date: Mon, 25 Jul 2022 17:18:30 +0200
Subject: network, yuzu: Make copyright headers SPDX-compliant

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

(limited to 'src/core/announce_multiplayer_session.h')

diff --git a/src/core/announce_multiplayer_session.h b/src/core/announce_multiplayer_session.h
index 5da3c1f8d..db790f7d2 100644
--- a/src/core/announce_multiplayer_session.h
+++ b/src/core/announce_multiplayer_session.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