summaryrefslogtreecommitdiff
path: root/src/core/hle/applets/applet.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2016-03-12 11:23:59 -0500
committerGravatar bunnei2016-03-12 11:23:59 -0500
commit2f0a61debf8fd843fefd6fcca3ad9f425af57216 (patch)
tree893e6facd198962123ccefd0b2ab893c420e342e /src/core/hle/applets/applet.cpp
parentMerge pull request #1500 from lioncash/nullptr (diff)
parentHLE/Applets: Implemented a dummy Mii Selector applet. (diff)
downloadyuzu-2f0a61debf8fd843fefd6fcca3ad9f425af57216.tar.gz
yuzu-2f0a61debf8fd843fefd6fcca3ad9f425af57216.tar.xz
yuzu-2f0a61debf8fd843fefd6fcca3ad9f425af57216.zip
Merge pull request #1266 from Subv/miiapplet
HLE/Applets: Implemented a dummy Mii Selector applet.
Diffstat (limited to 'src/core/hle/applets/applet.cpp')
-rw-r--r--src/core/hle/applets/applet.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/hle/applets/applet.cpp b/src/core/hle/applets/applet.cpp
index bc2a1829e..90e134437 100644
--- a/src/core/hle/applets/applet.cpp
+++ b/src/core/hle/applets/applet.cpp
@@ -12,6 +12,7 @@
12 12
13#include "core/core_timing.h" 13#include "core/core_timing.h"
14#include "core/hle/applets/applet.h" 14#include "core/hle/applets/applet.h"
15#include "core/hle/applets/mii_selector.h"
15#include "core/hle/applets/swkbd.h" 16#include "core/hle/applets/swkbd.h"
16#include "core/hle/result.h" 17#include "core/hle/result.h"
17#include "core/hle/service/apt/apt.h" 18#include "core/hle/service/apt/apt.h"
@@ -47,7 +48,12 @@ ResultCode Applet::Create(Service::APT::AppletId id) {
47 case Service::APT::AppletId::SoftwareKeyboard2: 48 case Service::APT::AppletId::SoftwareKeyboard2:
48 applets[id] = std::make_shared<SoftwareKeyboard>(id); 49 applets[id] = std::make_shared<SoftwareKeyboard>(id);
49 break; 50 break;
51 case Service::APT::AppletId::Ed1:
52 case Service::APT::AppletId::Ed2:
53 applets[id] = std::make_shared<MiiSelector>(id);
54 break;
50 default: 55 default:
56 LOG_ERROR(Service_APT, "Could not create applet %u", id);
51 // TODO(Subv): Find the right error code 57 // TODO(Subv): Find the right error code
52 return ResultCode(ErrorDescription::NotFound, ErrorModule::Applet, ErrorSummary::NotSupported, ErrorLevel::Permanent); 58 return ResultCode(ErrorDescription::NotFound, ErrorModule::Applet, ErrorSummary::NotSupported, ErrorLevel::Permanent);
53 } 59 }