implemented deleting clips in the timeline

Also fixed bugs in the Node::GetExclusiveDependencies function and in the NodeInputArray::RemoveAt function to make this functionality work.
2019-12-14 17:10:06 +11:00
parent 764fbb74c1
commit 2f04a53054
12 changed files with 155 additions and 88 deletions
@@ -383,16 +383,96 @@ void TimelineWidget::SplitAtPlayhead()
  }
 }

+void TimelineWidget::DeleteSelectedInternal(const QList<Block *> blocks, bool remove_from_graph, QUndoCommand *command)
+{
+  foreach (Block* b, blocks) {
+    // All this function does is replace blocks with gaps, nothing to do if the block is already a gap
+    if (b->type() == Block::kGap) {
+      continue;
+    }
+
+    bool previous_is_gap = (b->previous() && b->previous()->type() == Block::kGap);
+    bool next_is_gap = (b->next() && b->next()->type() == Block::kGap);
+
+    TrackOutput* original_track = TrackOutput::TrackFromBlock(b);
+
+    if (!b->next()) {
+      // If the block has no next, presumably it's the last block and doesn't actually need a gap
+      new TrackRippleRemoveBlockCommand(original_track,
+                                        b,
+                                        command);
+    } else if (!previous_is_gap && !next_is_gap) {
+      // Make new gap and replace old Block with it for now
+      GapBlock* gap = new GapBlock();
+      gap->set_length(b->length());
+
+      new NodeAddCommand(static_cast<NodeGraph*>(b->parent()),
+                         gap,
+                         command);
+
+      new TrackReplaceBlockCommand(original_track,
+                                   b,
+                                   gap,
+                                   command);
+    } else {
+      // Remove the block from the track
+      new TrackRippleRemoveBlockCommand(original_track,
+                                        b,
+                                        command);
+
+      if (previous_is_gap && next_is_gap) {
+        // Clip is surrounded by gaps, merge both together
+
+        // Remove one of the gaps
+        new TrackRippleRemoveBlockCommand(original_track,
+                                          b->next(),
+                                          command);
+
+        // Resize the other to match both
+        new BlockResizeCommand(b->previous(),
+                               b->previous()->length() + b->length() + b->next()->length(),
+                               command);
+      } else {
+        // Resize the surrounding block to take its place
+        Block* gap_to_resize = previous_is_gap ? b->previous() : b->next();
+        new BlockResizeCommand(gap_to_resize,
+                               gap_to_resize->length() + b->length(),
+                               command);
+      }
+    }
+
+    if (remove_from_graph) {
+      QList<Node*> block_and_its_exclusive_deps;
+
+      block_and_its_exclusive_deps.append(b);
+      block_and_its_exclusive_deps.append(b->GetExclusiveDependencies());
+
+      new NodeRemoveCommand(static_cast<NodeGraph*>(b->parent()), block_and_its_exclusive_deps, command);
+    }
+  }
+}
+
 void TimelineWidget::DeleteSelected()
 {
-  QList<TimelineViewBlockItem *> list = GetSelectedBlocks();
+  QList<TimelineViewBlockItem *> selected_list = GetSelectedBlocks();
+  QList<Block*> blocks_to_delete;
+
+  foreach (TimelineViewBlockItem* item, selected_list) {
+    Block* b = item->block();
+
+    blocks_to_delete.append(b);
+  }

  // No-op if nothing is selected
-  if (list.isEmpty()) {
+  if (blocks_to_delete.isEmpty()) {
    return;
  }

+  QUndoCommand* command = new QUndoCommand();

+  DeleteSelectedInternal(blocks_to_delete, true, command);
+
+  olive::undo_stack.pushIfHasChildren(command);
 }

 QList<TimelineViewBlockItem *> TimelineWidget::GetSelectedBlocks()