[Bf-blender-cvs] [6ff11ce2006] temp-vse-retiming-tool: Fix format, fix smaller issues

[Richard Antalik]

Commit: 6ff11ce200630d38bfeabe5238d2aef0713cf5c3
Author: Richard Antalik
Date:   Fri Nov 4 19:22:38 2022 +0100
Branches: temp-vse-retiming-tool
https://developer.blender.org/rB6ff11ce200630d38bfeabe5238d2aef0713cf5c3

Fix format, fix smaller issues

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

M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/sequencer/SEQ_time.h
M	source/blender/sequencer/intern/sequencer.c
M	source/blender/sequencer/intern/strip_retiming.cc

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

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 9a4b42eb052..fde8fcf651c 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -33,7 +33,6 @@
 #include "BKE_idtype.h"
 #include "BKE_paint.h"
 #include "BKE_volume.h"
-#include "BKE_sound.h"
 
 #include "ED_gpencil.h"
 #include "ED_object.h"
@@ -889,10 +888,9 @@ static void rna_Scene_camera_update(Main *bmain, Scene *UNUSED(scene_unused), Po
   DEG_relations_tag_update(bmain);
 }
 
-static void rna_Scene_fps_update(Main *bmain, Scene *active_scene, PointerRNA *ptr)
+static void rna_Scene_fps_update(Main *bmain, Scene *UNUSED(active_scene), PointerRNA *ptr)
 {
   Scene *scene = (Scene *)ptr->owner_id;
-  BKE_sound_update_fps(bmain, active_scene);
   DEG_id_tag_update(&scene->id, ID_RECALC_AUDIO_FPS | ID_RECALC_SEQUENCER_STRIPS);
   /* NOTE: Tag via dependency graph will take care of all the updates ion the evaluated domain,
    * however, changes in FPS actually modifies an original skip length,
diff --git a/source/blender/sequencer/SEQ_time.h b/source/blender/sequencer/SEQ_time.h
index 31c645518d7..b70a9f57d64 100644
--- a/source/blender/sequencer/SEQ_time.h
+++ b/source/blender/sequencer/SEQ_time.h
@@ -157,9 +157,10 @@ void SEQ_retiming_offset_handle(const struct Scene *scene,
 float SEQ_retiming_handle_speed_get(const struct Scene *scene,
                                     const struct Sequence *seq,
                                     const struct SeqRetimingHandle *handle);
-int SEQ_retiming_handle_index_get(const struct Sequence *seq, const struct SeqRetimingHandle *handle);
+int SEQ_retiming_handle_index_get(const struct Sequence *seq,
+                                  const struct SeqRetimingHandle *handle);
 
-void SEQ_retiming_sound_animation_data_set(const struct Scene *scene,const struct Sequence *seq);
+void SEQ_retiming_sound_animation_data_set(const struct Scene *scene, const struct Sequence *seq);
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c
index f7281b67e5f..d263c2e0437 100644
--- a/source/blender/sequencer/intern/sequencer.c
+++ b/source/blender/sequencer/intern/sequencer.c
@@ -990,7 +990,7 @@ static bool seq_update_seq_cb(Sequence *seq, void *user_data)
     BKE_sound_set_scene_sound_volume(
         seq->scene_sound, seq->volume, (seq->flag & SEQ_AUDIO_VOLUME_ANIMATED) != 0);
     SEQ_retiming_sound_animation_data_set(scene, seq);
-     BKE_sound_set_scene_sound_pan(
+    BKE_sound_set_scene_sound_pan(
         seq->scene_sound, seq->pan, (seq->flag & SEQ_AUDIO_PAN_ANIMATED) != 0);
   }
   return true;
diff --git a/source/blender/sequencer/intern/strip_retiming.cc b/source/blender/sequencer/intern/strip_retiming.cc
index 69c233b16d1..d7262efc46c 100644
--- a/source/blender/sequencer/intern/strip_retiming.cc
+++ b/source/blender/sequencer/intern/strip_retiming.cc
@@ -39,7 +39,6 @@
 #include "strip_time.h"
 #include "utils.h"
 
-
 using blender::MutableSpan;
 
 MutableSpan<SeqRetimingHandle> SEQ_retiming_handles_get(const Sequence *seq)
@@ -256,7 +255,7 @@ using std::vector;
 
 class RetimingRange {
  public:
-  int start, end ;
+  int start, end;
   float speed;
 
   enum eIntersectType {
@@ -267,11 +266,12 @@ class RetimingRange {
     NONE,
   };
 
-  RetimingRange(int start_frame, int end_frame, float speed): start(start_frame), end(end_frame), speed(speed)
+  RetimingRange(int start_frame, int end_frame, float speed)
+      : start(start_frame), end(end_frame), speed(speed)
   {
   }
 
-  const eIntersectType intersect_type(const RetimingRange& other) const 
+  const eIntersectType intersect_type(const RetimingRange &other) const
   {
     if (other.start <= start && other.end >= end) {
       return FULL;
@@ -279,10 +279,10 @@ class RetimingRange {
     if (other.start > start && other.start < end && other.end > start && other.end < end) {
       return INSIDE;
     }
-    if (other.start > start && other.start < end){
+    if (other.start > start && other.start < end) {
       return PARTIAL_END;
     }
-    if (other.end > start && other.end < end){
+    if (other.end > start && other.end < end) {
       return PARTIAL_START;
     }
     return NONE;
@@ -309,11 +309,11 @@ class RetimingRangeData {
     }
   }
 
-  RetimingRangeData& operator*=(const RetimingRangeData rhs)
+  RetimingRangeData &operator*=(const RetimingRangeData rhs)
   {
     for (int i = 0; i < ranges.size(); i++) {
-      RetimingRange& range = ranges[i];
-      for (const RetimingRange& rhs_range : rhs.ranges) {
+      RetimingRange &range = ranges[i];
+      for (const RetimingRange &rhs_range : rhs.ranges) {
         if (range.intersect_type(rhs_range) == range.NONE) {
           continue;
         }
@@ -363,9 +363,6 @@ static RetimingRangeData seq_retiming_range_data_get(const Scene *scene, const S
 #include <BKE_sound.h>
 void SEQ_retiming_sound_animation_data_set(const Scene *scene, const Sequence *seq)
 {
-  //XXX hack to reset data
-  BKE_sound_set_scene_sound_pitch(seq->scene_sound, 1, 0);
-
   RetimingRangeData retiming_data = seq_retiming_range_data_get(scene, seq);
   for (const RetimingRange &range : retiming_data.ranges) {
     BKE_sound_set_scene_sound_pitch_constant_range(