mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-07 12:59:12 +01:00
main: Switch to AppletManager for frontend
This commit is contained in:
parent
76452cd5b3
commit
a04d36c5a4
1 changed files with 9 additions and 3 deletions
|
@ -8,6 +8,7 @@
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
// VFS includes must be before glad as they will conflict with Windows file api, which uses defines.
|
// VFS includes must be before glad as they will conflict with Windows file api, which uses defines.
|
||||||
|
#include "applets/error.h"
|
||||||
#include "applets/profile_select.h"
|
#include "applets/profile_select.h"
|
||||||
#include "applets/software_keyboard.h"
|
#include "applets/software_keyboard.h"
|
||||||
#include "applets/web_browser.h"
|
#include "applets/web_browser.h"
|
||||||
|
@ -15,6 +16,7 @@
|
||||||
#include "configuration/configure_per_general.h"
|
#include "configuration/configure_per_general.h"
|
||||||
#include "core/file_sys/vfs.h"
|
#include "core/file_sys/vfs.h"
|
||||||
#include "core/file_sys/vfs_real.h"
|
#include "core/file_sys/vfs_real.h"
|
||||||
|
#include "core/frontend/applets/general_frontend.h"
|
||||||
#include "core/frontend/scope_acquire_window_context.h"
|
#include "core/frontend/scope_acquire_window_context.h"
|
||||||
#include "core/hle/service/acc/profile_manager.h"
|
#include "core/hle/service/acc/profile_manager.h"
|
||||||
#include "core/hle/service/am/applets/applets.h"
|
#include "core/hle/service/am/applets/applets.h"
|
||||||
|
@ -795,9 +797,13 @@ bool GMainWindow::LoadROM(const QString& filename) {
|
||||||
|
|
||||||
system.SetGPUDebugContext(debug_context);
|
system.SetGPUDebugContext(debug_context);
|
||||||
|
|
||||||
system.SetProfileSelector(std::make_unique<QtProfileSelector>(*this));
|
system.SetAppletFrontendSet({
|
||||||
system.SetSoftwareKeyboard(std::make_unique<QtSoftwareKeyboard>(*this));
|
std::make_unique<QtErrorDisplay>(*this),
|
||||||
system.SetWebBrowser(std::make_unique<QtWebBrowser>(*this));
|
nullptr,
|
||||||
|
std::make_unique<QtProfileSelector>(*this),
|
||||||
|
std::make_unique<QtSoftwareKeyboard>(*this),
|
||||||
|
std::make_unique<QtWebBrowser>(*this),
|
||||||
|
});
|
||||||
|
|
||||||
const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())};
|
const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue