sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass a SystemBootParameters pointer to QtHostInterface::bootSystem

Browse Source 
This resolves ownership issues related to the SystemBootParameters
class, since it's meant to be non-copyable but it was copied as per
Qt meta type rules
This commit is contained in:
Silent
2020-09-12 22:01:08 +02:00
parent 95d5417017
commit c47dceffb5
4 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/duckstation-qt/qthostinterface.cpp
View File

@ -44,7 +44,7 @@ Log_SetChannel(QtHostInterface);
QtHostInterface::QtHostInterface(QObject* parent) : QObject(parent), CommonHostInterface()
{
qRegisterMetaType<SystemBootParameters>();
qRegisterMetaType<std::shared_ptr<const SystemBootParameters>>();
}
QtHostInterface::~QtHostInterface()
@ -171,12 +171,6 @@ bool QtHostInterface::ConfirmMessage(const char* message)
return result;
}
bool QtHostInterface::parseCommandLineParameters(int argc, char* argv[],
std::unique_ptr<SystemBootParameters>* out_boot_params)
{
return CommonHostInterface::ParseCommandLineParameters(argc, argv, out_boot_params);
}
std::string QtHostInterface::GetStringSettingValue(const char* section, const char* key,
const char* default_value /*= ""*/)
{
@ -344,16 +338,17 @@ void QtHostInterface::setMainWindow(MainWindow* window)
m_main_window = window;
}
void QtHostInterface::bootSystem(const SystemBootParameters& params)
void QtHostInterface::bootSystem(std::shared_ptr<const SystemBootParameters> params)
{
if (!isOnWorkerThread())
{
QMetaObject::invokeMethod(this, "bootSystem", Qt::QueuedConnection, Q_ARG(const SystemBootParameters&, params));
QMetaObject::invokeMethod(this, "bootSystem", Qt::QueuedConnection,
Q_ARG(std::shared_ptr<const SystemBootParameters>, std::move(params)));
return;
}
emit emulationStarting();
BootSystem(params);
BootSystem(*params);
}
void QtHostInterface::resumeSystemFromState(const QString& filename, bool boot_on_failure)