yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

frontend/controller: Eliminate dependency on the global system instance

This commit is contained in:
Lioncash 2020-09-25 19:13:10 -04:00
parent 4d4afc1502
commit 3e4a0a13cb
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/frontend/applets/controller.cpp
View File

@ -4,7 +4,6 @@
#include "common/assert.h" #include "common/assert.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/core.h"
#include "core/frontend/applets/controller.h" #include "core/frontend/applets/controller.h"
#include "core/hle/service/hid/controllers/npad.h" #include "core/hle/service/hid/controllers/npad.h"
#include "core/hle/service/hid/hid.h" #include "core/hle/service/hid/hid.h"
@ -14,6 +13,9 @@ namespace Core::Frontend {
ControllerApplet::~ControllerApplet() = default; ControllerApplet::~ControllerApplet() = default;
DefaultControllerApplet::DefaultControllerApplet(Service::SM::ServiceManager& service_manager_)
: service_manager{service_manager_} {}
DefaultControllerApplet::~DefaultControllerApplet() = default; DefaultControllerApplet::~DefaultControllerApplet() = default;
void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callback, void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callback,
@ -21,9 +23,7 @@ void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callb
LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!"); LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!");
auto& npad = auto& npad =
Core::System::GetInstance() service_manager.GetService<Service::HID::Hid>("hid")
.ServiceManager()
.GetService<Service::HID::Hid>("hid")
->GetAppletResource() ->GetAppletResource()
->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad); ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad);

8
src/core/frontend/applets/controller.h
View File

@ -8,6 +8,10 @@
#include "common/common_types.h" #include "common/common_types.h"
namespace Service::SM {
class ServiceManager;
}
namespace Core::Frontend { namespace Core::Frontend {
using BorderColor = std::array<u8, 4>; using BorderColor = std::array<u8, 4>;
@ -39,10 +43,14 @@ public:
class DefaultControllerApplet final : public ControllerApplet { class DefaultControllerApplet final : public ControllerApplet {
public: public:
explicit DefaultControllerApplet(Service::SM::ServiceManager& service_manager_);
~DefaultControllerApplet() override; ~DefaultControllerApplet() override;
void ReconfigureControllers(std::function<void()> callback, void ReconfigureControllers(std::function<void()> callback,
ControllerParameters parameters) const override; ControllerParameters parameters) const override;
private:
Service::SM::ServiceManager& service_manager;
}; };
} // namespace Core::Frontend } // namespace Core::Frontend

3
src/core/hle/service/am/applets/applets.cpp
View File

@ -206,7 +206,8 @@ void AppletManager::SetDefaultAppletFrontendSet() {
void AppletManager::SetDefaultAppletsIfMissing() { void AppletManager::SetDefaultAppletsIfMissing() {
if (frontend.controller == nullptr) { if (frontend.controller == nullptr) {
frontend.controller = std::make_unique<Core::Frontend::DefaultControllerApplet>(); frontend.controller =
std::make_unique<Core::Frontend::DefaultControllerApplet>(system.ServiceManager());
} }
if (frontend.e_commerce == nullptr) { if (frontend.e_commerce == nullptr) {