Commit: 638abcbe98c5758b640319c64a337c64916e4279
Author: Richard Antalik
Date: Fri Nov 4 19:47:36 2022 +0100
Branches: temp-vse-retiming-tool
https://developer.blender.org/rB638abcbe98c5758b640319c64a337c64916e4279
Fix format in audaspace
===================================================================
M extern/audaspace/include/sequence/AnimateableProperty.h
M extern/audaspace/include/sequence/SequenceEntry.h
M extern/audaspace/src/sequence/AnimateableProperty.cpp
M extern/audaspace/src/sequence/SequenceHandle.cpp
===================================================================
diff --git a/extern/audaspace/include/sequence/AnimateableProperty.h
b/extern/audaspace/include/sequence/AnimateableProperty.h
index 76cb5ecd3f9..f04c64f7941 100644
--- a/extern/audaspace/include/sequence/AnimateableProperty.h
+++ b/extern/audaspace/include/sequence/AnimateableProperty.h
@@ -118,7 +118,7 @@ public:
* \param position The start position in the animation in frames.
* \param position The end position in the animation in frames.
*/
- void write_range(const float* data, int position_start, int position_end);
+ void write_range(const float* data, int position_start, int
position_end);
/**
* Reads the properties value.
diff --git a/extern/audaspace/include/sequence/SequenceEntry.h
b/extern/audaspace/include/sequence/SequenceEntry.h
index 2495d08137c..fc4cbc54924 100644
--- a/extern/audaspace/include/sequence/SequenceEntry.h
+++ b/extern/audaspace/include/sequence/SequenceEntry.h
@@ -63,8 +63,8 @@ private:
/// How many seconds are skipped at the beginning.
double m_skip;
- /// The FPS of the scene.
- float m_fps;
+ /// The FPS of the scene.
+ float m_fps;
/// Whether the entry is muted.
bool m_muted;
diff --git a/extern/audaspace/src/sequence/AnimateableProperty.cpp
b/extern/audaspace/src/sequence/AnimateableProperty.cpp
index 7969947c8bf..633fca14cc7 100644
--- a/extern/audaspace/src/sequence/AnimateableProperty.cpp
+++ b/extern/audaspace/src/sequence/AnimateableProperty.cpp
@@ -65,11 +65,13 @@ void AnimateableProperty::write(const float* data)
std::memcpy(getBuffer(), data, m_count * sizeof(float));
}
-void AnimateableProperty::write_range(const float* data, int position_start,
int position_end){
+void AnimateableProperty::write_range(const float* data, int position_start,
int position_end)
+{
assureSize(position_end * m_count * sizeof(float), true);
float* buf = getBuffer();
- for (int i = position_start; i < position_end; i++){
+ for(int i = position_start; i < position_end; i++)
+ {
std::memcpy(buf + i * m_count, data, m_count * sizeof(float));
}
m_isAnimated = true;
diff --git a/extern/audaspace/src/sequence/SequenceHandle.cpp
b/extern/audaspace/src/sequence/SequenceHandle.cpp
index bb739d812de..817fc45badf 100644
--- a/extern/audaspace/src/sequence/SequenceHandle.cpp
+++ b/extern/audaspace/src/sequence/SequenceHandle.cpp
@@ -246,20 +246,24 @@ bool SequenceHandle::seek(double position)
seek_frame = 0;
seek_frame += m_entry->m_skip * m_entry->m_fps;
- AnimateableProperty *pitch_property =
m_entry->getAnimProperty(AP_PITCH);
-
+ AnimateableProperty* pitch_property =
m_entry->getAnimProperty(AP_PITCH);
+
float target_frame = 0;
- if (pitch_property != nullptr){
- for (int i = 0; i < seek_frame; i++){
+ if(pitch_property != nullptr)
+ {
+ for(int i = 0; i < seek_frame; i++)
+ {
float pitch;
pitch_property->read(i, &pitch);
target_frame += pitch;
}
- } else {
+ }
+ else
+ {
target_frame = seek_frame;
}
- double seekpos = target_frame / m_entry->m_fps;
+ double seekpos = target_frame / m_entry->m_fps;
m_handle->setPitch(1.0f);
m_handle->seek(seekpos);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
