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

reimplement commandline/event preloading code

This commit is contained in:
Arisotura 2024-06-14 12:16:43 +02:00
parent 88a91f5bc1
commit fd065f4803
2 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontend/qt_sdl/EmuInstance.h
View File

@ -81,6 +81,9 @@ public:
EmuThread* getEmuThread() { return emuThread; } EmuThread* getEmuThread() { return emuThread; }
melonDS::NDS* getNDS() { return nds; } melonDS::NDS* getNDS() { return nds; }
MainWindow* getMainWindow() { return mainWindow; }
MainWindow* getWindow(int id) { return windowList[id]; }
Config::Table& getGlobalConfig() { return globalCfg; } Config::Table& getGlobalConfig() { return globalCfg; }
Config::Table& getLocalConfig() { return localCfg; } Config::Table& getLocalConfig() { return localCfg; }

67
src/frontend/qt_sdl/main.cpp
View File

@ -180,16 +180,21 @@ MelonApplication::MelonApplication(int& argc, char** argv)
#endif #endif
} }
// TODO: ROM loading should be moved to EmuInstance
// especially so the preloading below and in main() can be done in a nicer fashion
bool MelonApplication::event(QEvent *event) bool MelonApplication::event(QEvent *event)
{ {
if (event->type() == QEvent::FileOpen) if (event->type() == QEvent::FileOpen)
{ {
EmuInstance* inst = emuInstances[0];
MainWindow* win = inst->getMainWindow();
QFileOpenEvent *openEvent = static_cast<QFileOpenEvent*>(event); QFileOpenEvent *openEvent = static_cast<QFileOpenEvent*>(event);
/*emuThread->emuPause(); inst->getEmuThread()->emuPause();
const QStringList file = mainWindow->splitArchivePath(openEvent->file(), true); const QStringList file = win->splitArchivePath(openEvent->file(), true);
if (!mainWindow->preloadROMs(file, {}, true)) if (!win->preloadROMs(file, {}, true))
emuThread->emuUnpause();*/ inst->getEmuThread()->emuUnpause();
} }
return QApplication::event(event); return QApplication::event(event);
@ -271,54 +276,37 @@ int main(int argc, char** argv)
LocalMP::Init(); LocalMP::Init();
Net::Init(); Net::Init();
/* mainWindow = new MainWindow();
if (options->fullscreen)
ToggleFullscreen(mainWindow);
MainWindow* poop = new MainWindow(mainWindow);
emuThread = new EmuThread();
emuThread->attachWindow(mainWindow);
emuThread->attachWindow(poop);
emuThread->start();
emuThread->emuPause();*/
createEmuInstance(); createEmuInstance();
/*AudioInOut::Init(emuThread);
ROMManager::EnableCheats(*emuThread->NDS, Config::EnableCheats != 0);
AudioInOut::AudioMute(mainWindow);
QObject::connect(&melon, &QApplication::applicationStateChanged, mainWindow, &MainWindow::onAppStateChanged);
bool memberSyntaxUsed = false;
const auto prepareRomPath = [&](const std::optional<QString>& romPath, const std::optional<QString>& romArchivePath) -> QStringList
{ {
if (!romPath.has_value()) MainWindow* win = emuInstances[0]->getMainWindow();
return {}; bool memberSyntaxUsed = false;
const auto prepareRomPath = [&](const std::optional<QString> &romPath,
const std::optional<QString> &romArchivePath) -> QStringList
{
if (!romPath.has_value())
return {};
if (romArchivePath.has_value()) if (romArchivePath.has_value())
return { *romPath, *romArchivePath }; return {*romPath, *romArchivePath};
const QStringList path = mainWindow->splitArchivePath(*romPath, true); const QStringList path = win->splitArchivePath(*romPath, true);
if (path.size() > 1) memberSyntaxUsed = true; if (path.size() > 1) memberSyntaxUsed = true;
return path; return path;
}; };
const QStringList dsfile = prepareRomPath(options->dsRomPath, options->dsRomArchivePath); const QStringList dsfile = prepareRomPath(options->dsRomPath, options->dsRomArchivePath);
const QStringList gbafile = prepareRomPath(options->gbaRomPath, options->gbaRomArchivePath); const QStringList gbafile = prepareRomPath(options->gbaRomPath, options->gbaRomArchivePath);
if (memberSyntaxUsed) printf("Warning: use the a.zip|b.nds format at your own risk!\n"); if (memberSyntaxUsed) printf("Warning: use the a.zip|b.nds format at your own risk!\n");
mainWindow->preloadROMs(dsfile, gbafile, options->boot);*/ win->preloadROMs(dsfile, gbafile, options->boot);
}
int ret = melon.exec(); int ret = melon.exec();
delete options; delete options;
/*emuThread->emuStop();
emuThread->wait();
delete emuThread;*/
// if we get here, all the existing emu instances should have been deleted already // if we get here, all the existing emu instances should have been deleted already
// but with this we make extra sure they are all deleted // but with this we make extra sure they are all deleted
deleteAllEmuInstances(); deleteAllEmuInstances();
@ -326,7 +314,6 @@ int main(int argc, char** argv)
LocalMP::DeInit(); LocalMP::DeInit();
Net::DeInit(); Net::DeInit();
//AudioInOut::DeInit();
delete camManager[0]; delete camManager[0];
delete camManager[1]; delete camManager[1];