[Bf-blender-cvs] [a8274b99a68] temp-vse-retiming-tool: Don't use handle index as argument for `SEQ_retiming_handle_speed_get`

[Richard Antalik]

Commit: a8274b99a68ae39f6d3cb92bbd351585b1e8335f
Author: Richard Antalik
Date:   Thu Oct 20 20:13:30 2022 +0200
Branches: temp-vse-retiming-tool
https://developer.blender.org/rBa8274b99a68ae39f6d3cb92bbd351585b1e8335f

Don't use handle index as argument for `SEQ_retiming_handle_speed_get`

===================================================================

M	source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc
M	source/blender/sequencer/intern/strip_retiming.cc

===================================================================

diff --git a/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc b/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc
index 93a1d826288..61b4a81998f 100644
--- a/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc
+++ b/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc
@@ -385,7 +385,7 @@ static void retime_speed_text_draw(const bContext *C,
     return; /* Label out of strip bounds. */
   }
 
-  const float speed = SEQ_retiming_handle_speed_get(scene, seq, next_handle_index);
+  const float speed = SEQ_retiming_handle_speed_get(scene, seq, next_handle);
 
   char label_str[20];
   const size_t label_len = BLI_snprintf_rlen(
diff --git a/source/blender/sequencer/intern/strip_retiming.cc b/source/blender/sequencer/intern/strip_retiming.cc
index 46be9f61db0..676603b03b4 100644
--- a/source/blender/sequencer/intern/strip_retiming.cc
+++ b/source/blender/sequencer/intern/strip_retiming.cc
@@ -228,14 +228,15 @@ void SEQ_retiming_remove_handle(Sequence *seq, SeqRetimingHandle *handle)
   seq->retiming_handle_count--;
 }
 
-float SEQ_retiming_handle_speed_get(const Scene *scene, const Sequence *seq, const int point_index)
+float SEQ_retiming_handle_speed_get(const Scene *scene,
+                                    const Sequence *seq,
+                                    const SeqRetimingHandle *handle)
 {
-  if (point_index == 0) {
+  if (handle->strip_frame_index == 0) {
     return 1.0f;
   }
 
-  SeqRetimingHandle *handle = seq->retiming_handles + point_index;
-  SeqRetimingHandle *handle_prev = handle - 1;
+  const SeqRetimingHandle *handle_prev = handle - 1;
 
   const int frame_index_max = seq_time_strip_original_content_length_get(scene, seq) - 1;
   const int frame_retimed_prev = round_fl_to_int(handle_prev->retiming_factor * frame_index_max);