[Bf-blender-cvs] [a5a302bd180] master: Cleanup: Split SEQ_sequencer.h file
Richard Antalik
noreply at git.blender.org
Sat Dec 19 07:34:32 CET 2020
Commit: a5a302bd18061e833c4d629fffd06f57e7447d39
Author: Richard Antalik
Date: Sat Dec 19 06:44:57 2020 +0100
Branches: master
https://developer.blender.org/rBa5a302bd18061e833c4d629fffd06f57e7447d39
Cleanup: Split SEQ_sequencer.h file
===================================================================
M source/blender/blenkernel/intern/bpath.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/ipo.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_250.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/blenloader/intern/versioning_290.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.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/render/render_opengl.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_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/imbuf/intern/colormanagement.c
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_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/CMakeLists.txt
A source/blender/sequencer/SEQ_add.h
A source/blender/sequencer/SEQ_clipboard.h
A source/blender/sequencer/SEQ_edit.h
A source/blender/sequencer/SEQ_effects.h
A source/blender/sequencer/SEQ_iterator.h
A source/blender/sequencer/SEQ_modifier.h
A source/blender/sequencer/SEQ_prefetch.h
A source/blender/sequencer/SEQ_proxy.h
A source/blender/sequencer/SEQ_relations.h
A source/blender/sequencer/SEQ_render.h
A source/blender/sequencer/SEQ_select.h
M source/blender/sequencer/SEQ_sequencer.h
A source/blender/sequencer/SEQ_sound.h
A source/blender/sequencer/SEQ_time.h
A source/blender/sequencer/SEQ_transform.h
A source/blender/sequencer/SEQ_util.h
A source/blender/sequencer/SEQ_utils.h
M source/blender/sequencer/intern/clipboard.c
M source/blender/sequencer/intern/effects.c
M source/blender/sequencer/intern/image_cache.c
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/proxy.c
M source/blender/sequencer/intern/render.c
M source/blender/sequencer/intern/render.h
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/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_jobs.c
===================================================================
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c
index f624d0ae057..762ced7dc5f 100644
--- a/source/blender/blenkernel/intern/bpath.c
+++ b/source/blender/blenkernel/intern/bpath.c
@@ -78,7 +78,7 @@
#include "CLG_log.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
#ifndef _MSC_VER
# include "BLI_strict_flags.h"
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 090ab571542..ab57d14d2cf 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -93,7 +93,7 @@
#include "RE_pipeline.h"
-#include "SEQ_sequencer.h" /* seq_foreground_frame_get() */
+#include "SEQ_utils.h" /* SEQ_get_topmost_sequence() */
#include "GPU_texture.h"
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 0e611b21304..1ab6e61e20e 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -74,7 +74,7 @@
#include "MEM_guardedalloc.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
#include "BLO_read_write.h"
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 7acd54b6af1..c099fdb0e19 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -109,7 +109,13 @@
#include "RE_engine.h"
+#include "SEQ_edit.h"
+#include "SEQ_iterator.h"
+#include "SEQ_modifier.h"
+#include "SEQ_proxy.h"
+#include "SEQ_relations.h"
#include "SEQ_sequencer.h"
+#include "SEQ_sound.h"
#include "BLO_read_write.h"
@@ -3733,6 +3739,6 @@ void BKE_scene_eval_sequencer_sequences(Depsgraph *depsgraph, Scene *scene)
}
}
SEQ_ALL_END;
- SEQ_sound_update_muting(scene->ed);
+ SEQ_edit_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 d167fc4e51f..78729fb9261 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -68,6 +68,7 @@
#include "BLO_read_write.h"
#include "SEQ_sequencer.h"
+#include "SEQ_sound.h"
static void sound_free_audio(bSound *sound);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 73606db9a41..b61abd4ed06 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -105,6 +105,9 @@
#include "BLO_readfile.h"
#include "BLO_undofile.h"
+#include "SEQ_clipboard.h"
+#include "SEQ_iterator.h"
+#include "SEQ_modifier.h"
#include "SEQ_sequencer.h"
#include "readfile.h"
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index b282a978e8a..23f46e15f51 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -77,7 +77,7 @@
#include "BKE_sound.h"
#include "BKE_texture.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
#include "NOD_socket.h"
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c
index 86085ddbc73..767f24cf175 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -67,7 +67,9 @@
#include "BKE_texture.h"
#include "BKE_tracking.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
+#include "SEQ_modifier.h"
+#include "SEQ_utils.h"
#ifdef WITH_FFMPEG
# include "BKE_writeffmpeg.h"
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index ee5efff7216..df9268f0da1 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -66,7 +66,8 @@
#include "BKE_tracking.h"
#include "DNA_material_types.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_effects.h"
+#include "SEQ_iterator.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index f7ef7f74a42..88493de5076 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -97,7 +97,9 @@
#include "BKE_unit.h"
#include "BKE_workspace.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
+#include "SEQ_modifier.h"
+#include "SEQ_utils.h"
/* Only for IMB_BlendMode */
#include "IMB_imbuf.h"
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index 86293f273b3..b27e62c9218 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -66,6 +66,8 @@
#include "RNA_access.h"
+#include "SEQ_proxy.h"
+#include "SEQ_render.h"
#include "SEQ_sequencer.h"
#include "BLO_readfile.h"
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 6f459339675..dc8f7a0305a 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -80,7 +80,7 @@
#include "BKE_particle.h"
#include "BKE_pointcache.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
#include "NOD_socket.h"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index e5301532ddc..eb20dfb69a2 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -109,7 +109,7 @@
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
#include "intern/builder/deg_builder.h"
#include "intern/depsgraph.h"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index de68ec6210e..df48cb91ce7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -99,7 +99,7 @@
#include "RNA_access.h"
#include "RNA_types.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
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 5119de1ed9e..2544bb1642c 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
@@ -92,7 +92,7 @@
#include "BKE_pointcache.h"
#include "BKE_sound.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_relations.h"
#include "intern/builder/deg_builder.h"
#include "intern/builder/deg_builder_nodes.h"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
index c0e284a930e..34c23740730 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
@@ -30,7 +30,7 @@
#include "BKE_sound.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
namespace blender::deg {
diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c
index fbd55592729..17251587d3b 100644
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@ -50,6 +50,7 @@
#include "RNA_access.h"
#include "SEQ_sequencer.h"
+#include "SEQ_utils.h"
#include "ED_anim_api.h"
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 83665d7a053..f2022194ed5 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -101,6 +101,7 @@
#include "ED_markers.h"
#include "SEQ_sequencer.h"
+#include "SEQ_utils.h"
#include "UI_resources.h" /* for TH_KEYFRAME_SCALE lookup */
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c
index 07601414fb0..a5514f6517e 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -56,6 +56,7 @@
#include "DEG_depsgraph_query.h"
#include "SEQ_sequencer.h"
+#include "SEQ_time.h"
#include "anim_intern.h"
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 46680f649cd..10cf4131584 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -83,7 +83,7 @@
#include "RNA_access.h"
#include "RNA_define.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_relations.h"
#include "BLO_undofile.h"
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index f7275b06804..1069f942a7a 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -77,7 +77,7 @@
#include "RNA_access.h"
#include "RNA_define.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_render.h"
#include "GPU_framebuffer.h"
#include "GPU_matrix.h"
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index 5bc13ec1b75..34617804888 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -52,7 +52,7 @@
#include "RNA_define.h"
#include "RNA_enum_types.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
#include "UI_interface.h"
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index a1df922b335..6380bb9505e 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -7
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list