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

Merge pull request #5828 from ligfx/qtqueueonobject 

Qt: add QueueOnObject
This commit is contained in:
Leo Lam 2017-07-26 12:56:08 +08:00 committed by GitHub
parent be8324380d 2c03cfacc2
commit 10db1bcbca
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/DolphinQt2/QtUtils/QueueOnObject.h Normal file
View File

@ -0,0 +1,20 @@
// Copyright 2017 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#pragma once
#include <QObject>
#include <utility>
// QWidget and subclasses are not thread-safe! However, Qt's signal-slot connection mechanism will
// invoke slots/functions on the correct thread for any object. We can (ab)use this to queue up
// arbitrary code from non-GUI threads. For more information, see:
// https://stackoverflow.com/questions/21646467/
template <typename F>
static void QueueOnObject(QObject* obj, F&& func)
{
QObject src;
QObject::connect(&src, &QObject::destroyed, obj, std::forward<F>(func), Qt::QueuedConnection);
}

21
Source/Core/DolphinQt2/WiiUpdate.cpp
View File

@ -18,6 +18,7 @@
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/WiiUtils.h" #include "Core/WiiUtils.h"
#include "DiscIO/NANDImporter.h" #include "DiscIO/NANDImporter.h"
#include "DolphinQt2/QtUtils/QueueOnObject.h"
namespace WiiUpdate namespace WiiUpdate
{ {
@ -62,21 +63,19 @@ void PerformOnlineUpdate(const std::string& region, QWidget* parent)
std::future<WiiUtils::UpdateResult> result = std::async(std::launch::async, [&] { std::future<WiiUtils::UpdateResult> result = std::async(std::launch::async, [&] {
const WiiUtils::UpdateResult res = WiiUtils::DoOnlineUpdate( const WiiUtils::UpdateResult res = WiiUtils::DoOnlineUpdate(
[&](size_t processed, size_t total, u64 title_id) { [&](size_t processed, size_t total, u64 title_id) {
Core::QueueHostJob( QueueOnObject(&dialog, [&dialog, &was_cancelled, processed, total, title_id]() {
[&dialog, &was_cancelled, processed, total, title_id]() { if (was_cancelled.IsSet())
if (was_cancelled.IsSet()) return;
return;
dialog.setRange(0, static_cast<int>(total)); dialog.setRange(0, static_cast<int>(total));
dialog.setValue(static_cast<int>(processed)); dialog.setValue(static_cast<int>(processed));
dialog.setLabelText(QObject::tr("Updating title %1...\nThis can take a while.") dialog.setLabelText(QObject::tr("Updating title %1...\nThis can take a while.")
.arg(title_id, 16, 16, QLatin1Char('0'))); .arg(title_id, 16, 16, QLatin1Char('0')));
}, });
true);
return !was_cancelled.IsSet(); return !was_cancelled.IsSet();
}, },
region); region);
Core::QueueHostJob([&dialog] { dialog.close(); }, true); QueueOnObject(&dialog, [&dialog] { dialog.close(); });
return res; return res;
}); });