diff options
| author | 2022-11-13 15:14:08 -0600 | |
|---|---|---|
| committer | 2022-11-13 17:13:43 -0600 | |
| commit | 75e6ec85e107d6e5422d882b97faaa813970d42e (patch) | |
| tree | fede32c546409e0f876c9ba7142da39eb4caf9c1 /src/core/frontend/applets | |
| parent | service: am: Fix cabinet applet result (diff) | |
| download | yuzu-75e6ec85e107d6e5422d882b97faaa813970d42e.tar.gz yuzu-75e6ec85e107d6e5422d882b97faaa813970d42e.tar.xz yuzu-75e6ec85e107d6e5422d882b97faaa813970d42e.zip | |
general: Address review comments
Diffstat (limited to 'src/core/frontend/applets')
| -rw-r--r-- | src/core/frontend/applets/cabinet.cpp | 2 | ||||
| -rw-r--r-- | src/core/frontend/applets/cabinet.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/frontend/applets/cabinet.cpp b/src/core/frontend/applets/cabinet.cpp index 5ade75de0..26c7fefe3 100644 --- a/src/core/frontend/applets/cabinet.cpp +++ b/src/core/frontend/applets/cabinet.cpp | |||
| @@ -11,7 +11,7 @@ namespace Core::Frontend { | |||
| 11 | CabinetApplet::~CabinetApplet() = default; | 11 | CabinetApplet::~CabinetApplet() = default; |
| 12 | 12 | ||
| 13 | void DefaultCabinetApplet::ShowCabinetApplet( | 13 | void DefaultCabinetApplet::ShowCabinetApplet( |
| 14 | std::function<void(bool, const std::string&)> callback, const CabinetParameters& parameters, | 14 | const CabinetCallback& callback, const CabinetParameters& parameters, |
| 15 | std::shared_ptr<Service::NFP::NfpDevice> nfp_device) const { | 15 | std::shared_ptr<Service::NFP::NfpDevice> nfp_device) const { |
| 16 | LOG_WARNING(Service_AM, "(STUBBED) called"); | 16 | LOG_WARNING(Service_AM, "(STUBBED) called"); |
| 17 | callback(false, {}); | 17 | callback(false, {}); |
diff --git a/src/core/frontend/applets/cabinet.h b/src/core/frontend/applets/cabinet.h index 1c68bf57d..c28a235c1 100644 --- a/src/core/frontend/applets/cabinet.h +++ b/src/core/frontend/applets/cabinet.h | |||
| @@ -18,18 +18,19 @@ struct CabinetParameters { | |||
| 18 | Service::NFP::CabinetMode mode; | 18 | Service::NFP::CabinetMode mode; |
| 19 | }; | 19 | }; |
| 20 | 20 | ||
| 21 | using CabinetCallback = std::function<void(bool, const std::string&)>; | ||
| 22 | |||
| 21 | class CabinetApplet { | 23 | class CabinetApplet { |
| 22 | public: | 24 | public: |
| 23 | virtual ~CabinetApplet(); | 25 | virtual ~CabinetApplet(); |
| 24 | virtual void ShowCabinetApplet(std::function<void(bool, const std::string&)> callback, | 26 | virtual void ShowCabinetApplet(const CabinetCallback& callback, |
| 25 | const CabinetParameters& parameters, | 27 | const CabinetParameters& parameters, |
| 26 | std::shared_ptr<Service::NFP::NfpDevice> nfp_device) const = 0; | 28 | std::shared_ptr<Service::NFP::NfpDevice> nfp_device) const = 0; |
| 27 | }; | 29 | }; |
| 28 | 30 | ||
| 29 | class DefaultCabinetApplet final : public CabinetApplet { | 31 | class DefaultCabinetApplet final : public CabinetApplet { |
| 30 | public: | 32 | public: |
| 31 | void ShowCabinetApplet(std::function<void(bool, const std::string&)> callback, | 33 | void ShowCabinetApplet(const CabinetCallback& callback, const CabinetParameters& parameters, |
| 32 | const CabinetParameters& parameters, | ||
| 33 | std::shared_ptr<Service::NFP::NfpDevice> nfp_device) const override; | 34 | std::shared_ptr<Service::NFP::NfpDevice> nfp_device) const override; |
| 34 | }; | 35 | }; |
| 35 | 36 | ||