Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Applets: Reworked how the Applet update event is handled.

Browse source 
Applets are now cleaned up in AppletUpdateEvent after calling their respective Update method.
This commit is contained in:
Subv 2015-05-27 15:21:06 -05:00
parent 621ee10eae
commit 725d5eea78
7 changed files with 61 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/core/hle/applets/applet.h
View file

@ -12,10 +12,10 @@
namespace HLE {
namespace Applets {
class Applet : public std::enable_shared_from_this<Applet> {
class Applet {
public:
virtual ~Applet() {};
Applet(Service::APT::AppletId id) : id(id) {};
virtual ~Applet() { }
Applet(Service::APT::AppletId id) : id(id) { }
/**
* Creates an instance of the Applet subclass identified by the parameter.
@ -37,25 +37,33 @@ public:
* @param parameter Parameter data to handle.
* @returns ResultCode Whether the operation was successful or not.
*/
virtual ResultCode ReceiveParameter(Service::APT::MessageParameter const& parameter) = 0;
virtual ResultCode ReceiveParameter(const Service::APT::MessageParameter& parameter) = 0;
/**
* Handles the Applet start event, triggered from the application.
* @param parameter Parameter data to handle.
* @returns ResultCode Whether the operation was successful or not.
*/
virtual ResultCode Start(Service::APT::AppletStartupParameter const& parameter) = 0;
ResultCode Start(const Service::APT::AppletStartupParameter& parameter);
/**
* Whether the applet is currently executing instead of the host application or not.
*/
virtual bool IsRunning() = 0;
virtual bool IsRunning() const = 0;
/**
* Handles an update tick for the Applet, lets it update the screen, send commands, etc.
*/
virtual void Update() = 0;
protected:
/**
* Handles the Applet start event, triggered from the application.
* @param parameter Parameter data to handle.
* @returns ResultCode Whether the operation was successful or not.
*/
virtual ResultCode StartImpl(const Service::APT::AppletStartupParameter& parameter) = 0;
Service::APT::AppletId id; ///< Id of this Applet
};
@ -65,6 +73,5 @@ void Init();
/// Shuts down the HLE applets
void Shutdown();
extern std::shared_ptr<Applet> g_current_applet; ///< Applet that is currently executing
}
} // namespace