[Bf-blender-cvs] [046ca0749a9] master: Cleanup: Rename BKE_sequencer functions
Richard Antalik
noreply at git.blender.org
Sat Dec 19 07:34:32 CET 2020
Commit: 046ca0749a9389ec52da90b29c8b2032f3225c51
Author: Richard Antalik
Date: Sat Dec 19 05:57:27 2020 +0100
Branches: master
https://developer.blender.org/rB046ca0749a9389ec52da90b29c8b2032f3225c51
Cleanup: Rename BKE_sequencer functions
API functions get SEQ_ prefix.
Intern functions get seq_ prefix
Functions also have appropriate category included in name.
===================================================================
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/editors/animation/anim_deps.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/anim_ops.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/outliner_sync.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/tree/tree_display_sequencer.cc
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_modifier.c
M source/blender/editors/space_sequencer/sequencer_proxy.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/transform/transform_convert_sequencer.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/util/ed_util_imbuf.c
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesrna/intern/rna_camera.c
M source/blender/makesrna/intern/rna_color.c
M source/blender/makesrna/intern/rna_movieclip.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_scene_api.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/render/intern/pipeline.c
M source/blender/sequencer/SEQ_sequencer.h
M source/blender/sequencer/intern/clipboard.c
M source/blender/sequencer/intern/effects.c
M source/blender/sequencer/intern/effects.h
M source/blender/sequencer/intern/image_cache.c
M source/blender/sequencer/intern/image_cache.h
M source/blender/sequencer/intern/iterator.c
M source/blender/sequencer/intern/modifier.c
M source/blender/sequencer/intern/prefetch.c
M source/blender/sequencer/intern/prefetch.h
M source/blender/sequencer/intern/proxy.c
M source/blender/sequencer/intern/render.c
M source/blender/sequencer/intern/sequencer.c
M source/blender/sequencer/intern/sound.c
M source/blender/sequencer/intern/strip_add.c
M source/blender/sequencer/intern/strip_edit.c
M source/blender/sequencer/intern/strip_relations.c
M source/blender/sequencer/intern/strip_select.c
M source/blender/sequencer/intern/strip_time.c
M source/blender/sequencer/intern/strip_transform.c
M source/blender/sequencer/intern/utils.c
M source/blender/sequencer/intern/utils.h
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_jobs.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index d1c6b552d2e..090ab571542 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2057,7 +2057,7 @@ static void stampdata(
}
if (use_dynamic && scene->r.stamp & R_STAMP_SEQSTRIP) {
- const Sequence *seq = BKE_sequencer_foreground_frame_get(scene, scene->r.cfra);
+ const Sequence *seq = SEQ_get_topmost_sequence(scene, scene->r.cfra);
if (seq) {
STRNCPY(text, seq->name + 2);
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index cc192c1c3c0..7acd54b6af1 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -340,7 +340,7 @@ static void scene_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const int
if (scene_src->ed) {
scene_dst->ed = MEM_callocN(sizeof(*scene_dst->ed), __func__);
scene_dst->ed->seqbasep = &scene_dst->ed->seqbase;
- BKE_sequence_base_dupli_recursive(scene_src,
+ SEQ_sequence_base_dupli_recursive(scene_src,
scene_dst,
&scene_dst->ed->seqbase,
&scene_src->ed->seqbase,
@@ -375,7 +375,7 @@ static void scene_free_data(ID *id)
Scene *scene = (Scene *)id;
const bool do_id_user = false;
- BKE_sequencer_editing_free(scene, do_id_user);
+ SEQ_editing_free(scene, do_id_user);
BKE_keyingsets_free(&scene->keyingsets);
@@ -948,7 +948,7 @@ static void scene_blend_write(BlendWriter *writer, ID *id, const void *id_addres
IDP_BlendWrite(writer, seq->prop);
}
- BKE_sequence_modifier_blend_write(writer, &seq->modifiers);
+ SEQ_modifier_blend_write(writer, &seq->modifiers);
}
SEQ_ALL_END;
@@ -1145,7 +1145,7 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id)
Sequence *seq;
SEQ_ALL_BEGIN (ed, seq) {
/* Do as early as possible, so that other parts of reading can rely on valid session UUID. */
- BKE_sequence_session_uuid_generate(seq);
+ SEQ_relations_session_uuid_generate(seq);
BLO_read_data_address(reader, &seq->seq1);
BLO_read_data_address(reader, &seq->seq2);
@@ -1204,7 +1204,7 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id)
BLO_read_data_address(reader, &seq->strip->color_balance);
}
- BKE_sequence_modifier_blend_read_data(reader, &seq->modifiers);
+ SEQ_modifier_blend_read_data(reader, &seq->modifiers);
}
SEQ_ALL_END;
@@ -1493,7 +1493,7 @@ static void scene_blend_read_lib(BlendLibReader *reader, ID *id)
}
BLI_listbase_clear(&seq->anims);
- BKE_sequence_modifier_blend_read_lib(reader, sce, &seq->modifiers);
+ SEQ_modifier_blend_read_lib(reader, sce, &seq->modifiers);
}
SEQ_ALL_END;
@@ -2013,7 +2013,7 @@ Scene *BKE_scene_duplicate(Main *bmain, Scene *sce, eSceneCopyMethod type)
/* Remove sequencer if not full copy */
/* XXX Why in Hell? :/ */
remove_sequencer_fcurves(sce_copy);
- BKE_sequencer_editing_free(sce_copy, true);
+ SEQ_editing_free(sce_copy, true);
}
return sce_copy;
@@ -3733,6 +3733,6 @@ void BKE_scene_eval_sequencer_sequences(Depsgraph *depsgraph, Scene *scene)
}
}
SEQ_ALL_END;
- BKE_sequencer_update_muting(scene->ed);
- BKE_sequencer_update_sound_bounds_all(scene);
+ SEQ_sound_update_muting(scene->ed);
+ SEQ_sound_update_bounds_all(scene);
}
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 5bcc1a9553a..d167fc4e51f 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -683,7 +683,7 @@ void BKE_sound_update_fps(Main *bmain, Scene *scene)
AUD_Sequence_setFPS(scene->sound_scene, FPS);
}
- BKE_sequencer_refresh_sound_length(bmain, scene);
+ SEQ_sound_update_length(bmain, scene);
}
void BKE_sound_update_scene_listener(Scene *scene)
@@ -825,7 +825,7 @@ void BKE_sound_update_sequencer(Main *main, bSound *sound)
Scene *scene;
for (scene = main->scenes.first; scene; scene = scene->id.next) {
- BKE_sequencer_update_sound(scene, sound);
+ SEQ_sound_update(scene, sound);
}
}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index bccc7150523..73606db9a41 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2603,7 +2603,7 @@ static int lib_link_seq_clipboard_cb(Sequence *seq, void *arg_pt)
static void lib_link_clipboard_restore(struct IDNameLib_Map *id_map)
{
/* update IDs stored in sequencer clipboard */
- BKE_sequencer_base_recursive_apply(&seqbase_clipboard, lib_link_seq_clipboard_cb, id_map);
+ SEQ_iterator_seqbase_recursive_apply(&seqbase_clipboard, lib_link_seq_clipboard_cb, id_map);
}
static int lib_link_main_data_restore_cb(LibraryIDLinkCallbackData *cb_data)
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c
index c336239ec59..86085ddbc73 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -1499,7 +1499,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
SequenceModifierData *smd;
ColorBalanceModifierData *cbmd;
- smd = BKE_sequence_modifier_new(seq, NULL, seqModifierType_ColorBalance);
+ smd = SEQ_modifier_new(seq, NULL, seqModifierType_ColorBalance);
cbmd = (ColorBalanceModifierData *)smd;
cbmd->color_balance = *strip->color_balance;
@@ -1813,7 +1813,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
seq->alpha_mode = SEQ_ALPHA_STRAIGHT;
}
else {
- BKE_sequence_alpha_mode_from_extension(seq);
+ SEQ_alpha_mode_from_file_extension(seq);
}
}
SEQ_ALL_END;
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 046749e4691..ee5efff7216 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1224,7 +1224,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (seq->effectdata == NULL) {
- struct SeqEffectHandle effect_handle = BKE_sequence_get_effect(seq);
+ struct SeqEffectHandle effect_handle = SEQ_effect_handle_get(seq);
effect_handle.init(seq);
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index c2bedc54690..f7ef7f74a42 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -963,7 +963,7 @@ static void do_version_curvemapping_walker(Main *bmain, void (*callback)(CurveMa
if (scene->ed != NULL) {
LISTBASE_FOREACH (Sequence *, seq, &scene->ed->seqbase) {
LISTBASE_FOREACH (SequenceModifierData *, smd, &seq->modifiers) {
- const SequenceModifierTypeInfo *smti = BKE_sequence_modifier_type_info_get(smd->type);
+ const SequenceModifierTypeInfo *smti = SEQ_modifier_type_info_get(smd->type);
if (smti) {
if (smd->type == seqModifierType_Curves) {
@@ -1783,7 +1783,7 @@ void do_versions_after_linking_280(Main *bmain, ReportList *UNUSED(reports))
static void do_versions_seq_unique_name_all_strips(Scene *sce, ListBase *seqbasep)
{
for (Sequence *seq = seqbasep->first; seq != NULL; seq = seq->next) {
- BKE_sequence_base_unique_name_recursive(&sce->ed->seqbase, seq);
+ SEQ_sequence_base_unique_name_recursive(&sce->ed->seqbase, seq);
if (seq->seqbase.first != NULL) {
do_versions_seq_unique_name_all_strips(sce, &seq->seqbase);
}
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index cff7292abd4..5119de1ed9e 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -322,7 +322,7 @@ bool scene_copy_inplace_no_main(const Scene *scene, Scene *new_scene)
const ID *id_for_copy = &scene->id;
if (G.debug & G_DEBUG_DEPSGRAPH_UUID) {
- BKE_sequencer_check_uuids_unique_and_report(scene);
+ SEQ_relations_check_uuids_unique_and_report(scene);
}
#ifdef NESTED_ID_NASTY_WORKAROUND
diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c
index 32ce78e405e..fbd55592729 100644
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@ -212,7 +212,7 @@ static void animchan_sync_fcurve_scene(bAnimListElem *ale)
return;
}
- Editing *ed = BKE_sequencer_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene, false);
/* get strip name, and check if this strip is selected */
char *seq_name = BLI_str_quoted_substrN(fcu->rna_path, "sequences_all[");
@@ -220,7 +220,7 @@ static void animchan_sync_fcurve_scene(bAnimListElem *ale)
return;
}
- Sequence *seq = BKE_sequence_get_by_name(ed->seqbasep, seq_name, false);
+ Sequence *seq = SEQ_get_sequence_by_name(ed->seqbasep, seq_name, false);
MEM_freeN(seq_name);
if (seq == NULL) {
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index f4a487140ff..83665d7a053 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -225,7 +225,7 @@ static bool actedit_get_context(bAnimContext *ac, SpaceAction *saction)
{
/* TODO, other methods to get the mask */
#if 0
- Sequence *seq = BKE_sequencer_active_get(ac->scene);
+ Sequence *seq = SEQ_select_active_get(ac->scene);
MovieClip *clip = ac->scene->clip;
struct Mask *mask = seq ? seq->mask : NULL;
#endif
@@ -1103,14 +1103,14 @@ sta
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list