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

Merge branch 'master' into otio_transition

Browse Source
This commit is contained in:
ThomasWilshaw
2020-11-18 18:27:30 +00:00
committed by GitHub
parent 3f0768a1cc afbd3ada36
commit a30d86f411
873 changed files with 86362 additions and 11149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/project/CMakeLists.txt
+1 -1
View File
@@ -1,5 +1,5 @@
# Olive - Non-Linear Video Editor
# Copyright (C) 2019 Olive Team
# Copyright (C) 2020 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
app/task/project/import/CMakeLists.txt
+1 -1
View File
@@ -1,5 +1,5 @@
# Olive - Non-Linear Video Editor
# Copyright (C) 2019 Olive Team
# Copyright (C) 2020 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
app/task/project/import/import.cpp
+5 -5
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -27,7 +27,7 @@
#include "core.h"
#include "project/item/footage/footage.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectImportTask::ProjectImportTask(ProjectViewModel *model, Folder *folder, const QStringList &filenames) :
command_(nullptr),
@@ -110,8 +110,8 @@ void ProjectImportTask::Import(Folder *folder, QFileInfoList import, int &counte
} else {
FootagePtr item = Decoder::ProbeMedia(model_->project(), file_info.absoluteFilePath(),
&IsCancelled());
FootagePtr item = Decoder::Probe(model_->project(), file_info.absoluteFilePath(),
&IsCancelled());
if (item) {
// See if this footage is an image sequence
@@ -284,4 +284,4 @@ int64_t ProjectImportTask::GetImageSequenceLimit(const QString& start_fn, int64_
return start;
}
OLIVE_NAMESPACE_EXIT
}
app/task/project/import/import.h
+3 -3
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -28,7 +28,7 @@
#include "project/projectviewmodel.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectImportTask : public Task
{
@@ -83,6 +83,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTIMPORTMANAGER_H
app/task/project/import/importerrordialog.cpp
+3 -3
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -25,7 +25,7 @@
#include <QListWidget>
#include <QVBoxLayout>
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectImportErrorDialog::ProjectImportErrorDialog(const QStringList& filenames, QWidget* parent) :
QDialog(parent)
@@ -50,4 +50,4 @@ ProjectImportErrorDialog::ProjectImportErrorDialog(const QStringList& filenames,
layout->addWidget(buttons);
}
OLIVE_NAMESPACE_EXIT
}
app/task/project/import/importerrordialog.h
+3 -3
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectImportErrorDialog : public QDialog
{
@@ -35,6 +35,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTIMPORTERRORDIALOG_H
app/task/project/load/CMakeLists.txt
+1 -1
View File
@@ -1,5 +1,5 @@
# Olive - Non-Linear Video Editor
# Copyright (C) 2019 Olive Team
# Copyright (C) 2020 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
app/task/project/load/load.cpp
+6 -5
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -27,7 +27,7 @@
#include "common/xmlutils.h"
#include "core.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectLoadTask::ProjectLoadTask(const QString &filename) :
ProjectLoadBaseTask(filename)
@@ -37,6 +37,7 @@ ProjectLoadTask::ProjectLoadTask(const QString &filename) :
bool ProjectLoadTask::Run()
{
QFile project_file(GetFilename());
uint project_version = Core::kProjectVersion;
if (project_file.open(QFile::ReadOnly | QFile::Text)) {
QXmlStreamReader reader(&project_file);
@@ -45,7 +46,7 @@ bool ProjectLoadTask::Run()
if (reader.name() == QStringLiteral("olive")) {
while(XMLReadNextStartElement(&reader)) {
if (reader.name() == QStringLiteral("version")) {
uint project_version = reader.readElementText().toUInt();
project_version = reader.readElementText().toUInt();
if (project_version > Core::kProjectVersion) {
// Project is newer than we support
@@ -63,7 +64,7 @@ bool ProjectLoadTask::Run()
project_->set_filename(GetFilename());
project_->Load(&reader, &layout_info_, &IsCancelled());
project_->Load(&reader, &layout_info_, project_version, &IsCancelled());
// Ensure project is in main thread
project_->moveToThread(qApp->thread());
@@ -99,4 +100,4 @@ bool ProjectLoadTask::Run()
}
}
OLIVE_NAMESPACE_EXIT
}
app/task/project/load/load.h
+3 -3
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -24,7 +24,7 @@
#include "loadbasetask.h"
#include "window/mainwindow/mainwindowlayoutinfo.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectLoadTask : public ProjectLoadBaseTask
{
@@ -37,6 +37,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTLOADMANAGER_H
app/task/project/load/loadbasetask.cpp
+3 -3
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -20,7 +20,7 @@
#include "loadbasetask.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectLoadBaseTask::ProjectLoadBaseTask(const QString &filename) :
project_(nullptr),
@@ -29,4 +29,4 @@ ProjectLoadBaseTask::ProjectLoadBaseTask(const QString &filename) :
SetTitle(tr("Loading '%1'").arg(filename));
}
OLIVE_NAMESPACE_EXIT
}
app/task/project/load/loadbasetask.h
+3 -3
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -24,7 +24,7 @@
#include "project/project.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectLoadBaseTask : public Task
{
@@ -69,6 +69,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // LOADBASETASK_H
app/task/project/loadotio/CMakeLists.txt
+1 -1
View File
@@ -1,5 +1,5 @@
# Olive - Non-Linear Video Editor
# Copyright (C) 2019 Olive Team
# Copyright (C) 2020 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
app/task/project/loadotio/loadotio.cpp
+6 -9
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -31,14 +31,13 @@
#include "node/block/clip/clip.h"
#include "node/block/gap/gap.h"
#include "node/block/transition/crossdissolve/crossdissolvetransition.h"
#include "node/input/media/audio/audio.h"
#include "node/input/media/video/video.h"
#include "node/input/media/media.h"
#include "project/item/folder/folder.h"
#include "project/item/sequence/sequence.h"
#define OTIO opentimelineio::v1_0
OLIVE_NAMESPACE_ENTER
namespace olive {
LoadOTIOTask::LoadOTIOTask(const QString& s) :
ProjectLoadBaseTask(s)
@@ -210,18 +209,16 @@ bool LoadOTIOTask::Run()
if (imported_footage.contains(footage_url)) {
probed_item = imported_footage.value(footage_url);
} else {
probed_item = Decoder::ProbeMedia(project_.get(), footage_url, &IsCancelled());
probed_item = Decoder::Probe(project_.get(), footage_url, &IsCancelled());
imported_footage.insert(footage_url, probed_item);
project_->root()->add_child(probed_item);
}
if (probed_item && probed_item->type() == Item::kFootage) {
MediaInput* media;
MediaInput* media = new MediaInput();
if (track->track_type() == Timeline::kTrackTypeVideo) {
media = new VideoInput();
media->SetStream(probed_item->get_first_stream_of_type(Stream::kVideo));
} else {
media = new AudioInput();
media->SetStream(probed_item->get_first_stream_of_type(Stream::kAudio));
}
sequence->AddNode(media);
@@ -253,4 +250,4 @@ bool LoadOTIOTask::Run()
return true;
}
OLIVE_NAMESPACE_EXIT
}
app/task/project/loadotio/loadotio.h
+3 -3
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -24,7 +24,7 @@
#include "project/project.h"
#include "task/project/load/loadbasetask.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class LoadOTIOTask : public ProjectLoadBaseTask
{
@@ -37,6 +37,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // OTIODECODER_H
app/task/project/save/CMakeLists.txt
+1 -1
View File
@@ -1,5 +1,5 @@
# Olive - Non-Linear Video Editor
# Copyright (C) 2019 Olive Team
# Copyright (C) 2020 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
app/task/project/save/save.cpp
+8 -9
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -27,7 +27,7 @@
#include "common/filefunctions.h"
#include "core.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectSaveTask::ProjectSaveTask(ProjectPtr project) :
project_(project)
@@ -38,7 +38,7 @@ ProjectSaveTask::ProjectSaveTask(ProjectPtr project) :
bool ProjectSaveTask::Run()
{
// File to temporarily save to (ensures we can't half-write the user's main file and crash)
QString temp_save = QDir(FileFunctions::GetTempFilePath()).filePath(QStringLiteral("tempsv"));
QString temp_save = FileFunctions::GetSafeTemporaryFilename(project_->filename());
QFile project_file(temp_save);
@@ -74,18 +74,17 @@ bool ProjectSaveTask::Run()
}
// Save was successful, we can now rewrite the original file
QFile original(project_->filename());
if ((!original.exists() || original.remove())
&& QFile::copy(temp_save, project_->filename())) {
if (FileFunctions::RenameFileAllowOverwrite(temp_save, project_->filename())) {
return true;
} else {
SetError(tr("Failed to write to \"%1\".").arg(project_->filename()));
SetError(tr("Failed to overwrite \"%1\". Project has been saved as \"%2\" instead.")
.arg(project_->filename(), temp_save));
return false;
}
} else {
SetError(tr("Failed to open file \"%1\" for writing.").arg(project_->filename()));
SetError(tr("Failed to open temporary file \"%1\" for writing.").arg(temp_save));
return false;
}
}
OLIVE_NAMESPACE_EXIT
}
app/task/project/save/save.h
+3 -3
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -24,7 +24,7 @@
#include "project/project.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectSaveTask : public Task
{
@@ -45,6 +45,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTSAVEMANAGER_H
app/task/project/saveotio/CMakeLists.txt
+1 -1
View File
@@ -1,5 +1,5 @@
# Olive - Non-Linear Video Editor
# Copyright (C) 2019 Olive Team
# Copyright (C) 2020 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
app/task/project/saveotio/saveotio.cpp
+5 -5
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -29,7 +29,7 @@
#include "node/block/transition/transition.h"
#include "node/input/media/media.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
SaveOTIOTask::SaveOTIOTask(ProjectPtr project) :
project_(project)
@@ -49,7 +49,7 @@ bool SaveOTIOTask::Run()
std::vector<opentimelineio::v1_0::SerializableObject*> serialized;
foreach (ItemPtr item, sequences) {
SequencePtr seq = std::static_pointer_cast<Sequence>(sequences.first());
SequencePtr seq = std::static_pointer_cast<Sequence>(item);
auto otio_timeline = SerializeTimeline(seq);
@@ -133,7 +133,7 @@ opentimelineio::v1_0::Track *SaveOTIOTask::SerializeTrack(TrackOutput *track)
otio_clip->set_source_range(opentimelineio::v1_0::TimeRange(block->in().toRationalTime(),
block->length().toRationalTime()));
QList<MediaInput*> media_nodes = block->FindInputNodes<MediaInput>();
QVector<MediaInput*> media_nodes = block->FindInputNodes<MediaInput>();
if (!media_nodes.isEmpty()) {
auto media_ref = new opentimelineio::v1_0::ExternalReference(media_nodes.first()->stream()->footage()->filename().toStdString());
otio_clip->set_media_reference(media_ref);
@@ -206,4 +206,4 @@ bool SaveOTIOTask::SerializeTrackList(TrackList *list, opentimelineio::v1_0::Tim
return true;
}
OLIVE_NAMESPACE_EXIT
}
app/task/project/saveotio/saveotio.h
+3 -3
View File
@@ -1,7 +1,7 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
Copyright (C) 2020 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
@@ -27,7 +27,7 @@
#include "project/project.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SaveOTIOTask : public Task
{
@@ -49,6 +49,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTSAVEASOTIOTASK_H