dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-22 03:25:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

yuzu qt: Remove global system instances from config, WaitTree, main

Browse source
This commit is contained in:
lat9nq 2021-09-02 21:40:55 -04:00 • committed by Morph
parent d40819cfb1
commit 3aec34df0a
69 changed files with 687 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/yuzu/bootmanager.h
View file

@ -34,13 +34,14 @@ enum class MouseButton;
namespace VideoCore {
enum class LoadCallbackStage;
}
class RendererBase;
} // namespace VideoCore
class EmuThread final : public QThread {
Q_OBJECT
public:
explicit EmuThread();
explicit EmuThread(Core::System& system_);
~EmuThread() override;
/**
@ -101,6 +102,7 @@ private:
std::condition_variable_any running_cv;
Common::Event running_wait{};
std::atomic_bool running_guard{false};
Core::System& system;
signals:
/**
@ -131,7 +133,8 @@ class GRenderWindow : public QWidget, public Core::Frontend::EmuWindow {
public:
explicit GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,
std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_);
std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_,
Core::System& system_);
~GRenderWindow() override;
// EmuWindow implementation.
@ -232,6 +235,8 @@ private:
std::array<std::size_t, 16> touch_ids{};
Core::System& system;
protected:
void showEvent(QShowEvent* event) override;
bool eventFilter(QObject* object, QEvent* event) override;