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

Transitiosn and gaps are now added. Also removed unnecessary code

Browse Source
This commit is contained in:
Thomas Wilshaw
2021-08-07 15:06:50 +01:00
parent 1d2341245b
commit 850b75fe24
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/core.cpp
-8
View File
@@ -1501,14 +1501,6 @@ void Core::CacheActiveSequence(bool in_out_only)
bool Core::ValidateFootageInLoadedProject(Project* project, const QString& project_saved_url)
{
QVector<Footage*> project_footage = project->root()->ListChildrenOfType<Footage>();
// OTIO files import their footage into a folder so check them too
foreach(Folder * folder, project->root()->ListChildrenOfType<Folder>()) {
QVector<Footage*> footage = folder->ListChildrenOfType<Footage>();
if (!footage.isEmpty()) {
project_footage.append(footage);
}
}
QVector<Footage*> footage_we_couldnt_validate;
foreach (Footage* footage, project_footage) {
app/task/project/loadotio/loadotio.cpp
+22
View File
@@ -206,6 +206,28 @@ bool LoadOTIOTask::Run()
transition_block->set_media_in(rational::fromDouble(-otio_block_transition->out_offset().to_seconds()));
}
prev_block_transition = true;
// Add nodes to the graph and set up contexts
MultiUndoCommand* command = new MultiUndoCommand();
command->add_child(new NodeAddCommand(sequence->parent(), block));
// Position transition in its own context
command->add_child(new NodeSetPositionCommand(block, block, QPointF(0, 0), false));
Core::instance()->undo_stack()->pushIfHasChildren(command);
}
if (otio_block->schema_name() == "Gap") {
// Add nodes to the graph and set up contexts
MultiUndoCommand* command = new MultiUndoCommand();
command->add_child(new NodeAddCommand(sequence->parent(), block));
// Position transition in its own context
command->add_child(new NodeSetPositionCommand(block, block, QPointF(0, 0), false));
Core::instance()->undo_stack()->pushIfHasChildren(command);
}
// Update this after it's used but before any continue statements