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

multithreaded download and files that probably should have been in the last

Browse Source 
commit

For testing the new iteration, the texture cache disk download was written
into the main thread instead of into the separate threads. Now they're back
in separate threads again.

Also I think some of these files probably should have been in the previous
commit.
This commit is contained in:
itsmattkc
2019-11-06 09:14:20 +11:00
parent 6de976c19f
commit 3b224c7638
16 changed files with 606 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/tool/import.cpp
+8 -8
View File
@@ -218,14 +218,14 @@ void TimelineWidget::ImportTool::DragDrop(TimelineViewMouseEvent *event)
ClipBlock* clip = new ClipBlock();
VideoInput* media = new VideoInput();
TransformDistort* transform = new TransformDistort();
OpacityNode* opacity = new OpacityNode();
//TransformDistort* transform = new TransformDistort();
//OpacityNode* opacity = new OpacityNode();
// Set parents to node_memory_manager in case no TimelineOutput receives this signal
clip->setParent(&node_memory_manager);
media->setParent(&node_memory_manager);
transform->setParent(&node_memory_manager);
opacity->setParent(&node_memory_manager);
//transform->setParent(&node_memory_manager);
//opacity->setParent(&node_memory_manager);
StreamPtr footage_stream = ghost->data(TimelineViewGhostItem::kAttachedFootage).value<StreamPtr>();
media->SetFootage(footage_stream);
@@ -233,10 +233,10 @@ void TimelineWidget::ImportTool::DragDrop(TimelineViewMouseEvent *event)
clip->set_length(ghost->Length());
clip->set_block_name(footage_stream->footage()->name());
NodeParam::ConnectEdge(opacity->texture_output(), clip->texture_input());
NodeParam::ConnectEdge(media->texture_output(), opacity->texture_input());
NodeParam::ConnectEdge(transform->matrix_output(), media->matrix_input());
//NodeParam::ConnectEdge(opacity->texture_output(), clip->texture_input());
//NodeParam::ConnectEdge(media->texture_output(), opacity->texture_input());
//NodeParam::ConnectEdge(transform->matrix_output(), media->matrix_input());
NodeParam::ConnectEdge(media->texture_output(), clip->texture_input());
if (event->GetModifiers() & Qt::ControlModifier) {
//emit parent()->RequestInsertBlockAtTime(clip, ghost->GetAdjustedIn());