piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12608 from mitaclaw/bootmanager-global-system

Browse Source 
BootManager: Avoid Global System Accessor
This commit is contained in:
Admiral H. Curtiss 2024-03-12 03:39:48 +01:00 committed by GitHub
commit d35a88564f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/jni/MainAndroid.cpp
View File

@ -570,7 +570,7 @@ static void Run(JNIEnv* env, std::unique_ptr<BootParameters>&& boot, bool riivol
s_need_nonblocking_alert_msg = true;
std::unique_lock<std::mutex> surface_guard(s_surface_lock);
if (BootManager::BootCore(std::move(boot), wsi))
if (BootManager::BootCore(Core::System::GetInstance(), std::move(boot), wsi))
{
static constexpr int WAIT_STEP = 25;
while (Core::GetState() == Core::State::Starting)

4
Source/Core/Core/BootManager.cpp
View File

@ -55,12 +55,12 @@
namespace BootManager
{
// Boot the ISO or file
bool BootCore(std::unique_ptr<BootParameters> boot, const WindowSystemInfo& wsi)
bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
const WindowSystemInfo& wsi)
{
if (!boot)
return false;
auto& system = Core::System::GetInstance();
SConfig& StartUp = SConfig::GetInstance();
if (!StartUp.SetPathsAndGameMetadata(system, *boot))

7
Source/Core/Core/BootManager.h
View File

@ -5,12 +5,17 @@
#include <memory>
namespace Core
{
class System;
}
struct BootParameters;
struct WindowSystemInfo;
namespace BootManager
{
bool BootCore(std::unique_ptr<BootParameters> parameters, const WindowSystemInfo& wsi);
bool BootCore(Core::System& system, std::unique_ptr<BootParameters> parameters,
const WindowSystemInfo& wsi);
// Synchronise Dolphin's configuration with the SYSCONF (which may have changed during emulation),
// and restore settings that were overriden by per-game INIs or for some other reason.

3
Source/Core/DolphinNoGUI/MainNoGUI.cpp
View File

@ -24,6 +24,7 @@
#include "Core/Core.h"
#include "Core/DolphinAnalytics.h"
#include "Core/Host.h"
#include "Core/System.h"
#include "UICommon/CommandLineParse.h"
#ifdef USE_DISCORD_PRESENCE
@ -304,7 +305,7 @@ int main(int argc, char* argv[])
DolphinAnalytics::Instance().ReportDolphinStart("nogui");
if (!BootManager::BootCore(std::move(boot), wsi))
if (!BootManager::BootCore(Core::System::GetInstance(), std::move(boot), wsi))
{
fprintf(stderr, "Could not boot the specified file\n");
return 1;

2
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -1126,7 +1126,7 @@ void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters)
ShowRenderWidget();
// Boot up, show an error if it fails to load the game.
if (!BootManager::BootCore(std::move(parameters),
if (!BootManager::BootCore(Core::System::GetInstance(), std::move(parameters),
::GetWindowSystemInfo(m_render_widget->windowHandle())))
{
ModalMessageBox::critical(this, tr("Error"), tr("Failed to init core"), QMessageBox::Ok);