From e05e6853faf8563702963f384fb1486cda77c841 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 17 Mar 2022 03:01:03 -0400 Subject: applets: Rename Mii to MiiEdit --- src/core/frontend/applets/mii.cpp | 19 ------------------- src/core/frontend/applets/mii.h | 34 ---------------------------------- src/core/frontend/applets/mii_edit.cpp | 20 ++++++++++++++++++++ src/core/frontend/applets/mii_edit.h | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 53 deletions(-) delete mode 100644 src/core/frontend/applets/mii.cpp delete mode 100644 src/core/frontend/applets/mii.h create mode 100644 src/core/frontend/applets/mii_edit.cpp create mode 100644 src/core/frontend/applets/mii_edit.h (limited to 'src/core/frontend/applets') diff --git a/src/core/frontend/applets/mii.cpp b/src/core/frontend/applets/mii.cpp deleted file mode 100644 index 1c05ff412..000000000 --- a/src/core/frontend/applets/mii.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2022 yuzu Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#include "common/logging/log.h" -#include "core/frontend/applets/mii.h" - -namespace Core::Frontend { - -MiiApplet::~MiiApplet() = default; - -void DefaultMiiApplet::ShowMii( - const MiiParameters& parameters, - const std::function callback) const { - LOG_INFO(Service_HID, "(STUBBED) called"); - callback(parameters); -} - -} // namespace Core::Frontend diff --git a/src/core/frontend/applets/mii.h b/src/core/frontend/applets/mii.h deleted file mode 100644 index 11ba8a359..000000000 --- a/src/core/frontend/applets/mii.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2022 yuzu Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include - -#include "core/hle/service/mii/mii_manager.h" - -namespace Core::Frontend { - -struct MiiParameters { - bool is_editable; - Service::Mii::MiiInfo mii_data{}; -}; - -class MiiApplet { -public: - virtual ~MiiApplet(); - - virtual void ShowMii(const MiiParameters& parameters, - const std::function - callback) const = 0; -}; - -class DefaultMiiApplet final : public MiiApplet { -public: - void ShowMii(const MiiParameters& parameters, - const std::function - callback) const override; -}; - -} // namespace Core::Frontend diff --git a/src/core/frontend/applets/mii_edit.cpp b/src/core/frontend/applets/mii_edit.cpp new file mode 100644 index 000000000..948d66f3d --- /dev/null +++ b/src/core/frontend/applets/mii_edit.cpp @@ -0,0 +1,20 @@ +// Copyright 2022 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "common/logging/log.h" +#include "core/frontend/applets/mii_edit.h" + +namespace Core::Frontend { + +MiiEditApplet::~MiiEditApplet() = default; + +void DefaultMiiEditApplet::ShowMii( + const MiiParameters& parameters, + const std::function callback) const { + LOG_WARNING(Service_AM, "(STUBBED) called"); + + callback(parameters); +} + +} // namespace Core::Frontend diff --git a/src/core/frontend/applets/mii_edit.h b/src/core/frontend/applets/mii_edit.h new file mode 100644 index 000000000..0d5bb69a2 --- /dev/null +++ b/src/core/frontend/applets/mii_edit.h @@ -0,0 +1,34 @@ +// Copyright 2022 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include + +#include "core/hle/service/mii/mii_manager.h" + +namespace Core::Frontend { + +struct MiiParameters { + bool is_editable; + Service::Mii::MiiInfo mii_data{}; +}; + +class MiiEditApplet { +public: + virtual ~MiiEditApplet(); + + virtual void ShowMii(const MiiParameters& parameters, + const std::function + callback) const = 0; +}; + +class DefaultMiiEditApplet final : public MiiEditApplet { +public: + void ShowMii(const MiiParameters& parameters, + const std::function + callback) const override; +}; + +} // namespace Core::Frontend -- cgit v1.2.3 From aa44ef7b64ad5b00a1e6da94d06fb6c3ecd82582 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 17 Mar 2022 03:48:31 -0400 Subject: service: Move mii enums and structs into its own file Moves these into types.h, since other files also make use of these types. --- src/core/frontend/applets/mii_edit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/frontend/applets') diff --git a/src/core/frontend/applets/mii_edit.h b/src/core/frontend/applets/mii_edit.h index 0d5bb69a2..247ccd461 100644 --- a/src/core/frontend/applets/mii_edit.h +++ b/src/core/frontend/applets/mii_edit.h @@ -6,7 +6,7 @@ #include -#include "core/hle/service/mii/mii_manager.h" +#include "core/hle/service/mii/types.h" namespace Core::Frontend { -- cgit v1.2.3 From bcca849d0c68d50690711fe17480cfcda624f2c2 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Thu, 17 Mar 2022 05:19:25 -0400 Subject: applets/mii: Remove frontend parameters These are unused for now as we do not support a frontend implementation. --- src/core/frontend/applets/mii_edit.cpp | 6 ++---- src/core/frontend/applets/mii_edit.h | 15 ++------------- 2 files changed, 4 insertions(+), 17 deletions(-) (limited to 'src/core/frontend/applets') diff --git a/src/core/frontend/applets/mii_edit.cpp b/src/core/frontend/applets/mii_edit.cpp index 948d66f3d..fadb5fb15 100644 --- a/src/core/frontend/applets/mii_edit.cpp +++ b/src/core/frontend/applets/mii_edit.cpp @@ -9,12 +9,10 @@ namespace Core::Frontend { MiiEditApplet::~MiiEditApplet() = default; -void DefaultMiiEditApplet::ShowMii( - const MiiParameters& parameters, - const std::function callback) const { +void DefaultMiiEditApplet::ShowMiiEdit(const std::function& callback) const { LOG_WARNING(Service_AM, "(STUBBED) called"); - callback(parameters); + callback(); } } // namespace Core::Frontend diff --git a/src/core/frontend/applets/mii_edit.h b/src/core/frontend/applets/mii_edit.h index 247ccd461..cca0e931d 100644 --- a/src/core/frontend/applets/mii_edit.h +++ b/src/core/frontend/applets/mii_edit.h @@ -6,29 +6,18 @@ #include -#include "core/hle/service/mii/types.h" - namespace Core::Frontend { -struct MiiParameters { - bool is_editable; - Service::Mii::MiiInfo mii_data{}; -}; - class MiiEditApplet { public: virtual ~MiiEditApplet(); - virtual void ShowMii(const MiiParameters& parameters, - const std::function - callback) const = 0; + virtual void ShowMiiEdit(const std::function& callback) const = 0; }; class DefaultMiiEditApplet final : public MiiEditApplet { public: - void ShowMii(const MiiParameters& parameters, - const std::function - callback) const override; + void ShowMiiEdit(const std::function& callback) const override; }; } // namespace Core::Frontend -- cgit v1.2.3