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

finished merge of viewer and footage

Browse Source
This commit is contained in:
itsmattkc
2021-04-06 13:08:56 +10:00
parent 57ddae8920
commit 898ea25e89
58 changed files with 783 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/project/import/import.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ void ProjectImportTask::ValidateImageSequence(Footage *footage, QFileInfoList& i
video_stream.set_start_time(start_index);
video_stream.set_duration(end_index - start_index + 1);
footage->SetVideoParams(0, video_stream);
footage->SetVideoParams(video_stream, 0);
}
}
app/task/project/loadotio/loadotio.cpp
+4 -4
View File
@@ -169,15 +169,15 @@ bool LoadOTIOTask::Run()
probed_item->setParent(project_->root());
}
Footage::StreamReference reference;
Track::Reference reference;
if (track->type() == Track::kVideo) {
reference = Footage::StreamReference(Stream::kVideo, 0);
reference = Track::Reference(Track::kVideo, 0);
} else {
reference = Footage::StreamReference(Stream::kAudio, 0);
reference = Track::Reference(Track::kAudio, 0);
}
QString output_id = probed_item->GetStringFromReference(reference);
QString output_id = reference.ToString();
Node::ConnectEdge(NodeOutput(probed_item, output_id), NodeInput(block, ClipBlock::kBufferIn));
}