ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove global emuThread from Window.cpp

This commit is contained in:
Arisotura 2024-02-20 13:29:21 +01:00
parent a7a7ac53c1
commit 6a2039aee1
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/qt_sdl/EmuThread.cpp
View File

@ -96,6 +96,7 @@ EmuThread::EmuThread(QObject* parent) : QThread(parent)
void EmuThread::attachWindow(MainWindow* window)
{
windowList.push_back(window);
window->attachEmuThread(this);
mainWindow = windowList.front();
connect(this, SIGNAL(windowUpdate()), window->panel, SLOT(repaint()));
@ -128,6 +129,7 @@ void EmuThread::detachWindow(MainWindow* window)
disconnect(this, SIGNAL(screenEmphasisToggle()), window, SLOT(onScreenEmphasisToggled()));
windowList.remove(window);
window->attachEmuThread(nullptr);
mainWindow = windowList.front();
}

7
src/frontend/qt_sdl/Window.cpp
View File

@ -85,7 +85,7 @@ using namespace melonDS;
// TEMP
extern MainWindow* mainWindow;
extern EmuThread* emuThread;
//extern EmuThread* emuThread;
extern bool RunningSomething;
extern QString NdsRomMimeType;
extern QStringList NdsRomExtensions;
@ -685,6 +685,11 @@ MainWindow::~MainWindow()
delete[] actScreenAspectBot;
}
void MainWindow::attachEmuThread(EmuThread* thread)
{
emuThread = thread;
}
void MainWindow::osdAddMessage(unsigned int color, const char* fmt, ...)
{
if (fmt == nullptr)

4
src/frontend/qt_sdl/Window.h
View File

@ -103,6 +103,8 @@ public:
explicit MainWindow(QWidget* parent = nullptr);
~MainWindow();
void attachEmuThread(EmuThread* thread);
bool hasOpenGL() { return hasOGL; }
GL::Context* getOGLContext();
void initOpenGL();
@ -234,6 +236,8 @@ private:
int test_num;
EmuThread* emuThread;
public:
ScreenPanel* panel;