mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-11-27 22:42:47 +00:00
core: Add Exit and ExitCallback
This allows ISelfController::Exit to stop the currently running application. This is typically used by homebrew to exit back to the homebrew menu after calling consoleExit with libnx.
This commit is contained in:
parent
3a33519598
commit
d8467ca6c0
|
@ -421,6 +421,7 @@ struct System::Impl {
|
||||||
bool is_async_gpu{};
|
bool is_async_gpu{};
|
||||||
|
|
||||||
ExecuteProgramCallback execute_program_callback;
|
ExecuteProgramCallback execute_program_callback;
|
||||||
|
ExitCallback exit_callback;
|
||||||
|
|
||||||
std::array<u64, Core::Hardware::NUM_CPU_CORES> dynarmic_ticks{};
|
std::array<u64, Core::Hardware::NUM_CPU_CORES> dynarmic_ticks{};
|
||||||
std::array<MicroProfileToken, Core::Hardware::NUM_CPU_CORES> microprofile_dynarmic{};
|
std::array<MicroProfileToken, Core::Hardware::NUM_CPU_CORES> microprofile_dynarmic{};
|
||||||
|
@ -798,6 +799,18 @@ void System::ExecuteProgram(std::size_t program_index) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void System::RegisterExitCallback(ExitCallback&& callback) {
|
||||||
|
impl->exit_callback = std::move(callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
void System::Exit() {
|
||||||
|
if (impl->exit_callback) {
|
||||||
|
impl->exit_callback();
|
||||||
|
} else {
|
||||||
|
LOG_CRITICAL(Core, "exit_callback must be initialized by the frontend");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void System::ApplySettings() {
|
void System::ApplySettings() {
|
||||||
if (IsPoweredOn()) {
|
if (IsPoweredOn()) {
|
||||||
Renderer().RefreshBaseSettings();
|
Renderer().RefreshBaseSettings();
|
||||||
|
|
|
@ -387,6 +387,18 @@ public:
|
||||||
*/
|
*/
|
||||||
void ExecuteProgram(std::size_t program_index);
|
void ExecuteProgram(std::size_t program_index);
|
||||||
|
|
||||||
|
/// Type used for the frontend to designate a callback for System to exit the application.
|
||||||
|
using ExitCallback = std::function<void()>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers a callback from the frontend for System to exit the application.
|
||||||
|
* @param callback Callback from the frontend to exit the application.
|
||||||
|
*/
|
||||||
|
void RegisterExitCallback(ExitCallback&& callback);
|
||||||
|
|
||||||
|
/// Instructs the frontend to exit the application.
|
||||||
|
void Exit();
|
||||||
|
|
||||||
/// Applies any changes to settings to this core instance.
|
/// Applies any changes to settings to this core instance.
|
||||||
void ApplySettings();
|
void ApplySettings();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue