archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: remove unused arguments

Browse Source
This commit is contained in:
Campbell Barton
2023-03-04 15:10:39 +11:00
parent d0cfbc23db
commit 7cb3a79246
6 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/versioning_300.cc
View File

@@ -696,7 +696,7 @@ static bool do_versions_sequencer_init_retiming_tool_data(Sequence *seq, void *u
const int content_length = SEQ_time_strip_length_get(scene, seq);
SEQ_retiming_data_ensure(scene, seq);
SEQ_retiming_data_ensure(seq);
SeqRetimingHandle *handle = &seq->retiming_handles[seq->retiming_handle_num - 1];
handle->strip_frame_index = round_fl_to_int(content_length / seq->speed_factor);

8
source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc
View File

@@ -377,7 +377,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);
const float speed = SEQ_retiming_handle_speed_get(seq, next_handle);
char label_str[20];
const size_t label_len = BLI_snprintf_rlen(
@@ -412,7 +412,7 @@ static void gizmo_retime_handle_draw(const bContext *C, wmGizmo *gz)
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
Sequence *seq = active_seq_from_context(C);
SEQ_retiming_data_ensure(CTX_data_scene(C), seq);
SEQ_retiming_data_ensure(seq);
MutableSpan handles = SEQ_retiming_handles_get(seq);
for (const SeqRetimingHandle &handle : handles) {
@@ -439,7 +439,7 @@ static int gizmo_retime_handle_test_select(bContext *C, wmGizmo *gz, const int m
gizmo->mouse_over_seq = nullptr;
Sequence *seq = active_seq_from_context(C);
SEQ_retiming_data_ensure(CTX_data_scene(C), seq);
SEQ_retiming_data_ensure(seq);
const SeqRetimingHandle *handle = mouse_over_handle_get(
scene, seq, UI_view2d_fromcontext(C), mval);
const int handle_index = SEQ_retiming_handle_index_get(seq, handle);
@@ -514,7 +514,7 @@ static int gizmo_retime_remove_test_select(bContext *C, wmGizmo *gz, const int m
Scene *scene = CTX_data_scene(C);
Sequence *seq = active_seq_from_context(C);
SEQ_retiming_data_ensure(CTX_data_scene(C), seq);
SEQ_retiming_data_ensure(seq);
const SeqRetimingHandle *handle = mouse_over_handle_get(
scene, seq, UI_view2d_fromcontext(C), mval);
const int handle_index = SEQ_retiming_handle_index_get(seq, handle);

5
source/blender/sequencer/SEQ_retiming.h
View File

@@ -17,7 +17,7 @@ struct SeqRetimingHandle;
int SEQ_retiming_handles_count(const struct Sequence *seq);
bool SEQ_retiming_is_active(const struct Sequence *seq);
void SEQ_retiming_data_ensure(const struct Scene *scene, struct Sequence *seq);
void SEQ_retiming_data_ensure(struct Sequence *seq);
void SEQ_retiming_data_clear(struct Sequence *seq);
bool SEQ_retiming_is_allowed(const struct Sequence *seq);
@@ -35,8 +35,7 @@ void SEQ_retiming_offset_handle(const struct Scene *scene,
struct Sequence *seq,
struct SeqRetimingHandle *handle,
const int offset);
float SEQ_retiming_handle_speed_get(const struct Scene *scene,
const struct Sequence *seq,
float SEQ_retiming_handle_speed_get(const struct Sequence *seq,
const struct SeqRetimingHandle *handle);
int SEQ_retiming_handle_index_get(const struct Sequence *seq,
const struct SeqRetimingHandle *handle);

14
source/blender/sequencer/intern/strip_retiming.cc
View File

@@ -86,7 +86,7 @@ int SEQ_retiming_handles_count(const Sequence *seq)
return seq->retiming_handle_num;
}
void SEQ_retiming_data_ensure(const Scene *scene, Sequence *seq)
void SEQ_retiming_data_ensure(Sequence *seq)
{
if (!SEQ_retiming_is_allowed(seq)) {
return;
@@ -99,7 +99,7 @@ void SEQ_retiming_data_ensure(const Scene *scene, Sequence *seq)
seq->retiming_handles = (SeqRetimingHandle *)MEM_calloc_arrayN(
2, sizeof(SeqRetimingHandle), __func__);
SeqRetimingHandle *handle = seq->retiming_handles + 1;
handle->strip_frame_index = seq_time_strip_original_content_length_get(scene, seq) - 1;
handle->strip_frame_index = seq_time_strip_original_content_length_get(seq) - 1;
handle->retiming_factor = 1.0f;
seq->retiming_handle_num = 2;
}
@@ -126,7 +126,7 @@ bool SEQ_retiming_is_allowed(const Sequence *seq)
SEQ_TYPE_MASK);
}
float seq_retiming_evaluate(const Scene *scene, const Sequence *seq, const int frame_index)
float seq_retiming_evaluate(const Sequence *seq, const int frame_index)
{
const SeqRetimingHandle *previous_handle = retiming_find_segment_start_handle(seq, frame_index);
const SeqRetimingHandle *next_handle = previous_handle + 1;
@@ -151,7 +151,7 @@ SeqRetimingHandle *SEQ_retiming_add_handle(Scene *scene, Sequence *seq, const in
{
float frame_index = (timeline_frame - SEQ_time_start_frame_get(seq)) *
seq_time_media_playback_rate_factor_get(scene, seq);
float value = seq_retiming_evaluate(scene, seq, frame_index);
float value = seq_retiming_evaluate(seq, frame_index);
const SeqRetimingHandle *closest_handle = retiming_find_segment_start_handle(seq, frame_index);
if (closest_handle->strip_frame_index == frame_index) {
@@ -224,9 +224,7 @@ void SEQ_retiming_remove_handle(Sequence *seq, SeqRetimingHandle *handle)
seq->retiming_handle_num--;
}
float SEQ_retiming_handle_speed_get(const Scene *scene,
const Sequence *seq,
const SeqRetimingHandle *handle)
float SEQ_retiming_handle_speed_get(const Sequence *seq, const SeqRetimingHandle *handle)
{
if (handle->strip_frame_index == 0) {
return 1.0f;
@@ -234,7 +232,7 @@ float SEQ_retiming_handle_speed_get(const Scene *scene,
const SeqRetimingHandle *handle_prev = handle - 1;
const int frame_index_max = seq_time_strip_original_content_length_get(scene, seq) - 1;
const int frame_index_max = seq_time_strip_original_content_length_get(seq) - 1;
const int frame_retimed_prev = round_fl_to_int(handle_prev->retiming_factor * frame_index_max);
const int frame_index_prev = handle_prev->strip_frame_index;
const int frame_retimed = round_fl_to_int(handle->retiming_factor * frame_index_max);

6
source/blender/sequencer/intern/strip_time.c
View File

@@ -53,7 +53,7 @@ float seq_time_media_playback_rate_factor_get(const Scene *scene, const Sequence
return seq->media_playback_rate / scene_playback_rate;
}
int seq_time_strip_original_content_length_get(const Scene *scene, const Sequence *seq)
int seq_time_strip_original_content_length_get(const Sequence *seq)
{
if (seq->type == SEQ_TYPE_SOUND_RAM) {
return seq->len;
@@ -67,7 +67,7 @@ float seq_give_frame_index(const Scene *scene, Sequence *seq, float timeline_fra
float frame_index;
float sta = SEQ_time_start_frame_get(seq);
float end = SEQ_time_content_end_frame_get(scene, seq) - 1;
const float length = seq_time_strip_original_content_length_get(scene, seq);
const float length = seq_time_strip_original_content_length_get(seq);
if (seq->type & SEQ_TYPE_EFFECT) {
end = SEQ_time_right_handle_frame_get(scene, seq);
@@ -93,7 +93,7 @@ float seq_give_frame_index(const Scene *scene, Sequence *seq, float timeline_fra
frame_index *= seq_time_media_playback_rate_factor_get(scene, seq);
if (SEQ_retiming_is_active(seq)) {
const float retiming_factor = seq_retiming_evaluate(scene, seq, frame_index);
const float retiming_factor = seq_retiming_evaluate(seq, frame_index);
frame_index = retiming_factor * (length - 1);
}
/* Clamp frame index to strip content frame range. */

7
source/blender/sequencer/intern/strip_time.h
View File

@@ -43,11 +43,8 @@ void seq_time_update_effects_strip_range(const struct Scene *scene, struct SeqCo
void seq_time_translate_handles(const struct Scene *scene, struct Sequence *seq, const int offset);
float seq_time_media_playback_rate_factor_get(const struct Scene *scene,
const struct Sequence *seq);
int seq_time_strip_original_content_length_get(const struct Scene *scene,
const struct Sequence *seq);
float seq_retiming_evaluate(const struct Scene *scene,
const struct Sequence *seq,
const int frame_index);
int seq_time_strip_original_content_length_get(const struct Sequence *seq);
float seq_retiming_evaluate(const struct Sequence *seq, const int frame_index);
#ifdef __cplusplus
}