From a311ab6167b2999093d18e9451892a39ac6ae76b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 24 Aug 2021 12:43:15 +1000 Subject: Cleanup: quiet clang-format warnings, unused argument --- source/blender/sequencer/intern/effects.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c index fd686c3a8a0..d4adad9a34d 100644 --- a/source/blender/sequencer/intern/effects.c +++ b/source/blender/sequencer/intern/effects.c @@ -3157,7 +3157,7 @@ void seq_effect_speed_rebuild_map(Scene *scene, Sequence *seq) } } -static void seq_effect_speed_frame_map_ensure(Scene *scene, Sequence *seq, FCurve *fcu) +static void seq_effect_speed_frame_map_ensure(Scene *scene, Sequence *seq) { SpeedControlVars *v = (SpeedControlVars *)seq->effectdata; if (v->frameMap != NULL) { @@ -3184,22 +3184,24 @@ float seq_speed_effect_target_frame_get(Scene *scene, float target_frame = 0.0f; switch (s->speed_control_type) { - case SEQ_SPEED_STRETCH: + case SEQ_SPEED_STRETCH: { const float target_content_length = seq_effect_speed_get_strip_content_length(source); const float target_strip_length = source->enddisp - source->startdisp; const float ratio = target_content_length / target_strip_length; target_frame = frame_index * ratio; break; - case SEQ_SPEED_MULTIPLY: + } + case SEQ_SPEED_MULTIPLY: { FCurve *fcu = seq_effect_speed_speed_factor_curve_get(scene, seq_speed); if (fcu != NULL) { - seq_effect_speed_frame_map_ensure(scene, seq_speed, fcu); + seq_effect_speed_frame_map_ensure(scene, seq_speed); target_frame = s->frameMap[frame_index]; } else { target_frame = frame_index * s->speed_fader; } break; + } case SEQ_SPEED_LENGTH: target_frame = seq_effect_speed_get_strip_content_length(source) * (s->speed_fader_length / 100.0f); -- cgit v1.2.3