VSE: Move remove gaps operator logic to module code

Logic was broken into finding gaps and ofsetting strips.
Functions were modified so they work on explicitly defined seqbase,
so they can be used as python API functions.

Functional changes:
 - Improve performance by calculating gap length and offseting strips
   at once. Previously strips were offset by one frame.
 - Calculate gap from start frame. Previously gap was considered only
   inbetween strips.

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D9730

4 files changed, 14 insertions, 113 deletions

diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 081714991ff..e31fa3205ba 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -2292,7 +2292,7 @@ void draw_timeline_seq(const bContext *C, ARegion *region)
 
   UI_view2d_view_ortho(v2d);
   /* Get timeline bound-box, needed for the scroll-bars. */
-  boundbox_seq(scene, &v2d->tot);
+  SEQ_timeline_boundbox(scene, ed->seqbasep, &v2d->tot);
   draw_seq_backdrop(v2d);
   UI_view2d_constant_grid_draw(v2d, FPS);
 
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 953a77d22a6..184f821d411 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -183,117 +183,13 @@ bool sequencer_view_strips_poll(bContext *C)
 /** \name Remove Gaps Operator
  * \{ */
 
-static bool sequence_offset_after_frame(Scene *scene, const int delta, const int timeline_frame)
-{
-  Sequence *seq;
-  Editing *ed = BKE_sequencer_editing_get(scene, false);
-  bool done = false;
-  TimeMarker *marker;
-
-  /* All strips >= timeline_frame are shifted. */
-
-  if (ed == NULL) {
-    return 0;
-  }
-
-  for (seq = ed->seqbasep->first; seq; seq = seq->next) {
-    if (seq->startdisp >= timeline_frame) {
-      BKE_sequence_translate(scene, seq, delta);
-      BKE_sequence_calc(scene, seq);
-      BKE_sequence_invalidate_cache_preprocessed(scene, seq);
-      done = true;
-    }
-  }
-
-  if (!scene->toolsettings->lock_markers) {
-    for (marker = scene->markers.first; marker; marker = marker->next) {
-      if (marker->frame >= timeline_frame) {
-        marker->frame += delta;
-      }
-    }
-  }
-
-  return done;
-}
-
-void boundbox_seq(Scene *scene, rctf *rect)
-{
-  Sequence *seq;
-  Editing *ed = BKE_sequencer_editing_get(scene, false);
-  float min[2], max[2];
-
-  if (ed == NULL) {
-    return;
-  }
-
-  min[0] = SFRA;
-  max[0] = EFRA + 1;
-  min[1] = 0.0;
-  max[1] = 8.0;
-
-  seq = ed->seqbasep->first;
-  while (seq) {
-
-    if (min[0] > seq->startdisp - 1) {
-      min[0] = seq->startdisp - 1;
-    }
-    if (max[0] < seq->enddisp + 1) {
-      max[0] = seq->enddisp + 1;
-    }
-    if (max[1] < seq->machine + 2) {
-      max[1] = seq->machine + 2;
-    }
-
-    seq = seq->next;
-  }
-
-  rect->xmin = min[0];
-  rect->xmax = max[0];
-  rect->ymin = min[1];
-  rect->ymax = max[1];
-}
-
 static int sequencer_gap_remove_exec(bContext *C, wmOperator *op)
 {
   Scene *scene = CTX_data_scene(C);
-  rctf rectf;
-  int timeline_frame, efra, sfra;
-  bool first = false, done;
-  bool do_all = RNA_boolean_get(op->ptr, "all");
-
-  /* Get first and last frame. */
-  boundbox_seq(scene, &rectf);
-  sfra = (int)rectf.xmin;
-  efra = (int)rectf.xmax;
-
-  /* Check if the current frame has a gap already. */
-  for (timeline_frame = CFRA; timeline_frame >= sfra; timeline_frame--) {
-    if (SEQ_render_evaluate_frame(scene, timeline_frame)) {
-      first = true;
-      break;
-    }
-  }
+  const bool do_all = RNA_boolean_get(op->ptr, "all");
+  const Editing *ed = BKE_sequencer_editing_get(scene, false);
 
-  for (; timeline_frame < efra; timeline_frame++) {
-    /* There's still no strip to remove a gap for. */
-    if (first == false) {
-      if (SEQ_render_evaluate_frame(scene, timeline_frame)) {
-        first = true;
-      }
-    }
-    else if (SEQ_render_evaluate_frame(scene, timeline_frame) == 0) {
-      done = true;
-      while (SEQ_render_evaluate_frame(scene, timeline_frame) == 0) {
-        done = sequence_offset_after_frame(scene, -1, timeline_frame);
-        if (done == false) {
-          break;
-        }
-      }
-      if (done == false || do_all == false) {
-        break;
-      }
-    }
-  }
+  SEQ_edit_remove_gaps(scene, ed->seqbasep, CFRA, do_all);
 
   WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
   DEG_id_tag_update(&scene->id, ID_RECALC_SEQUENCER_STRIPS);
@@ -330,9 +226,9 @@ void SEQUENCER_OT_gap_remove(struct wmOperatorType *ot)
 static int sequencer_gap_insert_exec(bContext *C, wmOperator *op)
 {
   Scene *scene = CTX_data_scene(C);
-  int frames = RNA_int_get(op->ptr, "frames");
-
-  sequence_offset_after_frame(scene, frames, CFRA);
+  const int frames = RNA_int_get(op->ptr, "frames");
+  const Editing *ed = BKE_sequencer_editing_get(scene, false);
+  SEQ_offset_after_frame(scene, ed->seqbasep, frames, CFRA);
 
   WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
 
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index 1ea4fb05d53..6ccfd3a9045 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -71,7 +71,6 @@ struct ImBuf *sequencer_ibuf_get(struct Main *bmain,
 /* sequencer_edit.c */
 struct View2D;
 void seq_rectf(struct Sequence *seq, struct rctf *rectf);
-void boundbox_seq(struct Scene *scene, struct rctf *rect);
 struct Sequence *find_nearest_seq(struct Scene *scene,
                                   struct View2D *v2d,
                                   int *hand,
diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c
index 75d92d5f00d..d2166705943 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.c
+++ b/source/blender/editors/space_sequencer/sequencer_view.c
@@ -87,8 +87,14 @@ static int sequencer_view_all_exec(bContext *C, wmOperator *op)
   rctf box;
 
   const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
+  Scene *scene = CTX_data_scene(C);
+  const Editing *ed = BKE_sequencer_editing_get(scene, false);
+
+  if (ed == NULL) {
+    return OPERATOR_FINISHED;
+  }
 
-  boundbox_seq(CTX_data_scene(C), &box);
+  SEQ_timeline_boundbox(scene, ed->seqbasep, &box);
   UI_view2d_smooth_view(C, region, &box, smooth_viewtx);
   return OPERATOR_FINISHED;
 }