From 54ce344bc7cc9a0e1c34b328081cb90e41aca7b9 Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Sun, 6 Jun 2021 03:03:01 +0200 Subject: VSE: Remove seq->tmp usage from transform code This field was used for extend feature to get handle position of metastrip children. Since D9972 extend feature works only on meta strip itself, not it's children. So `SEQ_transform_get_left_handle_frame()` second argument is always false and can be removed. Another instance of `seq->tmp usage` is hack to distinguish strips to be shuffled, which is not covered by this patch. Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D10321 --- source/blender/sequencer/SEQ_transform.h | 4 +-- source/blender/sequencer/intern/strip_transform.c | 40 +++++++---------------- 2 files changed, 13 insertions(+), 31 deletions(-) (limited to 'source/blender/sequencer') diff --git a/source/blender/sequencer/SEQ_transform.h b/source/blender/sequencer/SEQ_transform.h index d448fbdb43e..d587bd0f1a1 100644 --- a/source/blender/sequencer/SEQ_transform.h +++ b/source/blender/sequencer/SEQ_transform.h @@ -31,8 +31,8 @@ struct ListBase; struct Scene; struct Sequence; -int SEQ_transform_get_left_handle_frame(struct Sequence *seq, bool metaclip); -int SEQ_transform_get_right_handle_frame(struct Sequence *seq, bool metaclip); +int SEQ_transform_get_left_handle_frame(struct Sequence *seq); +int SEQ_transform_get_right_handle_frame(struct Sequence *seq); void SEQ_transform_set_left_handle_frame(struct Sequence *seq, int val); void SEQ_transform_set_right_handle_frame(struct Sequence *seq, int val); void SEQ_transform_handle_xlimits(struct Sequence *seq, int leftflag, int rightflag); diff --git a/source/blender/sequencer/intern/strip_transform.c b/source/blender/sequencer/intern/strip_transform.c index 3a0ba36b795..a02d8a1428e 100644 --- a/source/blender/sequencer/intern/strip_transform.c +++ b/source/blender/sequencer/intern/strip_transform.c @@ -48,24 +48,12 @@ static int seq_tx_get_end(Sequence *seq) return seq->start + seq->len; } -int SEQ_transform_get_left_handle_frame(Sequence *seq, bool metaclip) +int SEQ_transform_get_left_handle_frame(Sequence *seq) { - if (metaclip && seq->tmp) { - /* return the range clipped by the parents range */ - return max_ii(SEQ_transform_get_left_handle_frame(seq, false), - SEQ_transform_get_left_handle_frame((Sequence *)seq->tmp, true)); - } - return (seq->start - seq->startstill) + seq->startofs; } -int SEQ_transform_get_right_handle_frame(Sequence *seq, bool metaclip) +int SEQ_transform_get_right_handle_frame(Sequence *seq) { - if (metaclip && seq->tmp) { - /* return the range clipped by the parents range */ - return min_ii(SEQ_transform_get_right_handle_frame(seq, false), - SEQ_transform_get_right_handle_frame((Sequence *)seq->tmp, true)); - } - return ((seq->start + seq->len) + seq->endstill) - seq->endofs; } @@ -151,14 +139,12 @@ bool SEQ_transform_seqbase_isolated_sel_check(ListBase *seqbase) void SEQ_transform_handle_xlimits(Sequence *seq, int leftflag, int rightflag) { if (leftflag) { - if (SEQ_transform_get_left_handle_frame(seq, false) >= - SEQ_transform_get_right_handle_frame(seq, false)) { - SEQ_transform_set_left_handle_frame(seq, - SEQ_transform_get_right_handle_frame(seq, false) - 1); + if (SEQ_transform_get_left_handle_frame(seq) >= SEQ_transform_get_right_handle_frame(seq)) { + SEQ_transform_set_left_handle_frame(seq, SEQ_transform_get_right_handle_frame(seq) - 1); } if (SEQ_transform_single_image_check(seq) == 0) { - if (SEQ_transform_get_left_handle_frame(seq, false) >= seq_tx_get_end(seq)) { + if (SEQ_transform_get_left_handle_frame(seq) >= seq_tx_get_end(seq)) { SEQ_transform_set_left_handle_frame(seq, seq_tx_get_end(seq) - 1); } @@ -175,14 +161,12 @@ void SEQ_transform_handle_xlimits(Sequence *seq, int leftflag, int rightflag) } if (rightflag) { - if (SEQ_transform_get_right_handle_frame(seq, false) <= - SEQ_transform_get_left_handle_frame(seq, false)) { - SEQ_transform_set_right_handle_frame(seq, - SEQ_transform_get_left_handle_frame(seq, false) + 1); + if (SEQ_transform_get_right_handle_frame(seq) <= SEQ_transform_get_left_handle_frame(seq)) { + SEQ_transform_set_right_handle_frame(seq, SEQ_transform_get_left_handle_frame(seq) + 1); } if (SEQ_transform_single_image_check(seq) == 0) { - if (SEQ_transform_get_right_handle_frame(seq, false) <= seq_tx_get_start(seq)) { + if (SEQ_transform_get_right_handle_frame(seq) <= seq_tx_get_start(seq)) { SEQ_transform_set_right_handle_frame(seq, seq_tx_get_start(seq) + 1); } } @@ -204,14 +188,12 @@ void SEQ_transform_fix_single_image_seq_offsets(Sequence *seq) /* make sure the image is always at the start since there is only one, * adjusting its start should be ok */ - left = SEQ_transform_get_left_handle_frame(seq, false); + left = SEQ_transform_get_left_handle_frame(seq); start = seq->start; if (start != left) { offset = left - start; - SEQ_transform_set_left_handle_frame(seq, - SEQ_transform_get_left_handle_frame(seq, false) - offset); - SEQ_transform_set_right_handle_frame( - seq, SEQ_transform_get_right_handle_frame(seq, false) - offset); + SEQ_transform_set_left_handle_frame(seq, SEQ_transform_get_left_handle_frame(seq) - offset); + SEQ_transform_set_right_handle_frame(seq, SEQ_transform_get_right_handle_frame(seq) - offset); seq->start += offset; } } -- cgit v1.2.3