diff options
Diffstat (limited to 'src/core/hle/service/am/application_proxy.cpp')
-rw-r--r-- | src/core/hle/service/am/application_proxy.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/core/hle/service/am/application_proxy.cpp b/src/core/hle/service/am/application_proxy.cpp index e9cd0aa71..99e97f4bc 100644 --- a/src/core/hle/service/am/application_proxy.cpp +++ b/src/core/hle/service/am/application_proxy.cpp @@ -18,10 +18,9 @@ namespace Service::AM { IApplicationProxy::IApplicationProxy(Nvnflinger::Nvnflinger& nvnflinger_, - std::shared_ptr<AppletMessageQueue> msg_queue_, - Core::System& system_) - : ServiceFramework{system_, "IApplicationProxy"}, nvnflinger{nvnflinger_}, - msg_queue{std::move(msg_queue_)} { + std::shared_ptr<Applet> applet_, Core::System& system_) + : ServiceFramework{system_, "IApplicationProxy"}, nvnflinger{nvnflinger_}, applet{std::move( + applet_)} { // clang-format off static const FunctionInfo functions[] = { {0, &IApplicationProxy::GetCommonStateGetter, "GetCommonStateGetter"}, @@ -39,6 +38,8 @@ IApplicationProxy::IApplicationProxy(Nvnflinger::Nvnflinger& nvnflinger_, RegisterHandlers(functions); } +IApplicationProxy::~IApplicationProxy() = default; + void IApplicationProxy::GetAudioController(HLERequestContext& ctx) { LOG_DEBUG(Service_AM, "called"); @@ -60,7 +61,7 @@ void IApplicationProxy::GetProcessWindingController(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface<IProcessWindingController>(system); + rb.PushIpcInterface<IProcessWindingController>(system, applet); } void IApplicationProxy::GetDebugFunctions(HLERequestContext& ctx) { @@ -76,7 +77,7 @@ void IApplicationProxy::GetWindowController(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface<IWindowController>(system); + rb.PushIpcInterface<IWindowController>(system, applet); } void IApplicationProxy::GetSelfController(HLERequestContext& ctx) { @@ -84,7 +85,7 @@ void IApplicationProxy::GetSelfController(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface<ISelfController>(system, nvnflinger); + rb.PushIpcInterface<ISelfController>(system, applet, nvnflinger); } void IApplicationProxy::GetCommonStateGetter(HLERequestContext& ctx) { @@ -92,7 +93,7 @@ void IApplicationProxy::GetCommonStateGetter(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface<ICommonStateGetter>(system, msg_queue); + rb.PushIpcInterface<ICommonStateGetter>(system, applet); } void IApplicationProxy::GetLibraryAppletCreator(HLERequestContext& ctx) { @@ -100,7 +101,7 @@ void IApplicationProxy::GetLibraryAppletCreator(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface<ILibraryAppletCreator>(system); + rb.PushIpcInterface<ILibraryAppletCreator>(system, applet); } void IApplicationProxy::GetApplicationFunctions(HLERequestContext& ctx) { @@ -108,7 +109,7 @@ void IApplicationProxy::GetApplicationFunctions(HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); - rb.PushIpcInterface<IApplicationFunctions>(system); + rb.PushIpcInterface<IApplicationFunctions>(system, applet); } } // namespace Service::AM |