Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2020-12-19 07:57:27 +0300
committerRichard Antalik <richardantalik@gmail.com>2020-12-19 08:29:15 +0300
commit046ca0749a9389ec52da90b29c8b2032f3225c51 (patch)
tree27ffdc0dc4d986296f3933370c1071ea5c505b94 /source/blender/sequencer/intern/strip_edit.c
parent6942dd9f49003ead61f9a0e52b398ebc74a5e3cb (diff)
Cleanup: Rename BKE_sequencer functions
API functions get SEQ_ prefix. Intern functions get seq_ prefix Functions also have appropriate category included in name.
Diffstat (limited to 'source/blender/sequencer/intern/strip_edit.c')
-rw-r--r--source/blender/sequencer/intern/strip_edit.c41
1 files changed, 21 insertions, 20 deletions
diff --git a/source/blender/sequencer/intern/strip_edit.c b/source/blender/sequencer/intern/strip_edit.c
index a29810cc9ee..11f42c5de9d 100644
--- a/source/blender/sequencer/intern/strip_edit.c
+++ b/source/blender/sequencer/intern/strip_edit.c
@@ -42,7 +42,7 @@
#include "SEQ_sequencer.h"
-int BKE_sequence_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str)
+int SEQ_edit_sequence_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str)
{
char name[sizeof(seq_a->name)];
@@ -65,8 +65,7 @@ int BKE_sequence_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str)
}
if ((seq_a->type & SEQ_TYPE_EFFECT) && (seq_b->type & SEQ_TYPE_EFFECT)) {
- if (BKE_sequence_effect_get_num_inputs(seq_a->type) !=
- BKE_sequence_effect_get_num_inputs(seq_b->type)) {
+ if (SEQ_effect_get_num_inputs(seq_a->type) != SEQ_effect_get_num_inputs(seq_b->type)) {
*error_str = N_("Strips must have the same number of inputs");
return 0;
}
@@ -125,7 +124,7 @@ static void seq_update_muting_recursive(ListBase *seqbasep, Sequence *metaseq, i
}
}
-void BKE_sequencer_update_muting(Editing *ed)
+void SEQ_sound_update_muting(Editing *ed)
{
if (ed) {
/* mute all sounds up to current metastack list */
@@ -167,7 +166,7 @@ static void sequencer_flag_users_for_removal(Scene *scene, ListBase *seqbase, Se
}
/* Flag seq and its users (effects) for removal. */
-void BKE_sequencer_flag_for_removal(Scene *scene, ListBase *seqbase, Sequence *seq)
+void SEQ_edit_flag_for_removal(Scene *scene, ListBase *seqbase, Sequence *seq)
{
if (seq == NULL || (seq->flag & SEQ_FLAG_DELETE) != 0) {
return;
@@ -176,7 +175,7 @@ void BKE_sequencer_flag_for_removal(Scene *scene, ListBase *seqbase, Sequence *s
/* Flag and remove meta children. */
if (seq->type == SEQ_TYPE_META) {
LISTBASE_FOREACH (Sequence *, meta_child, &seq->seqbase) {
- BKE_sequencer_flag_for_removal(scene, &seq->seqbase, meta_child);
+ SEQ_edit_flag_for_removal(scene, &seq->seqbase, meta_child);
}
}
@@ -185,15 +184,15 @@ void BKE_sequencer_flag_for_removal(Scene *scene, ListBase *seqbase, Sequence *s
}
/* Remove all flagged sequences, return true if sequence is removed. */
-void BKE_sequencer_remove_flagged_sequences(Scene *scene, ListBase *seqbase)
+void SEQ_edit_remove_flagged_sequences(Scene *scene, ListBase *seqbase)
{
LISTBASE_FOREACH_MUTABLE (Sequence *, seq, seqbase) {
if (seq->flag & SEQ_FLAG_DELETE) {
if (seq->type == SEQ_TYPE_META) {
- BKE_sequencer_remove_flagged_sequences(scene, &seq->seqbase);
+ SEQ_edit_remove_flagged_sequences(scene, &seq->seqbase);
}
BLI_remlink(seqbase, seq);
- BKE_sequence_free(scene, seq, true);
+ SEQ_sequence_free(scene, seq, true);
}
}
}
@@ -254,7 +253,7 @@ static void seq_split_set_right_offset(Sequence *seq, int timeline_frame)
else if ((seq->start + seq->len) < timeline_frame) {
seq->endstill -= seq->enddisp - timeline_frame;
}
- BKE_sequence_tx_set_final_right(seq, timeline_frame);
+ SEQ_transform_set_right_handle_frame(seq, timeline_frame);
}
static void seq_split_set_left_offset(Sequence *seq, int timeline_frame)
@@ -268,7 +267,7 @@ static void seq_split_set_left_offset(Sequence *seq, int timeline_frame)
seq->start = timeline_frame - seq->len + 1;
seq->endstill = seq->enddisp - timeline_frame - 1;
}
- BKE_sequence_tx_set_final_left(seq, timeline_frame);
+ SEQ_transform_set_left_handle_frame(seq, timeline_frame);
}
/**
@@ -297,12 +296,12 @@ Sequence *SEQ_edit_strip_split(Main *bmain,
/* Precaution, needed because the length saved on-disk may not match the length saved in the
* blend file, or our code may have minor differences reading file length between versions.
* This causes hard-split to fail, see: T47862. */
- BKE_sequence_reload_new_file(bmain, scene, seq, true);
- BKE_sequence_calc(scene, seq);
+ SEQ_add_reload_new_file(bmain, scene, seq, true);
+ SEQ_time_update_sequence(scene, seq);
}
Sequence *left_seq = seq;
- Sequence *right_seq = BKE_sequence_dupli_recursive(
+ Sequence *right_seq = SEQ_sequence_dupli_recursive(
scene, scene, seqbase, seq, SEQ_DUPE_UNIQUE_NAME | SEQ_DUPE_ANIM);
switch (method) {
@@ -313,12 +312,12 @@ Sequence *SEQ_edit_strip_split(Main *bmain,
case SEQ_SPLIT_HARD:
seq_split_set_right_hold_offset(left_seq, timeline_frame);
seq_split_set_left_hold_offset(right_seq, timeline_frame);
- BKE_sequence_reload_new_file(bmain, scene, left_seq, false);
- BKE_sequence_reload_new_file(bmain, scene, right_seq, false);
+ SEQ_add_reload_new_file(bmain, scene, left_seq, false);
+ SEQ_add_reload_new_file(bmain, scene, right_seq, false);
break;
}
- BKE_sequence_calc(scene, left_seq);
- BKE_sequence_calc(scene, right_seq);
+ SEQ_time_update_sequence(scene, left_seq);
+ SEQ_time_update_sequence(scene, right_seq);
return right_seq;
}
@@ -345,12 +344,14 @@ bool SEQ_edit_remove_gaps(Scene *scene,
if (remove_all_gaps) {
while (gap_info.gap_exists) {
- SEQ_offset_after_frame(scene, seqbase, -gap_info.gap_length, gap_info.gap_start_frame);
+ SEQ_transform_offset_after_frame(
+ scene, seqbase, -gap_info.gap_length, gap_info.gap_start_frame);
seq_time_gap_info_get(scene, seqbase, initial_frame, &gap_info);
}
}
else {
- SEQ_offset_after_frame(scene, seqbase, -gap_info.gap_length, gap_info.gap_start_frame);
+ SEQ_transform_offset_after_frame(
+ scene, seqbase, -gap_info.gap_length, gap_info.gap_start_frame);
}
return true;
}