From 182137a9a4b09c8188d2cbffa312550c5dc83641 Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Tue, 2 Jan 2024 18:29:03 -0500
Subject: am: migrate global state to per-applet state structure

---
 src/core/hle/service/am/library_applet_accessor.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/core/hle/service/am/library_applet_accessor.h')

diff --git a/src/core/hle/service/am/library_applet_accessor.h b/src/core/hle/service/am/library_applet_accessor.h
index 77f62906c..c34a1cbca 100644
--- a/src/core/hle/service/am/library_applet_accessor.h
+++ b/src/core/hle/service/am/library_applet_accessor.h
@@ -3,17 +3,21 @@
 
 #pragma once
 
-#include "core/hle/service/am/frontend/applets.h"
 #include "core/hle/service/service.h"
 
 namespace Service::AM {
 
+struct AppletStorageHolder;
+struct Applet;
+
 class ILibraryAppletAccessor final : public ServiceFramework<ILibraryAppletAccessor> {
 public:
     explicit ILibraryAppletAccessor(Core::System& system_,
-                                    std::shared_ptr<Frontend::FrontendApplet> applet_);
+                                    std::shared_ptr<AppletStorageHolder> storage_,
+                                    std::shared_ptr<Applet> applet_);
+    ~ILibraryAppletAccessor();
 
-private:
+protected:
     void GetAppletStateChangedEvent(HLERequestContext& ctx);
     void IsCompleted(HLERequestContext& ctx);
     void GetResult(HLERequestContext& ctx);
@@ -28,7 +32,8 @@ private:
     void GetPopInteractiveOutDataEvent(HLERequestContext& ctx);
     void GetIndirectLayerConsumerHandle(HLERequestContext& ctx);
 
-    std::shared_ptr<Frontend::FrontendApplet> applet;
+    const std::shared_ptr<AppletStorageHolder> storage;
+    const std::shared_ptr<Applet> applet;
 };
 
 } // namespace Service::AM
-- 
cgit v1.2.3