[Bf-blender-cvs] [18d7aeacf2f] master: Move sequencer sources from blenkernel
Richard Antalik
noreply at git.blender.org
Mon Oct 5 03:18:39 CEST 2020
Commit: 18d7aeacf2f79e7a72f15d24a1948a39078c16c9
Author: Richard Antalik
Date: Mon Oct 5 02:58:56 2020 +0200
Branches: master
https://developer.blender.org/rB18d7aeacf2f79e7a72f15d24a1948a39078c16c9
Move sequencer sources from blenkernel
This is first step of refactoring task T77580.
Next step will be breaking up files into smaller ones.
Reviewed By: sergey, brecht
Differential Revision: https://developer.blender.org/D8492
===================================================================
M source/blender/CMakeLists.txt
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenloader/CMakeLists.txt
M source/blender/depsgraph/CMakeLists.txt
M source/blender/editors/animation/CMakeLists.txt
M source/blender/editors/render/CMakeLists.txt
M source/blender/editors/screen/CMakeLists.txt
M source/blender/editors/sound/CMakeLists.txt
M source/blender/editors/space_outliner/CMakeLists.txt
M source/blender/editors/space_sequencer/CMakeLists.txt
M source/blender/editors/transform/CMakeLists.txt
M source/blender/editors/util/CMakeLists.txt
M source/blender/imbuf/CMakeLists.txt
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/render/CMakeLists.txt
R100 source/blender/blenkernel/BKE_sequencer.h source/blender/sequencer/BKE_sequencer.h
A source/blender/sequencer/CMakeLists.txt
R100 source/blender/blenkernel/intern/seqeffects.c source/blender/sequencer/intern/effects.c
R100 source/blender/blenkernel/intern/seqcache.c source/blender/sequencer/intern/image_cache.c
R100 source/blender/blenkernel/intern/seqmodifier.c source/blender/sequencer/intern/modifier.c
R100 source/blender/blenkernel/intern/seqprefetch.c source/blender/sequencer/intern/prefetch.c
R100 source/blender/blenkernel/intern/sequencer.c source/blender/sequencer/intern/sequencer.c
M source/blender/windowmanager/CMakeLists.txt
===================================================================
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index d4f71c5b423..da6df831c0a 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -119,6 +119,7 @@ add_subdirectory(imbuf)
add_subdirectory(nodes)
add_subdirectory(modifiers)
add_subdirectory(gpencil_modifiers)
+add_subdirectory(sequencer)
add_subdirectory(shader_fx)
add_subdirectory(io)
add_subdirectory(functions)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index cc5226a1ab7..63e98b94852 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -36,6 +36,7 @@ set(INC
../makesrna
../modifiers
../nodes
+ ../sequencer
../shader_fx
../simulation
../render/extern/include
@@ -212,11 +213,6 @@ set(SRC
intern/rigidbody.c
intern/scene.c
intern/screen.c
- intern/seqcache.c
- intern/seqeffects.c
- intern/seqmodifier.c
- intern/seqprefetch.c
- intern/sequencer.c
intern/shader_fx.c
intern/shrinkwrap.c
intern/simulation.cc
@@ -374,7 +370,6 @@ set(SRC
BKE_rigidbody.h
BKE_scene.h
BKE_screen.h
- BKE_sequencer.h
BKE_sequencer_offscreen.h
BKE_shader_fx.h
BKE_shrinkwrap.h
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 992870daeb4..1c5cd548bb8 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -31,6 +31,7 @@ set(INC
../makesrna
../nodes
../render/extern/include
+ ../sequencer
../windowmanager
../../../intern/guardedalloc
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index e0916491edb..2f613a0d416 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -27,6 +27,7 @@ set(INC
../makesdna
../makesrna
../modifiers
+ ../sequencer
../windowmanager
../../../intern/atomic
../../../intern/guardedalloc
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index 1ca9a844feb..f50a5ffbb5e 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -24,6 +24,7 @@ set(INC
../../gpu
../../makesdna
../../makesrna
+ ../../sequencer
../../windowmanager
../../../../intern/clog
../../../../intern/glew-mx
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt
index 642e92592f1..b39dbf74375 100644
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -29,6 +29,7 @@ set(INC
../../makesdna
../../makesrna
../../render/extern/include
+ ../../sequencer
../../windowmanager
../../../../intern/glew-mx
../../../../intern/guardedalloc
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index 1de5ad729c5..d194d0cdbb6 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -28,6 +28,7 @@ set(INC
../../imbuf
../../makesdna
../../makesrna
+ ../../sequencer
../../windowmanager
../../../../intern/glew-mx
../../../../intern/guardedalloc
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index b4099edce68..644efe426e0 100644
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -22,6 +22,7 @@ set(INC
../../depsgraph
../../makesdna
../../makesrna
+ ../../sequencer
../../windowmanager
../../../../intern/guardedalloc
)
diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index db38839f959..1aa25ba00b1 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -25,6 +25,7 @@ set(INC
../../imbuf
../../makesdna
../../makesrna
+ ../../sequencer
../../windowmanager
../../../../intern/glew-mx
../../../../intern/guardedalloc
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index caf75349454..2ee11f1abfd 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -26,6 +26,7 @@ set(INC
../../imbuf
../../makesdna
../../makesrna
+ ../../sequencer
../../windowmanager
../../../../intern/atomic
../../../../intern/glew-mx
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index f905e96dbdd..59fdf1450b3 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -28,6 +28,7 @@ set(INC
../../makesrna
../../render/extern/include
../../depsgraph
+ ../../sequencer
../../windowmanager
../../../../intern/glew-mx
../../../../intern/guardedalloc
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index b09676fa547..c88169778f7 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -27,6 +27,7 @@ set(INC
../../imbuf
../../makesdna
../../makesrna
+ ../../sequencer
../../windowmanager
../../../../intern/clog
../../../../intern/glew-mx
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index cf637a06405..7ce795280a3 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -26,6 +26,7 @@ set(INC
../gpu
../makesdna
../makesrna
+ ../sequencer
../../../intern/guardedalloc
../../../intern/memutil
)
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index a3916d280a6..f2d4859977f 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -373,6 +373,7 @@ blender_include_dirs(
../../imbuf
../../makesdna
../../nodes/
+ ../../sequencer
../../simulation
../../windowmanager
../../editors/include
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 2652ec2f8cb..598e6e019d4 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -32,6 +32,7 @@ set(INC
../makesdna
../makesrna
../nodes
+ ../sequencer
../simulation
../../../intern/atomic
../../../intern/guardedalloc
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/sequencer/BKE_sequencer.h
similarity index 100%
rename from source/blender/blenkernel/BKE_sequencer.h
rename to source/blender/sequencer/BKE_sequencer.h
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt
similarity index 58%
copy from source/blender/editors/sound/CMakeLists.txt
copy to source/blender/sequencer/CMakeLists.txt
index b4099edce68..75b5f2fef64 100644
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -13,17 +13,25 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2011, Blender Foundation
+# All rights reserved.
# ***** END GPL LICENSE BLOCK *****
set(INC
- ../include
- ../../blenkernel
- ../../blenlib
- ../../depsgraph
- ../../makesdna
- ../../makesrna
- ../../windowmanager
- ../../../../intern/guardedalloc
+ .
+ ../blenkernel
+ ../blenlib
+ ../blentranslation
+ ../depsgraph
+ ../imbuf
+ ../makesdna
+ ../makesrna
+ ../render/extern/include
+ ../blenfont
+ ../windowmanager
+ ../../../intern/atomic
+ ../../../intern/guardedalloc
)
set(INC_SYS
@@ -31,9 +39,13 @@ set(INC_SYS
)
set(SRC
- sound_ops.c
+ BKE_sequencer.h
- sound_intern.h
+ intern/sequencer.c
+ intern/image_cache.c
+ intern/effects.c
+ intern/modifier.c
+ intern/prefetch.c
)
set(LIB
@@ -41,25 +53,4 @@ set(LIB
bf_blenlib
)
-if(WITH_AUDASPACE)
- list(APPEND INC_SYS
- ${AUDASPACE_C_INCLUDE_DIRS}
- )
- list(APPEND LIB
- bf_intern_audaspace
-
- ${AUDASPACE_C_LIBRARIES}
- ${AUDASPACE_PY_LIBRARIES}
- )
- add_definitions(-DWITH_AUDASPACE)
-endif()
-
-if(WITH_CODEC_FFMPEG)
- add_definitions(-DWITH_FFMPEG)
-endif()
-
-if(WITH_CODEC_SNDFILE)
- add_definitions(-DWITH_SNDFILE)
-endif()
-
-blender_add_lib(bf_editor_sound "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+blender_add_lib(bf_sequencer "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/sequencer/intern/effects.c
similarity index 100%
rename from source/blender/blenkernel/intern/seqeffects.c
rename to source/blender/sequencer/intern/effects.c
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/sequencer/intern/image_cache.c
similarity index 100%
rename from source/blender/blenkernel/intern/seqcache.c
rename to source/blender/sequencer/intern/image_cache.c
diff --git a/source/blender/blenkernel/intern/seqmodifier.c b/source/blender/sequencer/intern/modifier.c
similarity index 100%
rename from source/blender/blenkernel/intern/seqmodifier.c
rename to source/blender/sequencer/intern/modifier.c
diff --git a/source/blender/blenkernel/intern/seqprefetch.c b/source/blender/sequencer/intern/prefetch.c
similarity index 100%
rename from source/blender/blenkernel/intern/seqprefetch.c
rename to source/blender/sequencer/intern/prefetch.c
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c
similarity index 100%
rename from source/blender/blenkernel/intern/sequencer.c
rename to source/blender/sequencer/intern/sequencer.c
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 78ea6651f2f..07e962aaf89 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/C
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list