diff options
author | David <25727384+ogniK5377@users.noreply.github.com> | 2019-09-09 08:44:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-09 08:44:41 +0200 |
commit | 1487153e06e47744a7238a012735e44916d3169a (patch) | |
tree | 3be2575dc8eab73d83310f5d05d91fec8fa5c843 /src/core/hle/service/am/applets/general_backend.cpp | |
parent | Merge pull request #2763 from lioncash/map-phys (diff) | |
parent | service/am: Remove usages of global system accessors (diff) | |
download | yuzu-1487153e06e47744a7238a012735e44916d3169a.tar yuzu-1487153e06e47744a7238a012735e44916d3169a.tar.gz yuzu-1487153e06e47744a7238a012735e44916d3169a.tar.bz2 yuzu-1487153e06e47744a7238a012735e44916d3169a.tar.lz yuzu-1487153e06e47744a7238a012735e44916d3169a.tar.xz yuzu-1487153e06e47744a7238a012735e44916d3169a.tar.zst yuzu-1487153e06e47744a7238a012735e44916d3169a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/am/applets/general_backend.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/core/hle/service/am/applets/general_backend.cpp b/src/core/hle/service/am/applets/general_backend.cpp index e0def8dff..328438a1d 100644 --- a/src/core/hle/service/am/applets/general_backend.cpp +++ b/src/core/hle/service/am/applets/general_backend.cpp @@ -37,7 +37,8 @@ static void LogCurrentStorage(AppletDataBroker& broker, std::string_view prefix) } } -Auth::Auth(Core::Frontend::ParentalControlsApplet& frontend) : frontend(frontend) {} +Auth::Auth(Core::System& system_, Core::Frontend::ParentalControlsApplet& frontend_) + : Applet{system_.Kernel()}, frontend(frontend_) {} Auth::~Auth() = default; @@ -151,7 +152,8 @@ void Auth::AuthFinished(bool successful) { broker.SignalStateChanged(); } -PhotoViewer::PhotoViewer(const Core::Frontend::PhotoViewerApplet& frontend) : frontend(frontend) {} +PhotoViewer::PhotoViewer(Core::System& system_, const Core::Frontend::PhotoViewerApplet& frontend_) + : Applet{system_.Kernel()}, frontend(frontend_), system{system_} {} PhotoViewer::~PhotoViewer() = default; @@ -185,7 +187,7 @@ void PhotoViewer::Execute() { const auto callback = [this] { ViewFinished(); }; switch (mode) { case PhotoViewerAppletMode::CurrentApp: - frontend.ShowPhotosForApplication(Core::CurrentProcess()->GetTitleID(), callback); + frontend.ShowPhotosForApplication(system.CurrentProcess()->GetTitleID(), callback); break; case PhotoViewerAppletMode::AllApps: frontend.ShowAllPhotos(callback); @@ -200,7 +202,8 @@ void PhotoViewer::ViewFinished() { broker.SignalStateChanged(); } -StubApplet::StubApplet(AppletId id) : id(id) {} +StubApplet::StubApplet(Core::System& system_, AppletId id_) + : Applet{system_.Kernel()}, id(id_), system{system_} {} StubApplet::~StubApplet() = default; @@ -209,7 +212,7 @@ void StubApplet::Initialize() { Applet::Initialize(); const auto data = broker.PeekDataToAppletForDebug(); - Core::System::GetInstance().GetReporter().SaveUnimplementedAppletReport( + system.GetReporter().SaveUnimplementedAppletReport( static_cast<u32>(id), common_args.arguments_version, common_args.library_version, common_args.theme_color, common_args.play_startup_sound, common_args.system_tick, data.normal, data.interactive); |