service: refactor server architecture

Converts services to have their own processes

2 files changed, 12 insertions, 9 deletions

diff --git a/src/core/hle/service/caps/caps.cpp b/src/core/hle/service/caps/caps.cpp
index 13940a8c9..610fe9940 100644
--- a/src/core/hle/service/caps/caps.cpp
+++ b/src/core/hle/service/caps/caps.cpp
@@ -8,17 +8,21 @@
 #include "core/hle/service/caps/caps_ss.h"
 #include "core/hle/service/caps/caps_su.h"
 #include "core/hle/service/caps/caps_u.h"
+#include "core/hle/service/server_manager.h"
 #include "core/hle/service/service.h"
 
 namespace Service::Capture {
 
-void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) {
-    std::make_shared<CAPS_A>(system)->InstallAsService(sm);
-    std::make_shared<CAPS_C>(system)->InstallAsService(sm);
-    std::make_shared<CAPS_U>(system)->InstallAsService(sm);
-    std::make_shared<CAPS_SC>(system)->InstallAsService(sm);
-    std::make_shared<CAPS_SS>(system)->InstallAsService(sm);
-    std::make_shared<CAPS_SU>(system)->InstallAsService(sm);
+void LoopProcess(Core::System& system) {
+    auto server_manager = std::make_unique<ServerManager>(system);
+
+    server_manager->RegisterNamedService("caps:a", std::make_shared<CAPS_A>(system));
+    server_manager->RegisterNamedService("caps:c", std::make_shared<CAPS_C>(system));
+    server_manager->RegisterNamedService("caps:u", std::make_shared<CAPS_U>(system));
+    server_manager->RegisterNamedService("caps:sc", std::make_shared<CAPS_SC>(system));
+    server_manager->RegisterNamedService("caps:ss", std::make_shared<CAPS_SS>(system));
+    server_manager->RegisterNamedService("caps:su", std::make_shared<CAPS_SU>(system));
+    ServerManager::RunServer(std::move(server_manager));
 }
 
 } // namespace Service::Capture
diff --git a/src/core/hle/service/caps/caps.h b/src/core/hle/service/caps/caps.h
index 3e89c82cb..15f0ecfaa 100644
--- a/src/core/hle/service/caps/caps.h
+++ b/src/core/hle/service/caps/caps.h
@@ -90,7 +90,6 @@ struct ApplicationAlbumFileEntry {
 static_assert(sizeof(ApplicationAlbumFileEntry) == 0x30,
               "ApplicationAlbumFileEntry has incorrect size.");
 
-/// Registers all Capture services with the specified service manager.
-void InstallInterfaces(SM::ServiceManager& sm, Core::System& system);
+void LoopProcess(Core::System& system);
 
 } // namespace Service::Capture