oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various: added hooks so that various lengthy functions could be cancelled from another thread

Browse Source
This commit is contained in:
itsmattkc
2020-02-17 02:10:12 +11:00
parent fd49b6eb55
commit 22046535ca
25 changed files with 208 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/project/project.cpp
+3 -3
View File
@@ -25,7 +25,7 @@
#include "common/xmlreadloop.h"
#include "core.h"
#include "dialog/loadsave/loadsave.h"
#include "dialog/progress/progress.h"
#include "window/mainwindow/mainwindow.h"
Project::Project()
@@ -33,7 +33,7 @@ Project::Project()
root_.set_project(this);
}
void Project::Load(QXmlStreamReader *reader)
void Project::Load(QXmlStreamReader *reader, const QAtomicInt* cancelled)
{
QHash<quintptr, StreamPtr> footage_ptrs;
QList<NodeInput::FootageConnection> footage_connections;
@@ -43,7 +43,7 @@ void Project::Load(QXmlStreamReader *reader)
if (reader->name() == "folder") {
// Assume this folder is our root
root_.Load(reader, footage_ptrs, footage_connections);
root_.Load(reader, footage_ptrs, footage_connections, cancelled);
} else if (reader->name() == "colormanagement") {