From b4529205b90e972372d2049fee64709352885885 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 13 Aug 2019 21:55:10 +1000 Subject: [PATCH] cleared up some broken stuff for now --- app/node/output/timeline/timeline.cpp | 4 ++++ app/widget/timelineview/tool/pointer.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/app/node/output/timeline/timeline.cpp b/app/node/output/timeline/timeline.cpp index 6e9939bed..41e9bf2d9 100644 --- a/app/node/output/timeline/timeline.cpp +++ b/app/node/output/timeline/timeline.cpp @@ -250,6 +250,10 @@ void TimelineOutput::PlaceBlock(Block *block, rational start) { AddBlockToGraph(block); + if (block->in() == start) { + return; + } + // Place block at the beginning if (start == 0) { // FIXME: Remove existing diff --git a/app/widget/timelineview/tool/pointer.cpp b/app/widget/timelineview/tool/pointer.cpp index 19af5dccd..c4e5816c0 100644 --- a/app/widget/timelineview/tool/pointer.cpp +++ b/app/widget/timelineview/tool/pointer.cpp @@ -65,6 +65,7 @@ void TimelineView::PointerTool::MouseMove(QMouseEvent *event) ghost->SetIn(clip->in()); ghost->SetOut(clip->out()); ghost->SetScale(parent()->scale_); + ghost->SetData(Node::PtrToValue(clip)); ghost->setPos(clip_item->pos()); @@ -105,11 +106,13 @@ void TimelineView::PointerTool::MouseRelease(QMouseEvent *event) parent()->QGraphicsView::mouseReleaseEvent(event); + /* foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) { Block* b = Node::ValueToPtr(ghost->data()); emit parent()->RequestPlaceBlock(b, ghost->In()); } + */ parent()->ClearGhosts();