finalized very, very basic OTIO support

Ironed out various project and footage loading issues, and a single
cache invalidation issue.
This commit is contained in:
itsmattkc
2020-10-23 01:26:17 +11:00
parent 9613730ee8
commit bc60c74562
32 changed files with 473 additions and 301 deletions
+2
View File
@@ -18,5 +18,7 @@ set(OLIVE_SOURCES
${OLIVE_SOURCES}
task/project/load/load.h
task/project/load/load.cpp
task/project/load/loadbasetask.h
task/project/load/loadbasetask.cpp
PARENT_SCOPE
)
+4 -5
View File
@@ -30,14 +30,13 @@
OLIVE_NAMESPACE_ENTER
ProjectLoadTask::ProjectLoadTask(const QString &filename) :
filename_(filename)
ProjectLoadBaseTask(filename)
{
SetTitle(tr("Loading '%1'").arg(filename));
}
bool ProjectLoadTask::Run()
{
QFile project_file(filename_);
QFile project_file(GetFilename());
if (project_file.open(QFile::ReadOnly | QFile::Text)) {
QXmlStreamReader reader(&project_file);
@@ -62,7 +61,7 @@ bool ProjectLoadTask::Run()
} else if (reader.name() == QStringLiteral("project")) {
project_ = std::make_shared<Project>();
project_->set_filename(filename_);
project_->set_filename(GetFilename());
project_->Load(&reader, &layout_info_, &IsCancelled());
@@ -95,7 +94,7 @@ bool ProjectLoadTask::Run()
}
} else {
SetError(tr("Failed to read file \"%1\" for reading.").arg(filename_));
SetError(tr("Failed to read file \"%1\" for reading.").arg(GetFilename()));
return false;
}
}
+2 -32
View File
@@ -21,50 +21,20 @@
#ifndef PROJECTLOADMANAGER_H
#define PROJECTLOADMANAGER_H
#include "project/project.h"
#include "task/task.h"
#include "loadbasetask.h"
#include "window/mainwindow/mainwindowlayoutinfo.h"
OLIVE_NAMESPACE_ENTER
class ProjectLoadTask : public Task
class ProjectLoadTask : public ProjectLoadBaseTask
{
Q_OBJECT
public:
ProjectLoadTask(const QString& filename);
ProjectPtr GetLoadedProject() const
{
return project_;
}
MainWindowLayoutInfo GetLoadedLayout() const
{
return layout_info_;
}
/**
* @brief Returns the filename the project was saved as, but not necessarily where it is now
*
* May help for resolving relative paths.
*/
const QString& GetFilenameProjectWasSavedAs() const
{
return project_saved_url_;
}
protected:
virtual bool Run() override;
private:
ProjectPtr project_;
MainWindowLayoutInfo layout_info_;
QString project_saved_url_;
QString filename_;
};
OLIVE_NAMESPACE_EXIT
+32
View File
@@ -0,0 +1,32 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "loadbasetask.h"
OLIVE_NAMESPACE_ENTER
ProjectLoadBaseTask::ProjectLoadBaseTask(const QString &filename) :
project_(nullptr),
filename_(filename)
{
SetTitle(tr("Loading '%1'").arg(filename));
}
OLIVE_NAMESPACE_EXIT
+74
View File
@@ -0,0 +1,74 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef PROJECTLOADBASETASK_H
#define PROJECTLOADBASETASK_H
#include "project/project.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
class ProjectLoadBaseTask : public Task
{
Q_OBJECT
public:
ProjectLoadBaseTask(const QString& filename);
ProjectPtr GetLoadedProject() const
{
return project_;
}
MainWindowLayoutInfo GetLoadedLayout() const
{
return layout_info_;
}
/**
* @brief Returns the filename the project was saved as, but not necessarily where it is now
*
* May help for resolving relative paths.
*/
const QString& GetFilenameProjectWasSavedAs() const
{
return project_saved_url_;
}
const QString& GetFilename() const
{
return filename_;
}
protected:
ProjectPtr project_;
MainWindowLayoutInfo layout_info_;
QString project_saved_url_;
private:
QString filename_;
};
OLIVE_NAMESPACE_EXIT
#endif // LOADBASETASK_H