diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-12-19 07:57:27 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-12-19 08:29:15 +0300 |
commit | 046ca0749a9389ec52da90b29c8b2032f3225c51 (patch) | |
tree | 27ffdc0dc4d986296f3933370c1071ea5c505b94 /source/blender/blenkernel/intern | |
parent | 6942dd9f49003ead61f9a0e52b398ebc74a5e3cb (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/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sound.c | 4 |
3 files changed, 12 insertions, 12 deletions
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); } } |